From f680dd934df9c1ff2b3b91b4565997cb2c2db6a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Fri, 8 Dec 2023 16:30:55 +0200 Subject: [PATCH] refactor: rename package errors to zerrors (#7039) * chore: rename package errors to zerrors * rename package errors to gerrors * fix error related linting issues * fix zitadel error assertion * fix gosimple linting issues * fix deprecated linting issues * resolve gci linting issues * fix import structure --------- Co-authored-by: Elio Bischof --- cmd/key/key.go | 11 +- cmd/key/key_test.go | 7 +- cmd/start/encryption_keys.go | 4 +- internal/actions/actions.go | 6 +- internal/actions/http_module.go | 6 +- internal/actions/http_module_config.go | 4 +- internal/actions/http_module_test.go | 4 +- internal/api/api.go | 4 +- internal/api/authz/access_token_test.go | 4 +- internal/api/authz/authorization.go | 6 +- internal/api/authz/authorization_test.go | 4 +- internal/api/authz/context.go | 14 +- internal/api/authz/permissions.go | 10 +- internal/api/authz/permissions_test.go | 6 +- internal/api/authz/session_token.go | 4 +- internal/api/authz/system_token.go | 8 +- internal/api/authz/user.go | 4 +- internal/api/grpc/admin/export.go | 8 +- .../api/grpc/admin/iam_settings_converter.go | 4 +- internal/api/grpc/admin/idp_converter.go | 6 +- .../api/grpc/admin/milestone_converter.go | 4 +- internal/api/grpc/errors/caos_errors.go | 63 ----- internal/api/grpc/event/event.go | 4 +- internal/api/grpc/gerrors/zitadel_errors.go | 68 +++++ .../zitadel_errors_test.go} | 35 ++- internal/api/grpc/instance/converter.go | 6 +- .../api/grpc/management/actions_converter.go | 4 +- internal/api/grpc/management/auth_checks.go | 4 +- internal/api/grpc/management/flow.go | 4 +- internal/api/grpc/management/idp_converter.go | 6 +- .../management/project_grant_converter.go | 6 +- internal/api/grpc/management/user.go | 4 +- internal/api/grpc/member/converter.go | 4 +- internal/api/grpc/metadata/metadata.go | 4 +- internal/api/grpc/oidc/v2/oidc.go | 4 +- internal/api/grpc/org/converter.go | 8 +- internal/api/grpc/org/v2/org.go | 4 +- internal/api/grpc/org/v2/org_test.go | 4 +- internal/api/grpc/project/application.go | 4 +- internal/api/grpc/project/converter.go | 8 +- .../server/middleware/activity_interceptor.go | 4 +- .../middleware/auth_interceptor_test.go | 4 +- .../server/middleware/error_interceptor.go | 5 +- .../server/middleware/instance_interceptor.go | 12 +- .../api/grpc/server/middleware/mock_test.go | 4 +- .../server/middleware/quota_interceptor.go | 4 +- .../api/grpc/server/middleware/translator.go | 4 +- internal/api/grpc/server/probes.go | 4 +- internal/api/grpc/server/probes_test.go | 8 +- internal/api/grpc/session/v2/session.go | 8 +- internal/api/grpc/session/v2/session_test.go | 13 +- internal/api/grpc/system/feature.go | 6 +- internal/api/grpc/user/membership.go | 4 +- internal/api/grpc/user/query.go | 6 +- internal/api/grpc/user/v2/email.go | 4 +- internal/api/grpc/user/v2/passkey.go | 8 +- internal/api/grpc/user/v2/passkey_test.go | 4 +- internal/api/grpc/user/v2/password.go | 6 +- internal/api/grpc/user/v2/phone.go | 4 +- internal/api/grpc/user/v2/u2f.go | 4 +- internal/api/grpc/user/v2/u2f_test.go | 4 +- internal/api/grpc/user/v2/user.go | 14 +- internal/api/grpc/user/v2/user_test.go | 6 +- internal/api/http/cookie.go | 6 +- internal/api/http/domain_check.go | 24 +- internal/api/http/error.go | 26 +- internal/api/http/error_test.go | 24 +- .../http/middleware/instance_interceptor.go | 6 +- .../api/http/middleware/user_agent_cookie.go | 6 +- internal/api/http/parser.go | 4 +- internal/api/idp/idp.go | 24 +- internal/api/idp/idp_test.go | 4 +- internal/api/oidc/access_token.go | 2 +- internal/api/oidc/auth_request.go | 36 +-- internal/api/oidc/auth_request_converter.go | 4 +- internal/api/oidc/client.go | 26 +- internal/api/oidc/client_credentials.go | 8 +- internal/api/oidc/device_auth.go | 6 +- internal/api/oidc/introspect.go | 2 +- internal/api/oidc/jwt-profile.go | 4 +- internal/api/oidc/key.go | 18 +- internal/api/oidc/op.go | 10 +- internal/api/saml/auth_request_converter.go | 4 +- internal/api/saml/certificate.go | 6 +- internal/api/saml/storage.go | 10 +- internal/api/ui/login/device_auth.go | 10 +- .../api/ui/login/external_provider_handler.go | 24 +- .../api/ui/login/init_password_handler.go | 6 +- internal/api/ui/login/init_user_handler.go | 4 +- internal/api/ui/login/jwt_handler.go | 6 +- internal/api/ui/login/login_handler.go | 4 +- .../api/ui/login/login_success_handler.go | 4 +- internal/api/ui/login/mfa_prompt_handler.go | 7 +- .../api/ui/login/password_reset_handler.go | 6 +- internal/api/ui/login/register_handler.go | 4 +- internal/api/ui/login/register_org_handler.go | 4 +- internal/api/ui/login/renderer.go | 16 +- .../eventsourcing/eventstore/auth_request.go | 64 ++--- .../eventstore/auth_request_test.go | 44 +-- .../eventsourcing/eventstore/refresh_token.go | 14 +- .../eventsourcing/eventstore/token.go | 12 +- .../eventsourcing/handler/refresh_token.go | 6 +- .../repository/eventsourcing/handler/token.go | 12 +- .../repository/eventsourcing/handler/user.go | 8 +- .../eventsourcing/handler/user_session.go | 6 +- .../eventsourcing/view/refresh_token.go | 12 +- .../repository/eventsourcing/view/token.go | 16 +- .../repository/eventsourcing/view/user.go | 14 +- .../eventsourcing/view/user_session.go | 8 +- .../auth_request/repository/cache/cache.go | 14 +- .../eventstore/token_verifier.go | 30 +-- .../eventsourcing/view/application.go | 4 +- .../repository/eventsourcing/view/token.go | 6 +- internal/cache/bigcache/bigcache_test.go | 13 +- internal/cache/bigcache/cache.go | 15 +- internal/cache/config/config.go | 10 +- internal/cache/fastcache/fastcache.go | 14 +- internal/cache/fastcache/fastcache_test.go | 13 +- internal/command/auth_checks.go | 4 +- internal/command/auth_request.go | 20 +- internal/command/auth_request_model.go | 6 +- internal/command/auth_request_test.go | 26 +- internal/command/command.go | 6 +- internal/command/crypto.go | 4 +- internal/command/crypto_test.go | 4 +- internal/command/device_auth.go | 6 +- internal/command/device_auth_test.go | 6 +- internal/command/idp.go | 4 +- internal/command/idp_intent.go | 14 +- internal/command/idp_intent_test.go | 38 +-- internal/command/idp_model.go | 10 +- internal/command/idp_model_test.go | 6 +- internal/command/instance.go | 24 +- .../command/instance_custom_login_text.go | 7 +- .../instance_custom_login_text_test.go | 6 +- .../command/instance_custom_message_text.go | 6 +- .../instance_custom_message_text_test.go | 8 +- .../instance_debug_notification_file.go | 10 +- .../instance_debug_notification_file_test.go | 12 +- .../instance_debug_notification_log.go | 10 +- .../instance_debug_notification_log_test.go | 10 +- internal/command/instance_domain.go | 20 +- internal/command/instance_domain_test.go | 22 +- internal/command/instance_feature.go | 4 +- internal/command/instance_feature_model.go | 6 +- internal/command/instance_feature_test.go | 6 +- internal/command/instance_idp.go | 252 +++++++++--------- internal/command/instance_idp_config.go | 18 +- internal/command/instance_idp_config_test.go | 8 +- internal/command/instance_idp_jwt_config.go | 8 +- .../command/instance_idp_jwt_config_test.go | 10 +- internal/command/instance_idp_oidc_config.go | 8 +- .../command/instance_idp_oidc_config_test.go | 10 +- internal/command/instance_idp_test.go | 220 +++++++-------- internal/command/instance_member.go | 24 +- internal/command/instance_member_test.go | 24 +- internal/command/instance_oidc_settings.go | 12 +- .../command/instance_oidc_settings_test.go | 24 +- internal/command/instance_policy_domain.go | 8 +- .../command/instance_policy_domain_model.go | 4 +- .../command/instance_policy_domain_test.go | 8 +- internal/command/instance_policy_label.go | 40 +-- .../command/instance_policy_label_test.go | 48 ++-- internal/command/instance_policy_login.go | 40 +-- .../command/instance_policy_login_test.go | 48 ++-- .../command/instance_policy_mail_template.go | 16 +- .../instance_policy_mail_template_test.go | 12 +- .../command/instance_policy_notification.go | 8 +- .../instance_policy_notification_test.go | 8 +- .../command/instance_policy_password_age.go | 8 +- .../instance_policy_password_age_test.go | 8 +- .../instance_policy_password_complexity.go | 12 +- ...nstance_policy_password_complexity_test.go | 12 +- .../instance_policy_password_lockout.go | 8 +- .../instance_policy_password_lockout_test.go | 8 +- internal/command/instance_policy_privacy.go | 10 +- .../command/instance_policy_privacy_test.go | 12 +- internal/command/instance_settings.go | 16 +- internal/command/instance_settings_test.go | 16 +- internal/command/instance_test.go | 14 +- internal/command/limits.go | 6 +- internal/command/limits_test.go | 6 +- internal/command/main_test.go | 6 +- internal/command/oidc_session.go | 14 +- internal/command/oidc_session_model.go | 16 +- internal/command/oidc_session_test.go | 30 +-- internal/command/org.go | 40 +-- internal/command/org_action.go | 26 +- internal/command/org_action_test.go | 34 +-- internal/command/org_custom_login_text.go | 10 +- .../command/org_custom_login_text_test.go | 8 +- internal/command/org_custom_message_text.go | 10 +- .../command/org_custom_message_text_test.go | 16 +- internal/command/org_domain.go | 54 ++-- internal/command/org_domain_test.go | 60 ++--- internal/command/org_flow.go | 14 +- internal/command/org_flow_test.go | 12 +- internal/command/org_idp.go | 252 +++++++++--------- internal/command/org_idp_config.go | 22 +- internal/command/org_idp_config_test.go | 14 +- internal/command/org_idp_jwt_config.go | 10 +- internal/command/org_idp_jwt_config_test.go | 12 +- internal/command/org_idp_oidc_config.go | 10 +- internal/command/org_idp_oidc_config_test.go | 12 +- internal/command/org_idp_test.go | 220 +++++++-------- internal/command/org_member.go | 30 +-- internal/command/org_member_test.go | 38 +-- internal/command/org_metadata.go | 16 +- internal/command/org_metadata_test.go | 26 +- internal/command/org_policy_domain.go | 14 +- internal/command/org_policy_domain_model.go | 5 +- internal/command/org_policy_domain_test.go | 16 +- internal/command/org_policy_label.go | 70 ++--- internal/command/org_policy_label_test.go | 70 ++--- internal/command/org_policy_lockout.go | 16 +- internal/command/org_policy_lockout_test.go | 16 +- internal/command/org_policy_login.go | 64 ++--- internal/command/org_policy_login_test.go | 68 ++--- internal/command/org_policy_mail_template.go | 20 +- .../command/org_policy_mail_template_test.go | 16 +- internal/command/org_policy_notification.go | 16 +- .../command/org_policy_notification_test.go | 16 +- internal/command/org_policy_password_age.go | 16 +- .../command/org_policy_password_age_test.go | 16 +- .../command/org_policy_password_complexity.go | 16 +- .../org_policy_password_complexity_test.go | 16 +- internal/command/org_policy_privacy.go | 16 +- internal/command/org_policy_privacy_test.go | 20 +- internal/command/org_test.go | 62 ++--- internal/command/phone_test.go | 4 +- .../policy_password_complexity_model.go | 12 +- internal/command/preparation/command.go | 4 +- internal/command/project.go | 40 +-- internal/command/project_application.go | 24 +- internal/command/project_application_api.go | 42 +-- .../command/project_application_api_test.go | 28 +- internal/command/project_application_key.go | 16 +- .../command/project_application_key_test.go | 12 +- internal/command/project_application_oidc.go | 48 ++-- .../command/project_application_oidc_test.go | 30 +-- internal/command/project_application_saml.go | 26 +- .../command/project_application_saml_test.go | 24 +- internal/command/project_application_test.go | 34 +-- internal/command/project_grant.go | 36 +-- internal/command/project_grant_member.go | 18 +- internal/command/project_grant_member_test.go | 33 +-- internal/command/project_grant_test.go | 50 ++-- internal/command/project_member.go | 22 +- internal/command/project_member_test.go | 29 +- internal/command/project_role.go | 15 +- internal/command/project_role_test.go | 34 +-- internal/command/project_test.go | 52 ++-- internal/command/quota.go | 16 +- internal/command/quota_model.go | 6 +- internal/command/quota_model_test.go | 4 +- internal/command/quota_test.go | 26 +- internal/command/restrictions.go | 6 +- internal/command/restrictions_test.go | 8 +- internal/command/session.go | 30 +-- internal/command/session_model.go | 8 +- internal/command/session_otp.go | 22 +- internal/command/session_otp_test.go | 40 +-- internal/command/session_test.go | 54 ++-- internal/command/session_webauhtn.go | 10 +- internal/command/session_webauthn_test.go | 4 +- internal/command/sms_config.go | 26 +- internal/command/sms_config_test.go | 20 +- internal/command/smtp.go | 22 +- internal/command/smtp_test.go | 26 +- internal/command/user.go | 62 ++--- internal/command/user_domain_policy.go | 4 +- internal/command/user_domain_policy_test.go | 10 +- internal/command/user_grant.go | 40 +-- internal/command/user_grant_test.go | 78 +++--- internal/command/user_human.go | 60 ++--- internal/command/user_human_address.go | 6 +- internal/command/user_human_adress_test.go | 6 +- internal/command/user_human_avatar.go | 12 +- internal/command/user_human_avatar_test.go | 14 +- internal/command/user_human_email.go | 30 +-- internal/command/user_human_email_test.go | 32 +-- internal/command/user_human_init.go | 20 +- internal/command/user_human_init_test.go | 22 +- internal/command/user_human_otp.go | 64 ++--- internal/command/user_human_otp_test.go | 98 +++---- internal/command/user_human_password.go | 58 ++-- internal/command/user_human_password_test.go | 66 ++--- internal/command/user_human_phone.go | 39 ++- internal/command/user_human_phone_test.go | 34 +-- internal/command/user_human_profile.go | 8 +- internal/command/user_human_profile_test.go | 6 +- internal/command/user_human_refresh_token.go | 20 +- .../command/user_human_refresh_token_test.go | 50 ++-- internal/command/user_human_test.go | 56 ++-- internal/command/user_human_webauthn.go | 34 +-- internal/command/user_idp_link.go | 30 +-- internal/command/user_idp_link_test.go | 30 +-- internal/command/user_machine.go | 22 +- internal/command/user_machine_key.go | 18 +- internal/command/user_machine_key_test.go | 10 +- internal/command/user_machine_secret.go | 16 +- internal/command/user_machine_secret_test.go | 16 +- internal/command/user_machine_test.go | 16 +- internal/command/user_metadata.go | 16 +- internal/command/user_metadata_test.go | 26 +- .../user_password_complexity_policy.go | 4 +- .../user_password_complexity_policy_test.go | 10 +- .../command/user_personal_access_token.go | 14 +- .../user_personal_access_token_test.go | 14 +- internal/command/user_test.go | 64 ++--- internal/command/user_v2_email.go | 14 +- internal/command/user_v2_email_test.go | 50 ++-- internal/command/user_v2_passkey.go | 4 +- internal/command/user_v2_passkey_test.go | 10 +- internal/command/user_v2_password.go | 8 +- internal/command/user_v2_password_test.go | 36 +-- internal/command/user_v2_phone.go | 14 +- internal/command/user_v2_phone_test.go | 26 +- internal/command/user_v2_totp_test.go | 8 +- internal/command/user_v2_u2f_test.go | 4 +- internal/config/config.go | 8 +- internal/crypto/aes.go | 8 +- internal/crypto/code.go | 12 +- internal/crypto/code_mocker.go | 10 +- internal/crypto/crypto.go | 22 +- internal/crypto/database/database.go | 30 +-- internal/crypto/database/database_test.go | 12 +- internal/crypto/key.go | 6 +- internal/crypto/passwap.go | 6 +- internal/database/database.go | 2 +- internal/database/database_test.go | 2 +- internal/domain/application_key.go | 4 +- internal/domain/application_oauth.go | 6 +- internal/domain/auth_request.go | 4 +- internal/domain/authn_key.go | 6 +- internal/domain/custom_message_text.go | 4 +- internal/domain/expiration.go | 4 +- internal/domain/human.go | 7 +- internal/domain/human_email.go | 8 +- internal/domain/human_email_test.go | 6 +- internal/domain/human_otp.go | 6 +- internal/domain/human_password.go | 4 +- internal/domain/human_phone.go | 8 +- internal/domain/human_phone_test.go | 4 +- internal/domain/human_profile.go | 8 +- internal/domain/language.go | 16 +- internal/domain/machine_key.go | 4 +- internal/domain/machine_secret.go | 4 +- internal/domain/metadata.go | 4 +- internal/domain/org_domain.go | 4 +- internal/domain/policy_label.go | 18 +- internal/domain/policy_label_test.go | 50 ++-- internal/domain/policy_password_complexity.go | 14 +- internal/domain/refresh_token.go | 4 +- internal/domain/url_template.go | 6 +- internal/domain/url_template_test.go | 6 +- internal/domain/user_v2_passkey_test.go | 4 +- internal/errors/already_exists_test.go | 34 --- internal/errors/deadline_exceeded_test.go | 33 --- internal/errors/generate/error_test.go.tmpl | 33 --- internal/errors/internal_test.go | 33 --- internal/errors/invalid_argument_test.go | 33 --- internal/errors/not_found_test.go | 33 --- internal/errors/permission_denied_test.go | 33 --- internal/errors/precondition_failed_test.go | 33 --- internal/errors/resource_exhausted_test.go | 34 --- internal/errors/unauthenticated_test.go | 33 --- internal/errors/unavailable_test.go | 33 --- internal/errors/unimplemented_test.go | 33 --- internal/errors/unknown_test.go | 33 --- internal/eventstore/event.go | 10 +- internal/eventstore/eventstore_test.go | 18 +- internal/eventstore/handler/crdb/lock.go | 8 +- internal/eventstore/handler/crdb/lock_test.go | 4 +- .../eventstore/handler/v2/failed_event.go | 8 +- internal/eventstore/handler/v2/init.go | 6 +- internal/eventstore/handler/v2/state.go | 6 +- internal/eventstore/handler/v2/state_test.go | 6 +- internal/eventstore/handler/v2/statement.go | 14 +- .../eventstore/repository/search_query.go | 12 +- internal/eventstore/repository/sql/crdb.go | 16 +- internal/eventstore/repository/sql/query.go | 18 +- .../eventstore/repository/sql/query_test.go | 10 +- internal/eventstore/search_query.go | 4 +- internal/eventstore/v1/models/event.go | 24 +- internal/eventstore/v3/event.go | 6 +- internal/eventstore/v3/push.go | 12 +- internal/eventstore/v3/sequence.go | 10 +- internal/eventstore/v3/unique_constraints.go | 6 +- internal/eventstore/version.go | 4 +- internal/form/parser.go | 4 +- internal/i18n/bundle.go | 8 +- internal/iam/model/idp_config_view.go | 8 +- internal/iam/model/idp_provider_view.go | 8 +- .../iam/model/password_complexity_policy.go | 14 +- .../eventsourcing/model/org_iam_policy.go | 4 +- .../iam/repository/view/idp_provider_view.go | 6 +- internal/iam/repository/view/idp_view.go | 6 +- .../iam/repository/view/model/idp_config.go | 4 +- .../iam/repository/view/model/idp_provider.go | 4 +- .../iam/repository/view/model/label_policy.go | 6 +- .../view/model/password_complexity_policy.go | 4 +- internal/iam/repository/view/styling.go | 10 +- internal/idp/providers/saml/saml.go | 4 +- internal/idp/providers/saml/session.go | 6 +- internal/idp/providers/saml/session_test.go | 8 +- internal/integration/integration.go | 6 +- internal/migration/command.go | 6 +- internal/migration/migration.go | 16 +- internal/notification/channels/fs/channel.go | 4 +- .../notification/channels/smtp/channel.go | 22 +- .../notification/channels/twilio/channel.go | 6 +- .../notification/channels/webhook/channel.go | 6 +- .../notification/handlers/config_twilio.go | 4 +- internal/notification/handlers/origin.go | 4 +- .../notification/handlers/quota_notifier.go | 4 +- .../notification/handlers/telemetry_pusher.go | 4 +- .../notification/handlers/user_notifier.go | 26 +- .../types/email_verification_code_test.go | 4 +- .../passwordless_registration_link_test.go | 4 +- internal/notification/types/user_email.go | 4 +- internal/notification/types/user_phone.go | 4 +- internal/org/model/org.go | 4 +- .../repository/eventsourcing/model/domain.go | 4 +- .../repository/eventsourcing/model/member.go | 4 +- .../org/repository/eventsourcing/model/org.go | 4 +- internal/org/repository/view/query.go | 4 +- internal/project/model/api_config.go | 6 +- internal/project/model/oidc_config.go | 6 +- .../model/project_grant_member_view.go | 8 +- internal/project/model/project_grant_view.go | 4 +- internal/project/model/project_member_view.go | 4 +- internal/project/model/project_role_view.go | 4 +- internal/project/model/project_view.go | 4 +- .../eventsourcing/model/oidc_config.go | 4 +- .../repository/view/model/application.go | 6 +- .../project/repository/view/model/project.go | 4 +- .../repository/view/model/project_grant.go | 4 +- .../view/model/project_grant_member.go | 4 +- .../repository/view/model/project_member.go | 4 +- .../view/org_project_mapping_view.go | 6 +- internal/project/repository/view/query.go | 4 +- internal/query/access_token.go | 14 +- internal/query/action.go | 18 +- internal/query/action_flow.go | 12 +- internal/query/action_test.go | 4 +- internal/query/app.go | 52 ++-- internal/query/app_test.go | 8 +- internal/query/auth_request.go | 12 +- internal/query/auth_request_test.go | 8 +- internal/query/authn_key.go | 32 +-- internal/query/authn_key_test.go | 6 +- internal/query/certificate.go | 10 +- internal/query/certificate_test.go | 4 +- internal/query/current_state.go | 40 +-- internal/query/custom_text.go | 22 +- internal/query/custom_text_test.go | 4 +- internal/query/device_auth.go | 14 +- internal/query/domain_policy.go | 14 +- internal/query/domain_policy_test.go | 4 +- internal/query/event.go | 4 +- internal/query/failed_events.go | 12 +- internal/query/iam_member.go | 8 +- internal/query/idp.go | 20 +- internal/query/idp_login_policy_link.go | 8 +- internal/query/idp_template.go | 18 +- internal/query/idp_template_test.go | 6 +- internal/query/idp_test.go | 6 +- internal/query/idp_user_link.go | 8 +- internal/query/instance.go | 32 +-- internal/query/instance_domain.go | 8 +- internal/query/instance_test.go | 4 +- internal/query/key.go | 26 +- internal/query/key_test.go | 14 +- internal/query/label_policy.go | 18 +- internal/query/limits.go | 12 +- internal/query/limits_test.go | 4 +- internal/query/lockout_policy.go | 14 +- internal/query/lockout_policy_test.go | 4 +- internal/query/login_policy.go | 36 +-- internal/query/login_policy_test.go | 8 +- internal/query/mail_template.go | 14 +- internal/query/message_text.go | 32 +-- internal/query/message_text_test.go | 4 +- internal/query/milestone.go | 4 +- internal/query/notification_policy.go | 14 +- internal/query/notification_policy_test.go | 4 +- internal/query/notification_provider.go | 12 +- internal/query/notification_provider_test.go | 4 +- internal/query/oidc_client.go | 2 +- internal/query/oidc_client_test.go | 2 +- internal/query/oidc_settings.go | 12 +- internal/query/oidc_settings_test.go | 4 +- internal/query/org.go | 34 +-- internal/query/org_domain.go | 8 +- internal/query/org_member.go | 8 +- internal/query/org_metadata.go | 18 +- internal/query/org_metadata_test.go | 6 +- internal/query/org_test.go | 16 +- internal/query/password_age_policy.go | 14 +- internal/query/password_age_policy_test.go | 4 +- internal/query/password_complexity_policy.go | 14 +- .../query/password_complexity_policy_test.go | 4 +- internal/query/privacy_policy.go | 14 +- internal/query/privacy_policy_test.go | 4 +- internal/query/project.go | 18 +- internal/query/project_grant.go | 20 +- internal/query/project_grant_member.go | 8 +- internal/query/project_grant_test.go | 4 +- internal/query/project_member.go | 8 +- internal/query/project_role.go | 12 +- internal/query/project_test.go | 4 +- internal/query/projection/action.go | 14 +- internal/query/projection/action_test.go | 4 +- internal/query/projection/app.go | 32 +-- internal/query/projection/app_test.go | 4 +- internal/query/projection/assert.go | 4 +- internal/query/projection/auth_request.go | 6 +- .../query/projection/auth_request_test.go | 4 +- internal/query/projection/authn_key.go | 10 +- internal/query/projection/authn_key_test.go | 4 +- internal/query/projection/custom_text.go | 10 +- internal/query/projection/custom_text_test.go | 4 +- .../query/projection/debug_notification.go | 8 +- .../debug_notification_provider_test.go | 4 +- internal/query/projection/device_auth.go | 10 +- internal/query/projection/domain_policy.go | 10 +- .../query/projection/domain_policy_test.go | 4 +- internal/query/projection/executer_test.go | 4 +- internal/query/projection/flow.go | 8 +- internal/query/projection/flow_test.go | 4 +- internal/query/projection/idp.go | 22 +- .../query/projection/idp_login_policy_link.go | 16 +- .../projection/idp_login_policy_link_test.go | 4 +- internal/query/projection/idp_template.go | 72 ++--- .../query/projection/idp_template_test.go | 30 +-- internal/query/projection/idp_test.go | 4 +- internal/query/projection/idp_user_link.go | 16 +- .../query/projection/idp_user_link_test.go | 4 +- internal/query/projection/instance.go | 16 +- internal/query/projection/instance_domain.go | 8 +- .../query/projection/instance_domain_test.go | 4 +- internal/query/projection/instance_member.go | 14 +- .../query/projection/instance_member_test.go | 4 +- internal/query/projection/instance_test.go | 4 +- internal/query/projection/key.go | 10 +- internal/query/projection/key_test.go | 4 +- internal/query/projection/label_policy.go | 26 +- .../query/projection/label_policy_test.go | 4 +- internal/query/projection/limits_test.go | 4 +- internal/query/projection/lockout_policy.go | 10 +- .../query/projection/lockout_policy_test.go | 4 +- internal/query/projection/login_name.go | 26 +- internal/query/projection/login_name_test.go | 4 +- internal/query/projection/login_policy.go | 18 +- .../query/projection/login_policy_test.go | 4 +- internal/query/projection/mail_template.go | 10 +- .../query/projection/mail_template_test.go | 4 +- .../query/projection/message_text_test.go | 4 +- internal/query/projection/message_texts.go | 10 +- internal/query/projection/milestones_test.go | 4 +- .../query/projection/notification_policy.go | 10 +- .../projection/notification_policy_test.go | 4 +- internal/query/projection/oidc_settings.go | 6 +- .../query/projection/oidc_settings_test.go | 4 +- internal/query/projection/org.go | 14 +- internal/query/projection/org_domain.go | 14 +- internal/query/projection/org_domain_test.go | 4 +- internal/query/projection/org_member.go | 14 +- internal/query/projection/org_member_test.go | 4 +- internal/query/projection/org_metadata.go | 10 +- .../query/projection/org_metadata_test.go | 4 +- internal/query/projection/org_test.go | 4 +- .../query/projection/password_age_policy.go | 10 +- .../projection/password_age_policy_test.go | 4 +- .../projection/password_complexity_policy.go | 10 +- .../password_complexity_policy_test.go | 4 +- internal/query/projection/privacy_policy.go | 10 +- .../query/projection/privacy_policy_test.go | 4 +- internal/query/projection/project.go | 14 +- internal/query/projection/project_grant.go | 18 +- .../query/projection/project_grant_member.go | 20 +- .../projection/project_grant_member_test.go | 4 +- .../query/projection/project_grant_test.go | 4 +- internal/query/projection/project_member.go | 16 +- .../query/projection/project_member_test.go | 4 +- internal/query/projection/project_role.go | 12 +- .../query/projection/project_role_test.go | 4 +- internal/query/projection/project_test.go | 4 +- internal/query/projection/quota.go | 4 +- internal/query/projection/quota_test.go | 4 +- .../query/projection/restrictions_test.go | 4 +- internal/query/projection/secret_generator.go | 8 +- .../query/projection/secret_generator_test.go | 4 +- internal/query/projection/security_policy.go | 4 +- internal/query/projection/session.go | 22 +- internal/query/projection/session_test.go | 4 +- internal/query/projection/sms.go | 14 +- internal/query/projection/sms_test.go | 4 +- internal/query/projection/smtp.go | 8 +- internal/query/projection/smtp_test.go | 4 +- internal/query/projection/user.go | 52 ++-- internal/query/projection/user_auth_method.go | 12 +- .../query/projection/user_auth_method_test.go | 4 +- internal/query/projection/user_grant.go | 32 +-- internal/query/projection/user_grant_test.go | 4 +- internal/query/projection/user_metadata.go | 10 +- .../query/projection/user_metadata_test.go | 4 +- .../projection/user_personal_access_token.go | 10 +- .../user_personal_access_token_test.go | 4 +- internal/query/projection/user_test.go | 4 +- internal/query/quota.go | 12 +- internal/query/quota_notifications.go | 8 +- internal/query/quota_periods.go | 10 +- internal/query/quota_periods_test.go | 4 +- internal/query/quota_test.go | 4 +- internal/query/restrictions.go | 2 +- internal/query/secret_generator_test.go | 4 +- internal/query/secret_generators.go | 18 +- internal/query/security_policy.go | 10 +- internal/query/session.go | 20 +- internal/query/sessions_test.go | 4 +- internal/query/sms.go | 20 +- internal/query/sms_test.go | 4 +- internal/query/smtp.go | 12 +- internal/query/smtp_test.go | 4 +- internal/query/user.go | 65 ++--- internal/query/user_auth_method.go | 16 +- internal/query/user_grant.go | 16 +- internal/query/user_grant_test.go | 4 +- internal/query/user_membership.go | 6 +- internal/query/user_metadata.go | 16 +- internal/query/user_metadata_test.go | 6 +- internal/query/user_otp.go | 6 +- internal/query/user_password.go | 8 +- internal/query/user_personal_access_token.go | 18 +- .../query/user_personal_access_token_test.go | 4 +- internal/query/user_test.go | 24 +- internal/query/userinfo.go | 2 +- internal/query/userinfo_test.go | 4 +- internal/renderer/renderer.go | 8 +- internal/repository/action/action.go | 8 +- internal/repository/asset/asset.go | 6 +- .../repository/authrequest/auth_request.go | 10 +- internal/repository/flow/flow.go | 8 +- internal/repository/idp/apple.go | 8 +- internal/repository/idp/azuread.go | 8 +- internal/repository/idp/github.go | 14 +- internal/repository/idp/gitlab.go | 14 +- internal/repository/idp/google.go | 8 +- internal/repository/idp/idp.go | 4 +- internal/repository/idp/jwt.go | 8 +- internal/repository/idp/ldap.go | 8 +- internal/repository/idp/oauth.go | 8 +- internal/repository/idp/oidc.go | 8 +- internal/repository/idp/saml.go | 8 +- internal/repository/idpconfig/idp_config.go | 14 +- internal/repository/idpconfig/jwt_config.go | 9 +- internal/repository/idpconfig/oidc_config.go | 8 +- internal/repository/idpintent/intent.go | 14 +- internal/repository/instance/domain.go | 8 +- .../instance/event_default_language.go | 4 +- .../instance/event_iam_project_set.go | 6 +- internal/repository/instance/event_org_set.go | 4 +- internal/repository/instance/instance.go | 6 +- internal/repository/instance/oidc_settings.go | 8 +- .../repository/instance/policy_security.go | 6 +- .../repository/instance/secret_generator.go | 10 +- internal/repository/instance/sms.go | 16 +- internal/repository/instance/smtp_config.go | 12 +- internal/repository/keypair/certificate.go | 4 +- internal/repository/keypair/key_pair.go | 4 +- internal/repository/member/events.go | 10 +- internal/repository/metadata/metadata.go | 6 +- internal/repository/org/domain.go | 14 +- internal/repository/org/org.go | 6 +- internal/repository/policy/custom_text.go | 8 +- internal/repository/policy/label.go | 8 +- internal/repository/policy/login.go | 8 +- internal/repository/policy/mail_template.go | 8 +- internal/repository/policy/mail_text.go | 8 +- internal/repository/policy/policy_domain.go | 8 +- .../repository/policy/policy_login_factors.go | 10 +- .../policy/policy_login_identity_provider.go | 8 +- .../repository/policy/policy_notification.go | 8 +- .../repository/policy/policy_password_age.go | 8 +- .../policy/policy_password_complexity.go | 8 +- .../policy/policy_password_lockout.go | 8 +- internal/repository/policy/policy_privacy.go | 8 +- internal/repository/project/api_config.go | 14 +- internal/repository/project/application.go | 12 +- internal/repository/project/grant.go | 14 +- internal/repository/project/grant_member.go | 10 +- internal/repository/project/key.go | 6 +- internal/repository/project/oidc_config.go | 14 +- internal/repository/project/project.go | 8 +- internal/repository/project/role.go | 10 +- internal/repository/project/saml_config.go | 8 +- internal/repository/quota/events.go | 10 +- internal/repository/session/session.go | 14 +- .../repository/settings/debug_notification.go | 8 +- internal/repository/user/human.go | 10 +- internal/repository/user/human_address.go | 6 +- internal/repository/user/human_email.go | 6 +- .../repository/user/human_external_idp.go | 10 +- internal/repository/user/human_mfa_otp.go | 8 +- .../repository/user/human_mfa_passwordless.go | 12 +- .../repository/user/human_mfa_web_auth_n.go | 16 +- internal/repository/user/human_password.go | 10 +- internal/repository/user/human_phone.go | 6 +- internal/repository/user/human_profile.go | 6 +- .../repository/user/human_refresh_token.go | 8 +- internal/repository/user/machine.go | 8 +- internal/repository/user/machine_key.go | 6 +- internal/repository/user/machine_secret.go | 10 +- .../repository/user/personal_access_token.go | 6 +- internal/repository/user/user.go | 10 +- internal/repository/usergrant/user_grant.go | 8 +- internal/static/config/config.go | 4 +- internal/static/database/crdb.go | 34 +-- internal/static/mock/storage_mock.impl.go | 6 +- internal/static/s3/config.go | 9 +- internal/static/s3/minio.go | 30 +-- internal/telemetry/metrics/config/config.go | 4 +- .../telemetry/metrics/otel/open_telemetry.go | 4 +- internal/telemetry/tracing/config/config.go | 4 +- internal/telemetry/tracing/otel/config.go | 6 +- internal/telemetry/tracing/span.go | 4 +- internal/user/model/external_idp_view.go | 4 +- internal/user/model/refresh_token_view.go | 4 +- internal/user/model/token_view.go | 4 +- internal/user/model/user_membership_view.go | 4 +- internal/user/model/user_session_view.go | 4 +- internal/user/model/user_view.go | 12 +- .../repository/eventsourcing/model/address.go | 4 +- .../eventsourcing/model/auth_request.go | 4 +- .../repository/eventsourcing/model/email.go | 6 +- .../eventsourcing/model/external_idp.go | 4 +- .../repository/eventsourcing/model/otp.go | 6 +- .../eventsourcing/model/password.go | 8 +- .../repository/eventsourcing/model/phone.go | 6 +- .../repository/eventsourcing/model/token.go | 4 +- .../repository/eventsourcing/model/user.go | 7 +- .../eventsourcing/model/user_human.go | 6 +- .../eventsourcing/model/user_machine.go | 6 +- .../eventsourcing/model/web_auth_n.go | 16 +- .../user/repository/view/external_idp_view.go | 10 +- .../repository/view/model/external_idps.go | 4 +- .../user/repository/view/model/notify_user.go | 6 +- .../repository/view/model/refresh_token.go | 6 +- internal/user/repository/view/model/token.go | 8 +- internal/user/repository/view/model/user.go | 14 +- .../repository/view/model/user_membership.go | 10 +- .../repository/view/model/user_session.go | 6 +- internal/user/repository/view/notify_user.go | 6 +- internal/user/repository/view/query.go | 4 +- .../repository/view/refresh_token_view.go | 6 +- internal/user/repository/view/token_view.go | 6 +- .../user/repository/view/user_session_view.go | 6 +- internal/user/repository/view/user_view.go | 23 +- internal/view/repository/query.go | 24 +- internal/view/repository/query_test.go | 4 +- internal/view/repository/requests.go | 25 +- internal/view/repository/requests_test.go | 14 +- internal/webauthn/webauthn.go | 24 +- internal/webauthn/webauthn_test.go | 4 +- .../{errors => zerrors}/already_exists.go | 12 +- internal/zerrors/already_exists_test.go | 33 +++ .../{errors => zerrors}/deadline_exceeded.go | 10 +- internal/zerrors/deadline_exceeded_test.go | 33 +++ internal/{errors => zerrors}/error.go | 2 +- internal/{errors => zerrors}/error_test.go | 8 +- .../generate/error.go.tmpl | 0 .../generate/error_creator.go | 4 +- .../generate/error_interface.go.tmpl | 0 internal/zerrors/generate/error_test.go.tmpl | 33 +++ internal/{errors => zerrors}/internal.go | 10 +- internal/zerrors/internal_test.go | 33 +++ .../{errors => zerrors}/invalid_argument.go | 10 +- internal/zerrors/invalid_argument_test.go | 33 +++ internal/{errors => zerrors}/not_found.go | 10 +- internal/zerrors/not_found_test.go | 33 +++ .../{errors => zerrors}/permission_denied.go | 10 +- internal/zerrors/permission_denied_test.go | 33 +++ .../precondition_failed.go | 10 +- internal/zerrors/precondition_failed_test.go | 33 +++ .../{errors => zerrors}/resource_exhausted.go | 10 +- internal/zerrors/resource_exhausted_test.go | 33 +++ .../{errors => zerrors}/unauthenticated.go | 10 +- internal/zerrors/unauthenticated_test.go | 33 +++ internal/{errors => zerrors}/unavailable.go | 10 +- internal/zerrors/unavailable_test.go | 33 +++ internal/{errors => zerrors}/unimplemented.go | 10 +- internal/zerrors/unimplemented_test.go | 33 +++ internal/{errors => zerrors}/unknown.go | 10 +- internal/zerrors/unknown_test.go | 33 +++ .../caos_error.go => zerrors/zerror.go} | 32 +-- .../zerror_test.go} | 9 +- 798 files changed, 5809 insertions(+), 5813 deletions(-) delete mode 100644 internal/api/grpc/errors/caos_errors.go create mode 100644 internal/api/grpc/gerrors/zitadel_errors.go rename internal/api/grpc/{errors/caos_errors_test.go => gerrors/zitadel_errors_test.go} (66%) delete mode 100644 internal/errors/already_exists_test.go delete mode 100644 internal/errors/deadline_exceeded_test.go delete mode 100644 internal/errors/generate/error_test.go.tmpl delete mode 100644 internal/errors/internal_test.go delete mode 100644 internal/errors/invalid_argument_test.go delete mode 100644 internal/errors/not_found_test.go delete mode 100644 internal/errors/permission_denied_test.go delete mode 100644 internal/errors/precondition_failed_test.go delete mode 100644 internal/errors/resource_exhausted_test.go delete mode 100644 internal/errors/unauthenticated_test.go delete mode 100644 internal/errors/unavailable_test.go delete mode 100644 internal/errors/unimplemented_test.go delete mode 100644 internal/errors/unknown_test.go rename internal/{errors => zerrors}/already_exists.go (72%) create mode 100644 internal/zerrors/already_exists_test.go rename internal/{errors => zerrors}/deadline_exceeded.go (82%) create mode 100644 internal/zerrors/deadline_exceeded_test.go rename internal/{errors => zerrors}/error.go (96%) rename internal/{errors => zerrors}/error_test.go (53%) rename internal/{errors => zerrors}/generate/error.go.tmpl (100%) rename internal/{errors => zerrors}/generate/error_creator.go (95%) rename internal/{errors => zerrors}/generate/error_interface.go.tmpl (100%) create mode 100644 internal/zerrors/generate/error_test.go.tmpl rename internal/{errors => zerrors}/internal.go (80%) create mode 100644 internal/zerrors/internal_test.go rename internal/{errors => zerrors}/invalid_argument.go (82%) create mode 100644 internal/zerrors/invalid_argument_test.go rename internal/{errors => zerrors}/not_found.go (77%) create mode 100644 internal/zerrors/not_found_test.go rename internal/{errors => zerrors}/permission_denied.go (82%) create mode 100644 internal/zerrors/permission_denied_test.go rename internal/{errors => zerrors}/precondition_failed.go (82%) create mode 100644 internal/zerrors/precondition_failed_test.go rename internal/{errors => zerrors}/resource_exhausted.go (83%) create mode 100644 internal/zerrors/resource_exhausted_test.go rename internal/{errors => zerrors}/unauthenticated.go (82%) create mode 100644 internal/zerrors/unauthenticated_test.go rename internal/{errors => zerrors}/unavailable.go (81%) create mode 100644 internal/zerrors/unavailable_test.go rename internal/{errors => zerrors}/unimplemented.go (81%) create mode 100644 internal/zerrors/unimplemented_test.go rename internal/{errors => zerrors}/unknown.go (79%) create mode 100644 internal/zerrors/unknown_test.go rename internal/{errors/caos_error.go => zerrors/zerror.go} (56%) rename internal/{errors/caos_error_test.go => zerrors/zerror_test.go} (62%) diff --git a/cmd/key/key.go b/cmd/key/key.go index 5abd3a47c..833fbb70d 100644 --- a/cmd/key/key.go +++ b/cmd/key/key.go @@ -9,11 +9,10 @@ import ( "github.com/spf13/viper" "sigs.k8s.io/yaml" - caos_errs "github.com/zitadel/zitadel/internal/errors" - "github.com/zitadel/zitadel/internal/crypto" cryptoDB "github.com/zitadel/zitadel/internal/crypto/database" "github.com/zitadel/zitadel/internal/database" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -86,7 +85,7 @@ func keysFromArgs(args []string) ([]*crypto.Key, error) { for i, arg := range args { key := strings.Split(arg, "=") if len(key) != 2 { - return nil, caos_errs.ThrowInternal(nil, "KEY-JKd82", "argument is not in the valid format [keyID=key]") + return nil, zerrors.ThrowInternal(nil, "KEY-JKd82", "argument is not in the valid format [keyID=key]") } keys[i] = &crypto.Key{ ID: key[0], @@ -99,11 +98,11 @@ func keysFromArgs(args []string) ([]*crypto.Key, error) { func keysFromYAML(file io.Reader) ([]*crypto.Key, error) { data, err := io.ReadAll(file) if err != nil { - return nil, caos_errs.ThrowInternal(err, "KEY-ajGFr", "unable to extract keys from file") + return nil, zerrors.ThrowInternal(err, "KEY-ajGFr", "unable to extract keys from file") } keysYAML := make(map[string]string) if err = yaml.Unmarshal(data, &keysYAML); err != nil { - return nil, caos_errs.ThrowInternal(err, "KEY-sd34K", "unable to extract keys from file") + return nil, zerrors.ThrowInternal(err, "KEY-sd34K", "unable to extract keys from file") } keys := make([]*crypto.Key, 0, len(keysYAML)) for id, key := range keysYAML { @@ -118,7 +117,7 @@ func keysFromYAML(file io.Reader) ([]*crypto.Key, error) { func openFile(fileName string) (io.Reader, error) { file, err := os.Open(fileName) if err != nil { - return nil, caos_errs.ThrowInternalf(err, "KEY-asGr2", "failed to open file: %s", fileName) + return nil, zerrors.ThrowInternalf(err, "KEY-asGr2", "failed to open file: %s", fileName) } return file, nil } diff --git a/cmd/key/key_test.go b/cmd/key/key_test.go index c4e25e683..ffd432a3f 100644 --- a/cmd/key/key_test.go +++ b/cmd/key/key_test.go @@ -8,9 +8,8 @@ import ( "github.com/stretchr/testify/assert" - caos_errors "github.com/zitadel/zitadel/internal/errors" - "github.com/zitadel/zitadel/internal/crypto" + "github.com/zitadel/zitadel/internal/zerrors" ) func Test_keysFromArgs(t *testing.T) { @@ -39,7 +38,7 @@ func Test_keysFromArgs(t *testing.T) { args: []string{"keyID", "value"}, }, res{ - err: caos_errors.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -110,7 +109,7 @@ func Test_keysFromYAML(t *testing.T) { file: bytes.NewReader([]byte("keyID=ds")), }, res{ - err: caos_errors.IsInternal, + err: zerrors.IsInternal, }, }, { diff --git a/cmd/start/encryption_keys.go b/cmd/start/encryption_keys.go index 91faf53af..b5943bf40 100644 --- a/cmd/start/encryption_keys.go +++ b/cmd/start/encryption_keys.go @@ -2,7 +2,7 @@ package start import ( "github.com/zitadel/zitadel/internal/crypto" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -106,7 +106,7 @@ func verifyDefaultKeys(keyStorage crypto.KeyStorage) (err error) { return nil } if err := keyStorage.CreateKeys(keys...); err != nil { - return caos_errs.ThrowInternal(err, "START-aGBq2", "cannot create default keys") + return zerrors.ThrowInternal(err, "START-aGBq2", "cannot create default keys") } return nil } diff --git a/internal/actions/actions.go b/internal/actions/actions.go index 34d745d2c..5fa3a3c28 100644 --- a/internal/actions/actions.go +++ b/internal/actions/actions.go @@ -8,8 +8,8 @@ import ( "github.com/dop251/goja_nodejs/require" "github.com/sirupsen/logrus" - z_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) type Config struct { @@ -32,7 +32,7 @@ func actionFailedMessage(err error) string { func Run(ctx context.Context, ctxParam contextFields, apiParam apiFields, script, name string, opts ...Option) (err error) { config := newRunConfig(ctx, append(opts, withLogger(ctx))...) if config.functionTimeout == 0 { - return z_errs.ThrowInternal(nil, "ACTIO-uCpCx", "Errrors.Internal") + return zerrors.ThrowInternal(nil, "ACTIO-uCpCx", "Errrors.Internal") } remaining := logstoreService.Limit(ctx, config.instanceID) @@ -40,7 +40,7 @@ func Run(ctx context.Context, ctxParam contextFields, apiParam apiFields, script config.logger.Log(actionStartedMessage) if remaining != nil && *remaining == 0 { - return z_errs.ThrowResourceExhausted(nil, "ACTIO-f19Ii", "Errors.Quota.Execution.Exhausted") + return zerrors.ThrowResourceExhausted(nil, "ACTIO-f19Ii", "Errors.Quota.Execution.Exhausted") } defer func() { diff --git a/internal/actions/http_module.go b/internal/actions/http_module.go index a86c81b65..33cfbc91b 100644 --- a/internal/actions/http_module.go +++ b/internal/actions/http_module.go @@ -13,7 +13,7 @@ import ( "github.com/dop251/goja" "github.com/zitadel/logging" - z_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func WithHTTP(ctx context.Context) Option { @@ -66,7 +66,7 @@ func (c *HTTP) fetchConfigFromArg(arg *goja.Object, config *fetchConfig) (err er } config.Body = bytes.NewReader(body) default: - return z_errs.ThrowInvalidArgument(nil, "ACTIO-OfUeA", "key is invalid") + return zerrors.ThrowInvalidArgument(nil, "ACTIO-OfUeA", "key is invalid") } } return nil @@ -177,7 +177,7 @@ func (*transport) RoundTrip(req *http.Request) (*http.Response, error) { return http.DefaultTransport.RoundTrip(req) } if isHostBlocked(httpConfig.DenyList, req.URL) { - return nil, z_errs.ThrowInvalidArgument(nil, "ACTIO-N72d0", "host is denied") + return nil, zerrors.ThrowInvalidArgument(nil, "ACTIO-N72d0", "host is denied") } return http.DefaultTransport.RoundTrip(req) } diff --git a/internal/actions/http_module_config.go b/internal/actions/http_module_config.go index 248407889..29045168a 100644 --- a/internal/actions/http_module_config.go +++ b/internal/actions/http_module_config.go @@ -5,7 +5,7 @@ import ( "reflect" "github.com/mitchellh/mapstructure" - z_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func SetHTTPConfig(config *HTTPConfig) { @@ -68,7 +68,7 @@ func NewIPChecker(i string) (AddressChecker, error) { if ip := net.ParseIP(i); ip != nil { return &IPChecker{IP: ip}, nil } - return nil, z_errs.ThrowInvalidArgument(nil, "ACTIO-ddJ7h", "invalid ip") + return nil, zerrors.ThrowInvalidArgument(nil, "ACTIO-ddJ7h", "invalid ip") } type IPChecker struct { diff --git a/internal/actions/http_module_test.go b/internal/actions/http_module_test.go index 1b456d219..0d3bdef75 100644 --- a/internal/actions/http_module_test.go +++ b/internal/actions/http_module_test.go @@ -11,9 +11,9 @@ import ( "github.com/dop251/goja" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/logstore" "github.com/zitadel/zitadel/internal/logstore/record" + "github.com/zitadel/zitadel/internal/zerrors" ) func Test_isHostBlocked(t *testing.T) { @@ -208,7 +208,7 @@ func TestHTTP_fetchConfigFromArg(t *testing.T) { }, wantConfig: fetchConfig{}, wantErr: func(err error) bool { - return errors.IsErrorInvalidArgument(err) + return zerrors.IsErrorInvalidArgument(err) }, }, } diff --git a/internal/api/api.go b/internal/api/api.go index 82d574fe0..538d22f48 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -19,10 +19,10 @@ import ( http_util "github.com/zitadel/zitadel/internal/api/http" http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" "github.com/zitadel/zitadel/internal/api/ui/login" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/telemetry/metrics" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type API struct { @@ -196,7 +196,7 @@ func (a *API) healthHandler() http.Handler { checks := []ValidationFunction{ func(ctx context.Context) error { if err := a.health.Health(ctx); err != nil { - return errors.ThrowInternal(err, "API-F24h2", "DB CONNECTION ERROR") + return zerrors.ThrowInternal(err, "API-F24h2", "DB CONNECTION ERROR") } return nil }, diff --git a/internal/api/authz/access_token_test.go b/internal/api/authz/access_token_test.go index 54f3c6518..dacbda8c7 100644 --- a/internal/api/authz/access_token_test.go +++ b/internal/api/authz/access_token_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func Test_extractBearerToken(t *testing.T) { @@ -58,7 +58,7 @@ func Test_extractBearerToken(t *testing.T) { t.Errorf("got wrong result, should not get err: actual: %v ", err) } - if tt.wantErr && !errors.IsUnauthenticated(err) { + if tt.wantErr && !zerrors.IsUnauthenticated(err) { t.Errorf("got wrong err: %v ", err) } }) diff --git a/internal/api/authz/authorization.go b/internal/api/authz/authorization.go index ad55ab976..2099b3e42 100644 --- a/internal/api/authz/authorization.go +++ b/internal/api/authz/authorization.go @@ -6,8 +6,8 @@ import ( "reflect" "strings" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -56,7 +56,7 @@ func CheckUserAuthorization(ctx context.Context, req interface{}, token, orgID, func checkUserPermissions(req interface{}, userPerms []string, authOpt Option) error { if len(userPerms) == 0 { - return errors.ThrowPermissionDenied(nil, "AUTH-5mWD2", "No matching permissions found") + return zerrors.ThrowPermissionDenied(nil, "AUTH-5mWD2", "No matching permissions found") } if authOpt.CheckParam == "" { @@ -71,7 +71,7 @@ func checkUserPermissions(req interface{}, userPerms []string, authOpt Option) e return nil } - return errors.ThrowPermissionDenied(nil, "AUTH-3jknH", "No matching permissions found") + return zerrors.ThrowPermissionDenied(nil, "AUTH-3jknH", "No matching permissions found") } func SplitPermission(perm string) (string, string) { diff --git a/internal/api/authz/authorization_test.go b/internal/api/authz/authorization_test.go index fea2e9bc7..4b81c73d8 100644 --- a/internal/api/authz/authorization_test.go +++ b/internal/api/authz/authorization_test.go @@ -3,7 +3,7 @@ package authz import ( "testing" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type TestRequest struct { @@ -77,7 +77,7 @@ func Test_CheckUserPermissions(t *testing.T) { t.Errorf("shouldn't get err: %v ", err) } - if tt.wantErr && !errors.IsPermissionDenied(err) { + if tt.wantErr && !zerrors.IsPermissionDenied(err) { t.Errorf("got wrong err: %v ", err) } }) diff --git a/internal/api/authz/context.go b/internal/api/authz/context.go index abd44c8ea..3a1168494 100644 --- a/internal/api/authz/context.go +++ b/internal/api/authz/context.go @@ -11,8 +11,8 @@ import ( "github.com/zitadel/zitadel/internal/api/grpc" http_util "github.com/zitadel/zitadel/internal/api/http" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type key int @@ -105,7 +105,7 @@ func VerifyTokenAndCreateCtxData(ctx context.Context, token, orgID, orgDomain st } userID, clientID, agentID, prefLang, resourceOwner, err := t.VerifyAccessToken(ctx, tokenWOBearer) var sysMemberships Memberships - if err != nil && !zitadel_errors.IsUnauthenticated(err) { + if err != nil && !zerrors.IsUnauthenticated(err) { return CtxData{}, err } if err != nil { @@ -113,7 +113,7 @@ func VerifyTokenAndCreateCtxData(ctx context.Context, token, orgID, orgDomain st var sysTokenErr error sysMemberships, userID, sysTokenErr = t.VerifySystemToken(ctx, tokenWOBearer, orgID) if sysTokenErr != nil || sysMemberships == nil { - return CtxData{}, zitadel_errors.ThrowUnauthenticated(errors.Join(err, sysTokenErr), "AUTH-7fs1e", "Errors.Token.Invalid") + return CtxData{}, zerrors.ThrowUnauthenticated(errors.Join(err, sysTokenErr), "AUTH-7fs1e", "Errors.Token.Invalid") } } var projectID string @@ -121,7 +121,7 @@ func VerifyTokenAndCreateCtxData(ctx context.Context, token, orgID, orgDomain st if clientID != "" { projectID, origins, err = t.ProjectIDAndOriginsByClientID(ctx, clientID) if err != nil { - return CtxData{}, zitadel_errors.ThrowPermissionDenied(err, "AUTH-GHpw2", "could not read projectid by clientid") + return CtxData{}, zerrors.ThrowPermissionDenied(err, "AUTH-GHpw2", "could not read projectid by clientid") } // We used to check origins for every token, but service users shouldn't be used publicly (native app / SPA). // Therefore, mostly won't send an origin and aren't able to configure them anyway. @@ -137,7 +137,7 @@ func VerifyTokenAndCreateCtxData(ctx context.Context, token, orgID, orgDomain st if orgID != "" { orgID, err = t.ExistsOrg(ctx, orgID, orgDomain) if err != nil { - return CtxData{}, zitadel_errors.ThrowPermissionDenied(nil, "AUTH-Bs7Ds", "Organisation doesn't exist") + return CtxData{}, zerrors.ThrowPermissionDenied(nil, "AUTH-Bs7Ds", "Organisation doesn't exist") } } return CtxData{ @@ -176,13 +176,13 @@ func checkOrigin(ctx context.Context, origins []string) error { if http_util.IsOriginAllowed(origins, origin) { return nil } - return zitadel_errors.ThrowPermissionDenied(nil, "AUTH-DZG21", "Errors.OriginNotAllowed") + return zerrors.ThrowPermissionDenied(nil, "AUTH-DZG21", "Errors.OriginNotAllowed") } func extractBearerToken(token string) (part string, err error) { parts := strings.Split(token, BearerPrefix) if len(parts) != 2 { - return "", zitadel_errors.ThrowUnauthenticated(nil, "AUTH-7fs1e", "invalid auth header") + return "", zerrors.ThrowUnauthenticated(nil, "AUTH-7fs1e", "invalid auth header") } return parts[1], nil } diff --git a/internal/api/authz/permissions.go b/internal/api/authz/permissions.go index 8400efe8f..e96a7b256 100644 --- a/internal/api/authz/permissions.go +++ b/internal/api/authz/permissions.go @@ -3,8 +3,8 @@ package authz import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func CheckPermission(ctx context.Context, resolver MembershipsResolver, roleMappings []RoleMapping, permission, orgID, resourceID string) (err error) { @@ -27,7 +27,7 @@ func getUserPermissions(ctx context.Context, resolver MembershipsResolver, requi defer func() { span.EndWithError(err) }() if ctxData.IsZero() { - return nil, nil, errors.ThrowUnauthenticated(nil, "AUTH-rKLWEH", "context missing") + return nil, nil, zerrors.ThrowUnauthenticated(nil, "AUTH-rKLWEH", "context missing") } if ctxData.SystemMemberships != nil { @@ -43,7 +43,7 @@ func getUserPermissions(ctx context.Context, resolver MembershipsResolver, requi if len(memberships) == 0 { memberships, err = resolver.SearchMyMemberships(ctx, orgID, true) if len(memberships) == 0 { - return nil, nil, errors.ThrowNotFound(nil, "AUTHZ-cdgFk", "membership not found") + return nil, nil, zerrors.ThrowNotFound(nil, "AUTHZ-cdgFk", "membership not found") } if err != nil { return nil, nil, err @@ -57,7 +57,7 @@ func getUserPermissions(ctx context.Context, resolver MembershipsResolver, requi // or the specific resource (project.write:123) func checkUserResourcePermissions(userPerms []string, resourceID string) error { if len(userPerms) == 0 { - return errors.ThrowPermissionDenied(nil, "AUTH-AWfge", "No matching permissions found") + return zerrors.ThrowPermissionDenied(nil, "AUTH-AWfge", "No matching permissions found") } if resourceID == "" { @@ -72,7 +72,7 @@ func checkUserResourcePermissions(userPerms []string, resourceID string) error { return nil } - return errors.ThrowPermissionDenied(nil, "AUTH-Swrgg2", "No matching permissions found") + return zerrors.ThrowPermissionDenied(nil, "AUTH-Swrgg2", "No matching permissions found") } func hasContextResourcePermission(permissions []string, resourceID string) bool { diff --git a/internal/api/authz/permissions_test.go b/internal/api/authz/permissions_test.go index a500f6a4f..7919747de 100644 --- a/internal/api/authz/permissions_test.go +++ b/internal/api/authz/permissions_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func equalStringArray(a, b []string) bool { @@ -61,7 +61,7 @@ func Test_GetUserPermissions(t *testing.T) { }, }, wantErr: true, - errFunc: caos_errs.IsUnauthenticated, + errFunc: zerrors.IsUnauthenticated, result: []string{"project.read"}, }, { @@ -563,7 +563,7 @@ func Test_CheckUserResourcePermissions(t *testing.T) { t.Errorf("shouldn't get err: %v ", err) } - if tt.wantErr && !caos_errs.IsPermissionDenied(err) { + if tt.wantErr && !zerrors.IsPermissionDenied(err) { t.Errorf("got wrong err: %v ", err) } }) diff --git a/internal/api/authz/session_token.go b/internal/api/authz/session_token.go index 169182851..eb4600865 100644 --- a/internal/api/authz/session_token.go +++ b/internal/api/authz/session_token.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/zitadel/zitadel/internal/crypto" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -25,7 +25,7 @@ func SessionTokenVerifier(algorithm crypto.EncryptionAlgorithm) func(ctx context token, err := algorithm.DecryptString(decodedToken, algorithm.EncryptionKeyID()) spanPasswordComparison.EndWithError(err) if err != nil || token != fmt.Sprintf(SessionTokenFormat, sessionID, tokenID) { - return zitadel_errors.ThrowPermissionDenied(err, "COMMAND-sGr42", "Errors.Session.Token.Invalid") + return zerrors.ThrowPermissionDenied(err, "COMMAND-sGr42", "Errors.Session.Token.Invalid") } return nil } diff --git a/internal/api/authz/system_token.go b/internal/api/authz/system_token.go index 08d7bde66..da4c7d81d 100644 --- a/internal/api/authz/system_token.go +++ b/internal/api/authz/system_token.go @@ -12,7 +12,7 @@ import ( "github.com/zitadel/oidc/v3/pkg/op" "github.com/zitadel/zitadel/internal/crypto" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var _ SystemTokenVerifier = (*SystemTokenVerifierFromConfig)(nil) @@ -61,7 +61,7 @@ func (s *SystemTokenVerifierFromConfig) VerifySystemToken(ctx context.Context, t } systemUserMemberships, ok := s.systemUsers[jwtReq.Subject] if !ok { - return nil, "", zitadel_errors.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong") + return nil, "", zerrors.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong") } matchingMemberships = make(Memberships, 0, len(systemUserMemberships)) for _, membership := range systemUserMemberships { @@ -91,7 +91,7 @@ func (s *SystemAPIUser) readKey() (*rsa.PublicKey, error) { var err error s.KeyData, err = os.ReadFile(s.Path) if err != nil { - return nil, zitadel_errors.ThrowInternal(err, "AUTHZ-JK31F", "Errors.NotFound") + return nil, zerrors.ThrowInternal(err, "AUTHZ-JK31F", "Errors.NotFound") } } return crypto.BytesToPublicKey(s.KeyData) @@ -104,7 +104,7 @@ func (s *systemJWTStorage) GetKeyByIDAndClientID(_ context.Context, _, userID st } key, ok := s.keys[userID] if !ok { - return nil, zitadel_errors.ThrowNotFound(nil, "AUTHZ-asfd3", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "AUTHZ-asfd3", "Errors.User.NotFound") } s.mutex.Lock() defer s.mutex.Unlock() diff --git a/internal/api/authz/user.go b/internal/api/authz/user.go index 3bfbe45ce..23c7ae358 100644 --- a/internal/api/authz/user.go +++ b/internal/api/authz/user.go @@ -3,14 +3,14 @@ package authz import ( "context" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) // UserIDInCTX checks if the userID // equals the authenticated user in the context. func UserIDInCTX(ctx context.Context, userID string) error { if GetCtxData(ctx).UserID != userID { - return errors.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong") + return zerrors.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong") } return nil } diff --git a/internal/api/grpc/admin/export.go b/internal/api/grpc/admin/export.go index ec9086685..0bfe18528 100644 --- a/internal/api/grpc/admin/export.go +++ b/internal/api/grpc/admin/export.go @@ -9,9 +9,9 @@ import ( authn_grpc "github.com/zitadel/zitadel/internal/api/grpc/authn" text_grpc "github.com/zitadel/zitadel/internal/api/grpc/text" "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" app_pb "github.com/zitadel/zitadel/pkg/grpc/app" idp_pb "github.com/zitadel/zitadel/pkg/grpc/idp" @@ -325,7 +325,7 @@ func (s *Server) getIDPs(ctx context.Context, orgID string) (_ []*v1_pb.DataOIDC for _, idp := range idps.IDPs { if idp.OIDCIDP != nil { clientSecret, err := s.query.GetOIDCIDPClientSecret(ctx, false, orgID, idp.ID, false) - if err != nil && !caos_errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return nil, nil, err } oidcIdps = append(oidcIdps, &v1_pb.DataOIDCIDP{ @@ -590,7 +590,7 @@ func (s *Server) getUsers(ctx context.Context, org string, withPasswords bool, w ctx, pwspan := tracing.NewSpan(ctx) encodedHash, err := s.query.GetHumanPassword(ctx, org, user.ID) pwspan.EndWithError(err) - if err != nil && !caos_errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return nil, nil, nil, nil, err } if err == nil && encodedHash != "" { @@ -603,7 +603,7 @@ func (s *Server) getUsers(ctx context.Context, org string, withPasswords bool, w ctx, otpspan := tracing.NewSpan(ctx) code, err := s.query.GetHumanOTPSecret(ctx, user.ID, org) otpspan.EndWithError(err) - if err != nil && !caos_errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return nil, nil, nil, nil, err } if err == nil && code != "" { diff --git a/internal/api/grpc/admin/iam_settings_converter.go b/internal/api/grpc/admin/iam_settings_converter.go index 2238562d5..575fe75b3 100644 --- a/internal/api/grpc/admin/iam_settings_converter.go +++ b/internal/api/grpc/admin/iam_settings_converter.go @@ -7,9 +7,9 @@ import ( obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/notification/channels/smtp" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" settings_pb "github.com/zitadel/zitadel/pkg/grpc/settings" ) @@ -47,7 +47,7 @@ func SecretGeneratorQueryToModel(apiQuery *settings_pb.SecretGeneratorQuery) (qu domainType := SecretGeneratorTypeToDomain(q.TypeQuery.GeneratorType) return query.NewSecretGeneratorTypeSearchQuery(int32(domainType)) default: - return nil, errors.ThrowInvalidArgument(nil, "ORG-fm9es", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-fm9es", "List.Query.Invalid") } } diff --git a/internal/api/grpc/admin/idp_converter.go b/internal/api/grpc/admin/idp_converter.go index c5b6ede88..ce3884d2b 100644 --- a/internal/api/grpc/admin/idp_converter.go +++ b/internal/api/grpc/admin/idp_converter.go @@ -7,9 +7,9 @@ import ( "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" idp_pb "github.com/zitadel/zitadel/pkg/grpc/idp" ) @@ -126,7 +126,7 @@ func idpQueryToModel(idpQuery *admin_pb.IDPQuery) (query.SearchQuery, error) { case *admin_pb.IDPQuery_IdpIdQuery: return query.NewIDPIDSearchQuery(q.IdpIdQuery.Id) default: - return nil, errors.ThrowInvalidArgument(nil, "ADMIN-VmqQu", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "ADMIN-VmqQu", "List.Query.Invalid") } } @@ -200,7 +200,7 @@ func providerQueryToQuery(idpQuery *admin_pb.ProviderQuery) (query.SearchQuery, case *admin_pb.ProviderQuery_IdpIdQuery: return query.NewIDPTemplateIDSearchQuery(q.IdpIdQuery.Id) default: - return nil, errors.ThrowInvalidArgument(nil, "ADMIN-Dr2aa", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "ADMIN-Dr2aa", "List.Query.Invalid") } } diff --git a/internal/api/grpc/admin/milestone_converter.go b/internal/api/grpc/admin/milestone_converter.go index 0419cd3fe..97ac1ae58 100644 --- a/internal/api/grpc/admin/milestone_converter.go +++ b/internal/api/grpc/admin/milestone_converter.go @@ -2,9 +2,9 @@ package admin import ( "github.com/zitadel/zitadel/internal/api/grpc/object" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/repository/milestone" + "github.com/zitadel/zitadel/internal/zerrors" admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" milestone_pb "github.com/zitadel/zitadel/pkg/grpc/milestone" "google.golang.org/protobuf/types/known/timestamppb" @@ -48,7 +48,7 @@ func milestoneQueryToModel(milestoneQuery *milestone_pb.MilestoneQuery) (query.S } return query.NewIsNullQuery(query.MilestoneReachedDateColID) default: - return nil, errors.ThrowInvalidArgument(nil, "ADMIN-sE7pc", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "ADMIN-sE7pc", "List.Query.Invalid") } } diff --git a/internal/api/grpc/errors/caos_errors.go b/internal/api/grpc/errors/caos_errors.go deleted file mode 100644 index a1d6c2506..000000000 --- a/internal/api/grpc/errors/caos_errors.go +++ /dev/null @@ -1,63 +0,0 @@ -package errors - -import ( - "context" - - "github.com/zitadel/logging" - caos_errs "github.com/zitadel/zitadel/internal/errors" - "github.com/zitadel/zitadel/pkg/grpc/message" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" -) - -func CaosToGRPCError(ctx context.Context, err error) error { - if err == nil { - return nil - } - code, key, id, ok := ExtractCaosError(err) - if !ok { - return status.Convert(err).Err() - } - msg := key - msg += " (" + id + ")" - - s, err := status.New(code, msg).WithDetails(&message.ErrorDetail{Id: id, Message: key}) - if err != nil { - logging.Log("GRPC-gIeRw").WithError(err).Debug("unable to add detail") - return status.New(code, msg).Err() - } - - return s.Err() -} - -func ExtractCaosError(err error) (c codes.Code, msg, id string, ok bool) { - if err == nil { - return codes.OK, "", "", false - } - switch caosErr := err.(type) { - case *caos_errs.AlreadyExistsError: - return codes.AlreadyExists, caosErr.GetMessage(), caosErr.GetID(), true - case *caos_errs.DeadlineExceededError: - return codes.DeadlineExceeded, caosErr.GetMessage(), caosErr.GetID(), true - case *caos_errs.InternalError: - return codes.Internal, caosErr.GetMessage(), caosErr.GetID(), true - case *caos_errs.InvalidArgumentError: - return codes.InvalidArgument, caosErr.GetMessage(), caosErr.GetID(), true - case *caos_errs.NotFoundError: - return codes.NotFound, caosErr.GetMessage(), caosErr.GetID(), true - case *caos_errs.PermissionDeniedError: - return codes.PermissionDenied, caosErr.GetMessage(), caosErr.GetID(), true - case *caos_errs.PreconditionFailedError: - return codes.FailedPrecondition, caosErr.GetMessage(), caosErr.GetID(), true - case *caos_errs.UnauthenticatedError: - return codes.Unauthenticated, caosErr.GetMessage(), caosErr.GetID(), true - case *caos_errs.UnavailableError: - return codes.Unavailable, caosErr.GetMessage(), caosErr.GetID(), true - case *caos_errs.UnimplementedError: - return codes.Unimplemented, caosErr.GetMessage(), caosErr.GetID(), true - case *caos_errs.ResourceExhaustedError: - return codes.ResourceExhausted, caosErr.GetMessage(), caosErr.GetID(), true - default: - return codes.Unknown, err.Error(), "", false - } -} diff --git a/internal/api/grpc/event/event.go b/internal/api/grpc/event/event.go index 204c148a8..9d708b559 100644 --- a/internal/api/grpc/event/event.go +++ b/internal/api/grpc/event/event.go @@ -4,8 +4,8 @@ import ( "google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" eventpb "github.com/zitadel/zitadel/pkg/grpc/event" "github.com/zitadel/zitadel/pkg/grpc/message" ) @@ -28,7 +28,7 @@ func EventToPb(event *query.Event) (response *eventpb.Event, err error) { if len(event.Payload) > 0 { payload = new(structpb.Struct) if err := payload.UnmarshalJSON(event.Payload); err != nil { - return nil, errors.ThrowInternal(err, "ADMIN-eaimD", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "ADMIN-eaimD", "Errors.Internal") } } return &eventpb.Event{ diff --git a/internal/api/grpc/gerrors/zitadel_errors.go b/internal/api/grpc/gerrors/zitadel_errors.go new file mode 100644 index 000000000..60e847389 --- /dev/null +++ b/internal/api/grpc/gerrors/zitadel_errors.go @@ -0,0 +1,68 @@ +package gerrors + +import ( + "errors" + + "github.com/zitadel/logging" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + "github.com/zitadel/zitadel/internal/zerrors" + "github.com/zitadel/zitadel/pkg/grpc/message" +) + +func ZITADELToGRPCError(err error) error { + if err == nil { + return nil + } + code, key, id, ok := ExtractZITADELError(err) + if !ok { + return status.Convert(err).Err() + } + msg := key + msg += " (" + id + ")" + + s, err := status.New(code, msg).WithDetails(&message.ErrorDetail{Id: id, Message: key}) + if err != nil { + logging.WithError(err).WithField("logID", "GRPC-gIeRw").Debug("unable to add detail") + return status.New(code, msg).Err() + } + + return s.Err() +} + +func ExtractZITADELError(err error) (c codes.Code, msg, id string, ok bool) { + if err == nil { + return codes.OK, "", "", false + } + zitadelErr := new(zerrors.ZitadelError) + if ok := errors.As(err, &zitadelErr); !ok { + return codes.Unknown, err.Error(), "", false + } + switch { + case zerrors.IsErrorAlreadyExists(err): + return codes.AlreadyExists, zitadelErr.GetMessage(), zitadelErr.GetID(), true + case zerrors.IsDeadlineExceeded(err): + return codes.DeadlineExceeded, zitadelErr.GetMessage(), zitadelErr.GetID(), true + case zerrors.IsInternal(err): + return codes.Internal, zitadelErr.GetMessage(), zitadelErr.GetID(), true + case zerrors.IsErrorInvalidArgument(err): + return codes.InvalidArgument, zitadelErr.GetMessage(), zitadelErr.GetID(), true + case zerrors.IsNotFound(err): + return codes.NotFound, zitadelErr.GetMessage(), zitadelErr.GetID(), true + case zerrors.IsPermissionDenied(err): + return codes.PermissionDenied, zitadelErr.GetMessage(), zitadelErr.GetID(), true + case zerrors.IsPreconditionFailed(err): + return codes.FailedPrecondition, zitadelErr.GetMessage(), zitadelErr.GetID(), true + case zerrors.IsUnauthenticated(err): + return codes.Unauthenticated, zitadelErr.GetMessage(), zitadelErr.GetID(), true + case zerrors.IsUnavailable(err): + return codes.Unavailable, zitadelErr.GetMessage(), zitadelErr.GetID(), true + case zerrors.IsUnimplemented(err): + return codes.Unimplemented, zitadelErr.GetMessage(), zitadelErr.GetID(), true + case zerrors.IsResourceExhausted(err): + return codes.ResourceExhausted, zitadelErr.GetMessage(), zitadelErr.GetID(), true + default: + return codes.Unknown, err.Error(), "", false + } +} diff --git a/internal/api/grpc/errors/caos_errors_test.go b/internal/api/grpc/gerrors/zitadel_errors_test.go similarity index 66% rename from internal/api/grpc/errors/caos_errors_test.go rename to internal/api/grpc/gerrors/zitadel_errors_test.go index 3a14f1bbf..4e5604790 100644 --- a/internal/api/grpc/errors/caos_errors_test.go +++ b/internal/api/grpc/gerrors/zitadel_errors_test.go @@ -1,13 +1,12 @@ -package errors +package gerrors import ( - "context" "errors" "testing" "google.golang.org/grpc/codes" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCaosToGRPCError(t *testing.T) { @@ -31,14 +30,14 @@ func TestCaosToGRPCError(t *testing.T) { }, { "caos error", - args{caos_errs.ThrowInternal(nil, "", "message")}, + args{zerrors.ThrowInternal(nil, "", "message")}, true, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - if err := CaosToGRPCError(context.Background(), tt.args.err); (err != nil) != tt.wantErr { - t.Errorf("CaosToGRPCError() error = %v, wantErr %v", err, tt.wantErr) + if err := ZITADELToGRPCError(tt.args.err); (err != nil) != tt.wantErr { + t.Errorf("ZITADELToGRPCError() error = %v, wantErr %v", err, tt.wantErr) } }) } @@ -58,7 +57,7 @@ func Test_Extract(t *testing.T) { }{ { "already exists", - args{caos_errs.ThrowAlreadyExists(nil, "id", "already exists")}, + args{zerrors.ThrowAlreadyExists(nil, "id", "already exists")}, codes.AlreadyExists, "already exists", "id", @@ -66,7 +65,7 @@ func Test_Extract(t *testing.T) { }, { "deadline exceeded", - args{caos_errs.ThrowDeadlineExceeded(nil, "id", "deadline exceeded")}, + args{zerrors.ThrowDeadlineExceeded(nil, "id", "deadline exceeded")}, codes.DeadlineExceeded, "deadline exceeded", "id", @@ -74,7 +73,7 @@ func Test_Extract(t *testing.T) { }, { "internal error", - args{caos_errs.ThrowInternal(nil, "id", "internal error")}, + args{zerrors.ThrowInternal(nil, "id", "internal error")}, codes.Internal, "internal error", "id", @@ -82,7 +81,7 @@ func Test_Extract(t *testing.T) { }, { "invalid argument", - args{caos_errs.ThrowInvalidArgument(nil, "id", "invalid argument")}, + args{zerrors.ThrowInvalidArgument(nil, "id", "invalid argument")}, codes.InvalidArgument, "invalid argument", "id", @@ -90,7 +89,7 @@ func Test_Extract(t *testing.T) { }, { "not found", - args{caos_errs.ThrowNotFound(nil, "id", "not found")}, + args{zerrors.ThrowNotFound(nil, "id", "not found")}, codes.NotFound, "not found", "id", @@ -98,7 +97,7 @@ func Test_Extract(t *testing.T) { }, { "permission denied", - args{caos_errs.ThrowPermissionDenied(nil, "id", "permission denied")}, + args{zerrors.ThrowPermissionDenied(nil, "id", "permission denied")}, codes.PermissionDenied, "permission denied", "id", @@ -106,7 +105,7 @@ func Test_Extract(t *testing.T) { }, { "precondition failed", - args{caos_errs.ThrowPreconditionFailed(nil, "id", "precondition failed")}, + args{zerrors.ThrowPreconditionFailed(nil, "id", "precondition failed")}, codes.FailedPrecondition, "precondition failed", "id", @@ -114,7 +113,7 @@ func Test_Extract(t *testing.T) { }, { "unauthenticated", - args{caos_errs.ThrowUnauthenticated(nil, "id", "unauthenticated")}, + args{zerrors.ThrowUnauthenticated(nil, "id", "unauthenticated")}, codes.Unauthenticated, "unauthenticated", "id", @@ -122,7 +121,7 @@ func Test_Extract(t *testing.T) { }, { "unavailable", - args{caos_errs.ThrowUnavailable(nil, "id", "unavailable")}, + args{zerrors.ThrowUnavailable(nil, "id", "unavailable")}, codes.Unavailable, "unavailable", "id", @@ -130,7 +129,7 @@ func Test_Extract(t *testing.T) { }, { "unimplemented", - args{caos_errs.ThrowUnimplemented(nil, "id", "unimplemented")}, + args{zerrors.ThrowUnimplemented(nil, "id", "unimplemented")}, codes.Unimplemented, "unimplemented", "id", @@ -138,7 +137,7 @@ func Test_Extract(t *testing.T) { }, { "exhausted", - args{caos_errs.ThrowResourceExhausted(nil, "id", "exhausted")}, + args{zerrors.ThrowResourceExhausted(nil, "id", "exhausted")}, codes.ResourceExhausted, "exhausted", "id", @@ -155,7 +154,7 @@ func Test_Extract(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - gotC, gotMsg, gotID, gotOk := ExtractCaosError(tt.args.err) + gotC, gotMsg, gotID, gotOk := ExtractZITADELError(tt.args.err) if gotC != tt.wantC { t.Errorf("extract() gotC = %v, want %v", gotC, tt.wantC) } diff --git a/internal/api/grpc/instance/converter.go b/internal/api/grpc/instance/converter.go index ae98bcfa5..6bfb3e553 100644 --- a/internal/api/grpc/instance/converter.go +++ b/internal/api/grpc/instance/converter.go @@ -3,8 +3,8 @@ package org import ( "github.com/zitadel/zitadel/cmd/build" "github.com/zitadel/zitadel/internal/api/grpc/object" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" instance_pb "github.com/zitadel/zitadel/pkg/grpc/instance" ) @@ -66,7 +66,7 @@ func InstanceQueryToModel(searchQuery *instance_pb.Query) (query.SearchQuery, er case *instance_pb.Query_DomainQuery: return query.NewInstanceDomainsListSearchQuery(q.DomainQuery.Domains...) default: - return nil, errors.ThrowInvalidArgument(nil, "INST-3m0se", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-3m0se", "List.Query.Invalid") } } @@ -90,7 +90,7 @@ func DomainQueryToModel(searchQuery *instance_pb.DomainSearchQuery) (query.Searc case *instance_pb.DomainSearchQuery_PrimaryQuery: return query.NewInstanceDomainPrimarySearchQuery(q.PrimaryQuery.Primary) default: - return nil, errors.ThrowInvalidArgument(nil, "INST-Ags42", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Ags42", "List.Query.Invalid") } } diff --git a/internal/api/grpc/management/actions_converter.go b/internal/api/grpc/management/actions_converter.go index 643ba88b1..de75734b8 100644 --- a/internal/api/grpc/management/actions_converter.go +++ b/internal/api/grpc/management/actions_converter.go @@ -4,9 +4,9 @@ import ( action_grpc "github.com/zitadel/zitadel/internal/api/grpc/action" "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) @@ -63,5 +63,5 @@ func ActionQueryToQuery(query interface{}) (query.SearchQuery, error) { case *mgmt_pb.ActionQuery_ActionIdQuery: return action_grpc.ActionIDQuery(q.ActionIdQuery) } - return nil, errors.ThrowInvalidArgument(nil, "MGMT-dsg3z", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(nil, "MGMT-dsg3z", "Errors.Query.InvalidRequest") } diff --git a/internal/api/grpc/management/auth_checks.go b/internal/api/grpc/management/auth_checks.go index 62e8d8c02..2b2ad2500 100644 --- a/internal/api/grpc/management/auth_checks.go +++ b/internal/api/grpc/management/auth_checks.go @@ -4,7 +4,7 @@ import ( "context" "github.com/zitadel/zitadel/internal/api/authz" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func checkExplicitProjectPermission(ctx context.Context, grantID, projectID string) error { @@ -19,7 +19,7 @@ func checkExplicitProjectPermission(ctx context.Context, grantID, projectID stri if listContainsID(ids, projectID) { return nil } - return caos_errors.ThrowPermissionDenied(nil, "EVENT-Shu7e", "Errors.UserGrant.NoPermissionForProject") + return zerrors.ThrowPermissionDenied(nil, "EVENT-Shu7e", "Errors.UserGrant.NoPermissionForProject") } func listContainsID(ids []string, id string) bool { diff --git a/internal/api/grpc/management/flow.go b/internal/api/grpc/management/flow.go index 8a38c80f2..3d9fbab52 100644 --- a/internal/api/grpc/management/flow.go +++ b/internal/api/grpc/management/flow.go @@ -7,7 +7,7 @@ import ( action_grpc "github.com/zitadel/zitadel/internal/api/grpc/action" obj_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" action_pb "github.com/zitadel/zitadel/pkg/grpc/action" mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) @@ -26,7 +26,7 @@ func (s *Server) ListFlowTypes(ctx context.Context, _ *mgmt_pb.ListFlowTypesRequ func (s *Server) ListFlowTriggerTypes(ctx context.Context, req *mgmt_pb.ListFlowTriggerTypesRequest) (*mgmt_pb.ListFlowTriggerTypesResponse, error) { triggerTypes := action_grpc.FlowTypeToDomain(req.Type).TriggerTypes() if len(triggerTypes) == 0 { - return nil, errors.ThrowNotFound(nil, "MANAG-P2OBk", "Errors.NotFound") + return nil, zerrors.ThrowNotFound(nil, "MANAG-P2OBk", "Errors.NotFound") } return &mgmt_pb.ListFlowTriggerTypesResponse{ Result: action_grpc.TriggerTypesToPb(triggerTypes), diff --git a/internal/api/grpc/management/idp_converter.go b/internal/api/grpc/management/idp_converter.go index e6df255f3..d86fe478d 100644 --- a/internal/api/grpc/management/idp_converter.go +++ b/internal/api/grpc/management/idp_converter.go @@ -10,10 +10,10 @@ import ( "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" iam_model "github.com/zitadel/zitadel/internal/iam/model" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" idp_pb "github.com/zitadel/zitadel/pkg/grpc/idp" mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) @@ -132,7 +132,7 @@ func idpQueryToModel(idpQuery *mgmt_pb.IDPQuery) (query.SearchQuery, error) { case *mgmt_pb.IDPQuery_OwnerTypeQuery: return query.NewIDPOwnerTypeSearchQuery(idp_grpc.IDPProviderTypeFromPb(q.OwnerTypeQuery.OwnerType)) default: - return nil, errors.ThrowInvalidArgument(nil, "MANAG-WtLPV", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "MANAG-WtLPV", "List.Query.Invalid") } } @@ -217,7 +217,7 @@ func providerQueryToQuery(idpQuery *mgmt_pb.ProviderQuery) (query.SearchQuery, e case *mgmt_pb.ProviderQuery_OwnerTypeQuery: return query.NewIDPTemplateOwnerTypeSearchQuery(idp_grpc.IDPProviderTypeFromPb(q.OwnerTypeQuery.OwnerType)) default: - return nil, errors.ThrowInvalidArgument(nil, "ORG-Dr2aa", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Dr2aa", "List.Query.Invalid") } } diff --git a/internal/api/grpc/management/project_grant_converter.go b/internal/api/grpc/management/project_grant_converter.go index 1e5d941fa..de7d1de04 100644 --- a/internal/api/grpc/management/project_grant_converter.go +++ b/internal/api/grpc/management/project_grant_converter.go @@ -7,9 +7,9 @@ import ( member_grpc "github.com/zitadel/zitadel/internal/api/grpc/member" "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" proj_pb "github.com/zitadel/zitadel/pkg/grpc/project" ) @@ -55,7 +55,7 @@ func ProjectGrantQueryToModel(apiQuery *proj_pb.ProjectGrantQuery) (query.Search case *proj_pb.ProjectGrantQuery_RoleKeyQuery: return query.NewProjectGrantRoleKeySearchQuery(q.RoleKeyQuery.RoleKey) default: - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-M099f", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-M099f", "List.Query.Invalid") } } func listAllProjectGrantsRequestToModel(req *mgmt_pb.ListAllProjectGrantsRequest) (*query.ProjectGrantSearchQueries, error) { @@ -97,7 +97,7 @@ func AllProjectGrantQueryToModel(apiQuery *proj_pb.AllProjectGrantQuery) (query. case *proj_pb.AllProjectGrantQuery_GrantedOrgIdQuery: return query.NewProjectGrantGrantedOrgIDSearchQuery(q.GrantedOrgIdQuery.GrantedOrgId) default: - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-M099f", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-M099f", "List.Query.Invalid") } } func AddProjectGrantRequestToDomain(req *mgmt_pb.AddProjectGrantRequest) *domain.ProjectGrant { diff --git a/internal/api/grpc/management/user.go b/internal/api/grpc/management/user.go index b425a813f..26d66d612 100644 --- a/internal/api/grpc/management/user.go +++ b/internal/api/grpc/management/user.go @@ -20,10 +20,10 @@ import ( "github.com/zitadel/zitadel/internal/api/ui/login" "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" ) @@ -33,7 +33,7 @@ func (s *Server) getUserByID(ctx context.Context, id string) (*query.User, error return nil, err } if user.ResourceOwner != authz.GetCtxData(ctx).OrgID { - return nil, errors.ThrowNotFound(nil, "MANAG-fpo4B", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "MANAG-fpo4B", "Errors.User.NotFound") } return user, nil } diff --git a/internal/api/grpc/member/converter.go b/internal/api/grpc/member/converter.go index a62e2c323..0d0497d31 100644 --- a/internal/api/grpc/member/converter.go +++ b/internal/api/grpc/member/converter.go @@ -4,8 +4,8 @@ import ( "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/api/grpc/user" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" member_pb "github.com/zitadel/zitadel/pkg/grpc/member" ) @@ -66,6 +66,6 @@ func MemberQueryToMember(search *member_pb.SearchQuery) (query.SearchQuery, erro case *member_pb.SearchQuery_UserIdQuery: return query.NewMemberUserIDSearchQuery(q.UserIdQuery.UserId) default: - return nil, errors.ThrowInvalidArgument(nil, "MEMBE-7Bb92", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(nil, "MEMBE-7Bb92", "Errors.Query.InvalidRequest") } } diff --git a/internal/api/grpc/metadata/metadata.go b/internal/api/grpc/metadata/metadata.go index e54007e09..e6be7685f 100644 --- a/internal/api/grpc/metadata/metadata.go +++ b/internal/api/grpc/metadata/metadata.go @@ -2,8 +2,8 @@ package metadata import ( "github.com/zitadel/zitadel/internal/api/grpc/object" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" meta_pb "github.com/zitadel/zitadel/pkg/grpc/metadata" ) @@ -65,7 +65,7 @@ func MetadataQueryToQuery(query *meta_pb.MetadataQuery) (query.SearchQuery, erro case *meta_pb.MetadataQuery_KeyQuery: return MetadataKeyQueryToQuery(q.KeyQuery) default: - return nil, errors.ThrowInvalidArgument(nil, "METAD-fdg23", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "METAD-fdg23", "List.Query.Invalid") } } diff --git a/internal/api/grpc/oidc/v2/oidc.go b/internal/api/grpc/oidc/v2/oidc.go index 6ca77bb61..258ebd6a6 100644 --- a/internal/api/grpc/oidc/v2/oidc.go +++ b/internal/api/grpc/oidc/v2/oidc.go @@ -13,8 +13,8 @@ import ( "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/api/oidc" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" oidc_pb "github.com/zitadel/zitadel/pkg/grpc/oidc/v2beta" ) @@ -81,7 +81,7 @@ func (s *Server) CreateCallback(ctx context.Context, req *oidc_pb.CreateCallback case *oidc_pb.CreateCallbackRequest_Session: return s.linkSessionToAuthRequest(ctx, req.GetAuthRequestId(), v.Session) default: - return nil, errors.ThrowUnimplementedf(nil, "OIDCv2-zee7A", "verification oneOf %T in method CreateCallback not implemented", v) + return nil, zerrors.ThrowUnimplementedf(nil, "OIDCv2-zee7A", "verification oneOf %T in method CreateCallback not implemented", v) } } diff --git a/internal/api/grpc/org/converter.go b/internal/api/grpc/org/converter.go index 142df950e..d3c3cb3c1 100644 --- a/internal/api/grpc/org/converter.go +++ b/internal/api/grpc/org/converter.go @@ -3,8 +3,8 @@ package org import ( "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" org_pb "github.com/zitadel/zitadel/pkg/grpc/org" ) @@ -28,7 +28,7 @@ func OrgQueryToModel(apiQuery *org_pb.OrgQuery) (query.SearchQuery, error) { case *org_pb.OrgQuery_StateQuery: return query.NewOrgStateSearchQuery(OrgStateToDomain(q.StateQuery.State)) default: - return nil, errors.ThrowInvalidArgument(nil, "ORG-vR9nC", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-vR9nC", "List.Query.Invalid") } } @@ -52,7 +52,7 @@ func OrgQueryToQuery(search *org_pb.OrgQuery) (query.SearchQuery, error) { case *org_pb.OrgQuery_StateQuery: return query.NewOrgStateSearchQuery(OrgStateToDomain(q.StateQuery.State)) default: - return nil, errors.ThrowInvalidArgument(nil, "ADMIN-ADvsd", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "ADMIN-ADvsd", "List.Query.Invalid") } } @@ -137,7 +137,7 @@ func DomainQueryToModel(searchQuery *org_pb.DomainSearchQuery) (query.SearchQuer case *org_pb.DomainSearchQuery_DomainNameQuery: return query.NewOrgDomainDomainSearchQuery(object.TextMethodToQuery(q.DomainNameQuery.Method), q.DomainNameQuery.Name) default: - return nil, errors.ThrowInvalidArgument(nil, "ORG-Ags42", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Ags42", "List.Query.Invalid") } } diff --git a/internal/api/grpc/org/v2/org.go b/internal/api/grpc/org/v2/org.go index cc8f78cdd..1fc0ca8aa 100644 --- a/internal/api/grpc/org/v2/org.go +++ b/internal/api/grpc/org/v2/org.go @@ -6,7 +6,7 @@ import ( "github.com/zitadel/zitadel/internal/api/grpc/object/v2" "github.com/zitadel/zitadel/internal/api/grpc/user/v2" "github.com/zitadel/zitadel/internal/command" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta" ) @@ -62,7 +62,7 @@ func addOrganizationRequestAdminToCommand(admin *org.AddOrganizationRequest_Admi Roles: admin.GetRoles(), }, nil default: - return nil, caos_errs.ThrowUnimplementedf(nil, "ORGv2-SD2r1", "userType oneOf %T in method AddOrganization not implemented", a) + return nil, zerrors.ThrowUnimplementedf(nil, "ORGv2-SD2r1", "userType oneOf %T in method AddOrganization not implemented", a) } } diff --git a/internal/api/grpc/org/v2/org_test.go b/internal/api/grpc/org/v2/org_test.go index c8c4c0ea0..5024b59c1 100644 --- a/internal/api/grpc/org/v2/org_test.go +++ b/internal/api/grpc/org/v2/org_test.go @@ -11,7 +11,7 @@ import ( "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" object "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" @@ -37,7 +37,7 @@ func Test_addOrganizationRequestToCommand(t *testing.T) { }, }, }, - wantErr: caos_errs.ThrowUnimplementedf(nil, "ORGv2-SD2r1", "userType oneOf %T in method AddOrganization not implemented", nil), + wantErr: zerrors.ThrowUnimplementedf(nil, "ORGv2-SD2r1", "userType oneOf %T in method AddOrganization not implemented", nil), }, { name: "user ID", diff --git a/internal/api/grpc/project/application.go b/internal/api/grpc/project/application.go index e555e93d2..c1a5a88f3 100644 --- a/internal/api/grpc/project/application.go +++ b/internal/api/grpc/project/application.go @@ -5,8 +5,8 @@ import ( object_grpc "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" app_pb "github.com/zitadel/zitadel/pkg/grpc/app" message_pb "github.com/zitadel/zitadel/pkg/grpc/message" ) @@ -303,6 +303,6 @@ func AppQueryToModel(appQuery *app_pb.AppQuery) (query.SearchQuery, error) { case *app_pb.AppQuery_NameQuery: return query.NewAppNameSearchQuery(object_grpc.TextMethodToQuery(q.NameQuery.Method), q.NameQuery.Name) default: - return nil, errors.ThrowInvalidArgument(nil, "APP-Add46", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "APP-Add46", "List.Query.Invalid") } } diff --git a/internal/api/grpc/project/converter.go b/internal/api/grpc/project/converter.go index 86dafa453..887b82208 100644 --- a/internal/api/grpc/project/converter.go +++ b/internal/api/grpc/project/converter.go @@ -3,9 +3,9 @@ package project import ( "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" proj_model "github.com/zitadel/zitadel/internal/project/model" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" proj_pb "github.com/zitadel/zitadel/pkg/grpc/project" ) @@ -75,7 +75,7 @@ func ProjectQueryToModel(apiQuery *proj_pb.ProjectQuery) (query.SearchQuery, err case *proj_pb.ProjectQuery_ProjectResourceOwnerQuery: return query.NewProjectResourceOwnerSearchQuery(q.ProjectResourceOwnerQuery.ResourceOwner) default: - return nil, errors.ThrowInvalidArgument(nil, "ORG-vR9nC", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-vR9nC", "List.Query.Invalid") } } @@ -139,7 +139,7 @@ func GrantedProjectQueryToModel(query *proj_pb.ProjectQuery) (*proj_model.Projec case *proj_pb.ProjectQuery_NameQuery: return GrantedProjectQueryNameToModel(q.NameQuery), nil default: - return nil, errors.ThrowInvalidArgument(nil, "ORG-Ags42", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Ags42", "List.Query.Invalid") } } @@ -169,7 +169,7 @@ func RoleQueryToModel(apiQuery *proj_pb.RoleQuery) (query.SearchQuery, error) { case *proj_pb.RoleQuery_DisplayNameQuery: return query.NewProjectRoleDisplayNameSearchQuery(object.TextMethodToQuery(q.DisplayNameQuery.Method), q.DisplayNameQuery.DisplayName) default: - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-fms0e", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-fms0e", "List.Query.Invalid") } } diff --git a/internal/api/grpc/server/middleware/activity_interceptor.go b/internal/api/grpc/server/middleware/activity_interceptor.go index 79a3930c2..7b8b164e9 100644 --- a/internal/api/grpc/server/middleware/activity_interceptor.go +++ b/internal/api/grpc/server/middleware/activity_interceptor.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/metadata" "github.com/zitadel/zitadel/internal/activity" - "github.com/zitadel/zitadel/internal/api/grpc/errors" + "github.com/zitadel/zitadel/internal/api/grpc/gerrors" ainfo "github.com/zitadel/zitadel/internal/api/info" ) @@ -18,7 +18,7 @@ func ActivityInterceptor() grpc.UnaryServerInterceptor { ctx = activityInfoFromGateway(ctx).SetMethod(info.FullMethod).IntoContext(ctx) resp, err := handler(ctx, req) if isResourceAPI(info.FullMethod) { - code, _, _, _ := errors.ExtractCaosError(err) + code, _, _, _ := gerrors.ExtractZITADELError(err) ctx = ainfo.ActivityInfoFromContext(ctx).SetGRPCStatus(code).IntoContext(ctx) activity.TriggerGRPCWithContext(ctx, activity.ResourceAPI) } diff --git a/internal/api/grpc/server/middleware/auth_interceptor_test.go b/internal/api/grpc/server/middleware/auth_interceptor_test.go index c644ab2e3..3551d3e41 100644 --- a/internal/api/grpc/server/middleware/auth_interceptor_test.go +++ b/internal/api/grpc/server/middleware/auth_interceptor_test.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/metadata" "github.com/zitadel/zitadel/internal/api/authz" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const anAPIRole = "AN_API_ROLE" @@ -43,7 +43,7 @@ var ( return "user1", "", "", "", "org1", nil }) accessTokenNOK = authz.AccessTokenVerifierFunc(func(ctx context.Context, token string) (userID string, clientID string, agentID string, prefLan string, resourceOwner string, err error) { - return "", "", "", "", "", zitadel_errors.ThrowUnauthenticated(nil, "TEST-fQHDI", "unauthenticaded") + return "", "", "", "", "", zerrors.ThrowUnauthenticated(nil, "TEST-fQHDI", "unauthenticaded") }) systemTokenNOK = authz.SystemTokenVerifierFunc(func(ctx context.Context, token string, orgID string) (memberships authz.Memberships, userID string, err error) { return nil, "", errors.New("system token error") diff --git a/internal/api/grpc/server/middleware/error_interceptor.go b/internal/api/grpc/server/middleware/error_interceptor.go index b06cd930f..7c5e3163b 100644 --- a/internal/api/grpc/server/middleware/error_interceptor.go +++ b/internal/api/grpc/server/middleware/error_interceptor.go @@ -3,10 +3,9 @@ package middleware import ( "context" - "github.com/zitadel/zitadel/internal/api/grpc/errors" - "google.golang.org/grpc" + "github.com/zitadel/zitadel/internal/api/grpc/gerrors" _ "github.com/zitadel/zitadel/internal/statik" ) @@ -18,5 +17,5 @@ func ErrorHandler() grpc.UnaryServerInterceptor { func toGRPCError(ctx context.Context, req interface{}, handler grpc.UnaryHandler) (interface{}, error) { resp, err := handler(ctx, req) - return resp, errors.CaosToGRPCError(ctx, err) + return resp, gerrors.ZITADELToGRPCError(err) } diff --git a/internal/api/grpc/server/middleware/instance_interceptor.go b/internal/api/grpc/server/middleware/instance_interceptor.go index 68389a0c4..31f5e2c16 100644 --- a/internal/api/grpc/server/middleware/instance_interceptor.go +++ b/internal/api/grpc/server/middleware/instance_interceptor.go @@ -2,7 +2,7 @@ package middleware import ( "context" - errs "errors" + "errors" "fmt" "strings" @@ -14,9 +14,9 @@ import ( "google.golang.org/grpc/status" "github.com/zitadel/zitadel/internal/api/authz" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -46,8 +46,8 @@ func setInstance(ctx context.Context, req interface{}, info *grpc.UnaryServerInf ctx = authz.WithInstanceID(ctx, withInstanceIDProperty.GetInstanceId()) instance, err := verifier.InstanceByID(ctx) if err != nil { - notFoundErr := new(errors.NotFoundError) - if errs.As(err, ¬FoundErr) { + notFoundErr := new(zerrors.NotFoundError) + if errors.As(err, ¬FoundErr) { notFoundErr.Message = translator.LocalizeFromCtx(ctx, notFoundErr.GetMessage(), nil) } return nil, status.Error(codes.NotFound, err.Error()) @@ -62,8 +62,8 @@ func setInstance(ctx context.Context, req interface{}, info *grpc.UnaryServerInf } instance, err := verifier.InstanceByHost(interceptorCtx, host) if err != nil { - notFoundErr := new(errors.NotFoundError) - if errs.As(err, ¬FoundErr) { + notFoundErr := new(zerrors.NotFoundError) + if errors.As(err, ¬FoundErr) { notFoundErr.Message = translator.LocalizeFromCtx(ctx, notFoundErr.GetMessage(), nil) } return nil, status.Error(codes.NotFound, err.Error()) diff --git a/internal/api/grpc/server/middleware/mock_test.go b/internal/api/grpc/server/middleware/mock_test.go index 8670a20fb..498f45082 100644 --- a/internal/api/grpc/server/middleware/mock_test.go +++ b/internal/api/grpc/server/middleware/mock_test.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func emptyMockHandler(_ context.Context, req interface{}) (interface{}, error) { @@ -13,7 +13,7 @@ func emptyMockHandler(_ context.Context, req interface{}) (interface{}, error) { } func errorMockHandler(_ context.Context, req interface{}) (interface{}, error) { - return nil, errors.ThrowInternal(nil, "test", "error") + return nil, zerrors.ThrowInternal(nil, "test", "error") } type mockReq struct{} diff --git a/internal/api/grpc/server/middleware/quota_interceptor.go b/internal/api/grpc/server/middleware/quota_interceptor.go index be6e4d6e4..e51ecabbb 100644 --- a/internal/api/grpc/server/middleware/quota_interceptor.go +++ b/internal/api/grpc/server/middleware/quota_interceptor.go @@ -7,10 +7,10 @@ import ( "google.golang.org/grpc" "github.com/zitadel/zitadel/internal/api/authz" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/logstore" "github.com/zitadel/zitadel/internal/logstore/record" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func QuotaExhaustedInterceptor(svc *logstore.Service[*record.AccessLog], ignoreService ...string) grpc.UnaryServerInterceptor { @@ -43,7 +43,7 @@ func QuotaExhaustedInterceptor(svc *logstore.Service[*record.AccessLog], ignoreS instance := authz.GetInstance(ctx) remaining := svc.Limit(interceptorCtx, instance.InstanceID()) if remaining != nil && *remaining == 0 { - return nil, errors.ThrowResourceExhausted(nil, "QUOTA-vjAy8", "Quota.Access.Exhausted") + return nil, zerrors.ThrowResourceExhausted(nil, "QUOTA-vjAy8", "Quota.Access.Exhausted") } span.End() return handler(ctx, req) diff --git a/internal/api/grpc/server/middleware/translator.go b/internal/api/grpc/server/middleware/translator.go index fa453c682..65e7175a6 100644 --- a/internal/api/grpc/server/middleware/translator.go +++ b/internal/api/grpc/server/middleware/translator.go @@ -4,8 +4,8 @@ import ( "context" "errors" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/zerrors" ) type localizers interface { @@ -29,7 +29,7 @@ func translateError(ctx context.Context, err error, translator *i18n.Translator) if translator == nil || err == nil { return err } - caosErr := new(caos_errs.CaosError) + caosErr := new(zerrors.ZitadelError) if errors.As(err, &caosErr) { caosErr.SetMessage(translator.LocalizeFromCtx(ctx, caosErr.GetMessage(), nil)) } diff --git a/internal/api/grpc/server/probes.go b/internal/api/grpc/server/probes.go index c0eedcfcb..6ca649926 100644 --- a/internal/api/grpc/server/probes.go +++ b/internal/api/grpc/server/probes.go @@ -7,8 +7,8 @@ import ( "google.golang.org/protobuf/types/known/emptypb" "google.golang.org/protobuf/types/known/structpb" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type ValidationFunction func(ctx context.Context) error @@ -29,7 +29,7 @@ func (v *Validator) Ready(ctx context.Context, e *emptypb.Empty) (*emptypb.Empty if len(validate(ctx, v.validations)) == 0 { return e, nil } - return nil, errors.ThrowInternal(nil, "API-2jD9a", "not ready") + return nil, zerrors.ThrowInternal(nil, "API-2jD9a", "not ready") } func (v *Validator) Validate(ctx context.Context, _ *emptypb.Empty) (*structpb.Struct, error) { diff --git a/internal/api/grpc/server/probes_test.go b/internal/api/grpc/server/probes_test.go index a54b74a44..3fe42aea4 100644 --- a/internal/api/grpc/server/probes_test.go +++ b/internal/api/grpc/server/probes_test.go @@ -7,7 +7,7 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestValidator_Healthz(t *testing.T) { @@ -66,7 +66,7 @@ func TestValidator_Ready(t *testing.T) { "unready error", fields{validations: map[string]ValidationFunction{ "error": func(_ context.Context) error { - return errors.ThrowInternal(nil, "id", "message") + return zerrors.ThrowInternal(nil, "id", "message") }, }}, res{ @@ -137,13 +137,13 @@ func Test_validate(t *testing.T) { return nil }, "error": func(_ context.Context) error { - return errors.ThrowInternal(nil, "id", "message") + return zerrors.ThrowInternal(nil, "id", "message") }, }, }, res{ map[string]any{ - "error": errors.ThrowInternal(nil, "id", "message"), + "error": zerrors.ThrowInternal(nil, "id", "message"), }, }, }, diff --git a/internal/api/grpc/session/v2/session.go b/internal/api/grpc/session/v2/session.go index 7b1f27ef8..68d98e57e 100644 --- a/internal/api/grpc/session/v2/session.go +++ b/internal/api/grpc/session/v2/session.go @@ -15,8 +15,8 @@ import ( "github.com/zitadel/zitadel/internal/api/grpc/object/v2" "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" objpb "github.com/zitadel/zitadel/pkg/grpc/object" session "github.com/zitadel/zitadel/pkg/grpc/session/v2beta" ) @@ -284,7 +284,7 @@ func sessionQueryToQuery(sq *session.SearchQuery) (query.SearchQuery, error) { case *session.SearchQuery_CreationDateQuery: return creationDateQueryToQuery(q.CreationDateQuery) default: - return nil, caos_errs.ThrowInvalidArgument(nil, "GRPC-Sfefs", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "GRPC-Sfefs", "List.Query.Invalid") } } @@ -447,7 +447,7 @@ func (s *Server) createOTPEmailChallengeCommand(req *session.RequestChallenges_O case nil: return nil, s.command.CreateOTPEmailChallenge(), nil default: - return nil, nil, caos_errs.ThrowUnimplementedf(nil, "SESSION-k3ng0", "delivery_type oneOf %T in OTPEmailChallenge not implemented", t) + return nil, nil, zerrors.ThrowUnimplementedf(nil, "SESSION-k3ng0", "delivery_type oneOf %T in OTPEmailChallenge not implemented", t) } } @@ -461,7 +461,7 @@ func userCheck(user *session.CheckUser) (userSearch, error) { case *session.CheckUser_LoginName: return userByLoginName(s.LoginName) default: - return nil, caos_errs.ThrowUnimplementedf(nil, "SESSION-d3b4g0", "user search %T not implemented", s) + return nil, zerrors.ThrowUnimplementedf(nil, "SESSION-d3b4g0", "user search %T not implemented", s) } } diff --git a/internal/api/grpc/session/v2/session_test.go b/internal/api/grpc/session/v2/session_test.go index 8ec831a50..a268a9c88 100644 --- a/internal/api/grpc/session/v2/session_test.go +++ b/internal/api/grpc/session/v2/session_test.go @@ -14,11 +14,10 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "github.com/zitadel/zitadel/internal/api/authz" - objpb "github.com/zitadel/zitadel/pkg/grpc/object" - "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" + objpb "github.com/zitadel/zitadel/pkg/grpc/object" object "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" session "github.com/zitadel/zitadel/pkg/grpc/session/v2beta" ) @@ -439,7 +438,7 @@ func Test_listSessionsRequestToQuery(t *testing.T) { }, }, }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "GRPC-Sfefs", "List.Query.Invalid"), + wantErr: zerrors.ThrowInvalidArgument(nil, "GRPC-Sfefs", "List.Query.Invalid"), }, } for _, tt := range tests { @@ -479,7 +478,7 @@ func Test_sessionQueriesToQuery(t *testing.T) { {Query: nil}, }, }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "GRPC-Sfefs", "List.Query.Invalid"), + wantErr: zerrors.ThrowInvalidArgument(nil, "GRPC-Sfefs", "List.Query.Invalid"), }, { name: "creator and sessions", @@ -529,7 +528,7 @@ func Test_sessionQueryToQuery(t *testing.T) { args: args{&session.SearchQuery{ Query: nil, }}, - wantErr: caos_errs.ThrowInvalidArgument(nil, "GRPC-Sfefs", "List.Query.Invalid"), + wantErr: zerrors.ThrowInvalidArgument(nil, "GRPC-Sfefs", "List.Query.Invalid"), }, { name: "ids query", @@ -624,7 +623,7 @@ func Test_userCheck(t *testing.T) { args: args{&session.CheckUser{ Search: nil, }}, - wantErr: caos_errs.ThrowUnimplementedf(nil, "SESSION-d3b4g0", "user search %T not implemented", nil), + wantErr: zerrors.ThrowUnimplementedf(nil, "SESSION-d3b4g0", "user search %T not implemented", nil), }, } for _, tt := range tests { diff --git a/internal/api/grpc/system/feature.go b/internal/api/grpc/system/feature.go index a577af4f0..01a15977b 100644 --- a/internal/api/grpc/system/feature.go +++ b/internal/api/grpc/system/feature.go @@ -5,7 +5,7 @@ import ( object_pb "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" system_pb "github.com/zitadel/zitadel/pkg/grpc/system" ) @@ -23,12 +23,12 @@ func (s *Server) SetInstanceFeature(ctx context.Context, req *system_pb.SetInsta func (s *Server) setInstanceFeature(ctx context.Context, req *system_pb.SetInstanceFeatureRequest) (*domain.ObjectDetails, error) { feat := domain.Feature(req.FeatureId) if !feat.IsAFeature() { - return nil, errors.ThrowInvalidArgument(nil, "SYST-SGV45", "Errors.Feature.NotExisting") + return nil, zerrors.ThrowInvalidArgument(nil, "SYST-SGV45", "Errors.Feature.NotExisting") } switch t := req.Value.(type) { case *system_pb.SetInstanceFeatureRequest_Bool: return s.command.SetBooleanInstanceFeature(ctx, feat, t.Bool) default: - return nil, errors.ThrowInvalidArgument(nil, "SYST-dag5g", "Errors.Feature.TypeNotSupported") + return nil, zerrors.ThrowInvalidArgument(nil, "SYST-dag5g", "Errors.Feature.TypeNotSupported") } } diff --git a/internal/api/grpc/user/membership.go b/internal/api/grpc/user/membership.go index 4aaa21309..1235f0ab7 100644 --- a/internal/api/grpc/user/membership.go +++ b/internal/api/grpc/user/membership.go @@ -2,8 +2,8 @@ package user import ( "github.com/zitadel/zitadel/internal/api/grpc/object" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" user_pb "github.com/zitadel/zitadel/pkg/grpc/user" ) @@ -30,7 +30,7 @@ func MembershipQueryToQuery(req *user_pb.MembershipQuery) (query.SearchQuery, er case *user_pb.MembershipQuery_IamQuery: return query.NewMembershipIsIAMQuery() default: - return nil, errors.ThrowInvalidArgument(nil, "USER-dsg3z", "Errors.List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "USER-dsg3z", "Errors.List.Query.Invalid") } } diff --git a/internal/api/grpc/user/query.go b/internal/api/grpc/user/query.go index 2e997b2a1..cd01e545a 100644 --- a/internal/api/grpc/user/query.go +++ b/internal/api/grpc/user/query.go @@ -2,8 +2,8 @@ package user import ( "github.com/zitadel/zitadel/internal/api/grpc/object" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" user_pb "github.com/zitadel/zitadel/pkg/grpc/user" ) @@ -21,7 +21,7 @@ func UserQueriesToQuery(queries []*user_pb.SearchQuery, level uint8) (_ []query. func UserQueryToQuery(query *user_pb.SearchQuery, level uint8) (query.SearchQuery, error) { if level > 20 { // can't go deeper than 20 levels of nesting. - return nil, errors.ThrowInvalidArgument(nil, "USER-zsQ97", "Errors.User.TooManyNestingLevels") + return nil, zerrors.ThrowInvalidArgument(nil, "USER-zsQ97", "Errors.User.TooManyNestingLevels") } switch q := query.Query.(type) { case *user_pb.SearchQuery_UserNameQuery: @@ -53,7 +53,7 @@ func UserQueryToQuery(query *user_pb.SearchQuery, level uint8) (query.SearchQuer case *user_pb.SearchQuery_NotQuery: return NotQueryToQuery(q.NotQuery, level) default: - return nil, errors.ThrowInvalidArgument(nil, "GRPC-vR9nC", "List.Query.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "GRPC-vR9nC", "List.Query.Invalid") } } diff --git a/internal/api/grpc/user/v2/email.go b/internal/api/grpc/user/v2/email.go index 83f771b35..7936fa4d1 100644 --- a/internal/api/grpc/user/v2/email.go +++ b/internal/api/grpc/user/v2/email.go @@ -6,7 +6,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" object "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) @@ -25,7 +25,7 @@ func (s *Server) SetEmail(ctx context.Context, req *user.SetEmailRequest) (resp case nil: email, err = s.command.ChangeUserEmail(ctx, req.GetUserId(), resourceOwner, req.GetEmail(), s.userCodeAlg) default: - err = caos_errs.ThrowUnimplementedf(nil, "USERv2-Ahng0", "verification oneOf %T in method SetEmail not implemented", v) + err = zerrors.ThrowUnimplementedf(nil, "USERv2-Ahng0", "verification oneOf %T in method SetEmail not implemented", v) } if err != nil { return nil, err diff --git a/internal/api/grpc/user/v2/passkey.go b/internal/api/grpc/user/v2/passkey.go index 659ef6238..69a7e8fda 100644 --- a/internal/api/grpc/user/v2/passkey.go +++ b/internal/api/grpc/user/v2/passkey.go @@ -8,7 +8,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/grpc/object/v2" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" object_pb "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) @@ -47,7 +47,7 @@ func webAuthNRegistrationDetailsToPb(details *domain.WebAuthNRegistrationDetails } options := new(structpb.Struct) if err := options.UnmarshalJSON(details.PublicKeyCredentialCreationOptions); err != nil { - return nil, nil, caos_errs.ThrowInternal(err, "USERv2-Dohr6", "Errors.Internal") + return nil, nil, zerrors.ThrowInternal(err, "USERv2-Dohr6", "Errors.Internal") } return object.DomainToDetailsPb(details.ObjectDetails), options, nil } @@ -68,7 +68,7 @@ func (s *Server) VerifyPasskeyRegistration(ctx context.Context, req *user.Verify resourceOwner := authz.GetCtxData(ctx).OrgID pkc, err := req.GetPublicKeyCredential().MarshalJSON() if err != nil { - return nil, caos_errs.ThrowInternal(err, "USERv2-Pha2o", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "USERv2-Pha2o", "Errors.Internal") } objectDetails, err := s.command.HumanHumanPasswordlessSetup(ctx, req.GetUserId(), resourceOwner, req.GetPasskeyName(), "", pkc) if err != nil { @@ -96,7 +96,7 @@ func (s *Server) CreatePasskeyRegistrationLink(ctx context.Context, req *user.Cr s.command.AddUserPasskeyCodeReturn(ctx, req.GetUserId(), resourceOwner, s.userCodeAlg), ) default: - return nil, caos_errs.ThrowUnimplementedf(nil, "USERv2-gaD8y", "verification oneOf %T in method CreatePasskeyRegistrationLink not implemented", medium) + return nil, zerrors.ThrowUnimplementedf(nil, "USERv2-gaD8y", "verification oneOf %T in method CreatePasskeyRegistrationLink not implemented", medium) } } diff --git a/internal/api/grpc/user/v2/passkey_test.go b/internal/api/grpc/user/v2/passkey_test.go index 8071db92b..7d45c4175 100644 --- a/internal/api/grpc/user/v2/passkey_test.go +++ b/internal/api/grpc/user/v2/passkey_test.go @@ -13,7 +13,7 @@ import ( "github.com/zitadel/zitadel/internal/api/grpc" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" object "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) @@ -81,7 +81,7 @@ func Test_passkeyRegistrationDetailsToPb(t *testing.T) { }, err: nil, }, - wantErr: caos_errs.ThrowInternal(nil, "USERv2-Dohr6", "Errors.Internal"), + wantErr: zerrors.ThrowInternal(nil, "USERv2-Dohr6", "Errors.Internal"), }, { name: "ok", diff --git a/internal/api/grpc/user/v2/password.go b/internal/api/grpc/user/v2/password.go index 1bd160405..119806c4d 100644 --- a/internal/api/grpc/user/v2/password.go +++ b/internal/api/grpc/user/v2/password.go @@ -6,7 +6,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/grpc/object/v2" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) @@ -22,7 +22,7 @@ func (s *Server) PasswordReset(ctx context.Context, req *user.PasswordResetReque case nil: details, code, err = s.command.RequestPasswordReset(ctx, req.GetUserId()) default: - err = caos_errs.ThrowUnimplementedf(nil, "USERv2-SDeeg", "verification oneOf %T in method RequestPasswordReset not implemented", m) + err = zerrors.ThrowUnimplementedf(nil, "USERv2-SDeeg", "verification oneOf %T in method RequestPasswordReset not implemented", m) } if err != nil { return nil, err @@ -59,7 +59,7 @@ func (s *Server) SetPassword(ctx context.Context, req *user.SetPasswordRequest) case nil: details, err = s.command.SetPassword(ctx, resourceOwner, req.GetUserId(), req.GetNewPassword().GetPassword(), req.GetNewPassword().GetChangeRequired()) default: - err = caos_errs.ThrowUnimplementedf(nil, "USERv2-SFdf2", "verification oneOf %T in method SetPasswordRequest not implemented", v) + err = zerrors.ThrowUnimplementedf(nil, "USERv2-SFdf2", "verification oneOf %T in method SetPasswordRequest not implemented", v) } if err != nil { return nil, err diff --git a/internal/api/grpc/user/v2/phone.go b/internal/api/grpc/user/v2/phone.go index 9e97bb019..b2df7d2c6 100644 --- a/internal/api/grpc/user/v2/phone.go +++ b/internal/api/grpc/user/v2/phone.go @@ -6,7 +6,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" object "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) @@ -25,7 +25,7 @@ func (s *Server) SetPhone(ctx context.Context, req *user.SetPhoneRequest) (resp case nil: phone, err = s.command.ChangeUserPhone(ctx, req.GetUserId(), resourceOwner, req.GetPhone(), s.userCodeAlg) default: - err = caos_errs.ThrowUnimplementedf(nil, "USERv2-Ahng0", "verification oneOf %T in method SetPhone not implemented", v) + err = zerrors.ThrowUnimplementedf(nil, "USERv2-Ahng0", "verification oneOf %T in method SetPhone not implemented", v) } if err != nil { return nil, err diff --git a/internal/api/grpc/user/v2/u2f.go b/internal/api/grpc/user/v2/u2f.go index 077f2346e..56310508f 100644 --- a/internal/api/grpc/user/v2/u2f.go +++ b/internal/api/grpc/user/v2/u2f.go @@ -6,7 +6,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/grpc/object/v2" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) @@ -32,7 +32,7 @@ func (s *Server) VerifyU2FRegistration(ctx context.Context, req *user.VerifyU2FR resourceOwner := authz.GetCtxData(ctx).OrgID pkc, err := req.GetPublicKeyCredential().MarshalJSON() if err != nil { - return nil, caos_errs.ThrowInternal(err, "USERv2-IeTh4", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "USERv2-IeTh4", "Errors.Internal") } objectDetails, err := s.command.HumanVerifyU2FSetup(ctx, req.GetUserId(), resourceOwner, req.GetTokenName(), "", pkc) if err != nil { diff --git a/internal/api/grpc/user/v2/u2f_test.go b/internal/api/grpc/user/v2/u2f_test.go index 0a4aaf956..087837ce3 100644 --- a/internal/api/grpc/user/v2/u2f_test.go +++ b/internal/api/grpc/user/v2/u2f_test.go @@ -12,7 +12,7 @@ import ( "github.com/zitadel/zitadel/internal/api/grpc" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" object "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) @@ -50,7 +50,7 @@ func Test_u2fRegistrationDetailsToPb(t *testing.T) { }, err: nil, }, - wantErr: caos_errs.ThrowInternal(nil, "USERv2-Dohr6", "Errors.Internal"), + wantErr: zerrors.ThrowInternal(nil, "USERv2-Dohr6", "Errors.Internal"), }, { name: "ok", diff --git a/internal/api/grpc/user/v2/user.go b/internal/api/grpc/user/v2/user.go index d7c26e903..d48cbcd6e 100644 --- a/internal/api/grpc/user/v2/user.go +++ b/internal/api/grpc/user/v2/user.go @@ -2,7 +2,7 @@ package user import ( "context" - errs "errors" + "errors" "io" "golang.org/x/text/language" @@ -14,10 +14,10 @@ import ( "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/idp" "github.com/zitadel/zitadel/internal/idp/providers/ldap" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" object_pb "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) @@ -135,7 +135,7 @@ func (s *Server) StartIdentityProviderIntent(ctx context.Context, req *user.Star case *user.StartIdentityProviderIntentRequest_Ldap: return s.startLDAPIntent(ctx, req.GetIdpId(), t.Ldap) default: - return nil, errors.ThrowUnimplementedf(nil, "USERv2-S2g21", "type oneOf %T in method StartIdentityProviderIntent not implemented", t) + return nil, zerrors.ThrowUnimplementedf(nil, "USERv2-S2g21", "type oneOf %T in method StartIdentityProviderIntent not implemented", t) } } @@ -220,12 +220,12 @@ func (s *Server) ldapLogin(ctx context.Context, idpID, username, password string } ldapProvider, ok := provider.(*ldap.Provider) if !ok { - return nil, "", nil, errors.ThrowInvalidArgument(nil, "IDP-9a02j2n2bh", "Errors.ExternalIDP.IDPTypeNotImplemented") + return nil, "", nil, zerrors.ThrowInvalidArgument(nil, "IDP-9a02j2n2bh", "Errors.ExternalIDP.IDPTypeNotImplemented") } session := ldapProvider.GetSession(username, password) externalUser, err := session.FetchUser(ctx) - if errs.Is(err, ldap.ErrFailedLogin) || errs.Is(err, ldap.ErrNoSingleUser) { - return nil, "", nil, errors.ThrowInvalidArgument(nil, "COMMAND-nzun2i", "Errors.User.ExternalIDP.LoginFailed") + if errors.Is(err, ldap.ErrFailedLogin) || errors.Is(err, ldap.ErrNoSingleUser) { + return nil, "", nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-nzun2i", "Errors.User.ExternalIDP.LoginFailed") } if err != nil { return nil, "", nil, err @@ -251,7 +251,7 @@ func (s *Server) RetrieveIdentityProviderIntent(ctx context.Context, req *user.R return nil, err } if intent.State != domain.IDPIntentStateSucceeded { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-Hk38e", "Errors.Intent.NotSucceeded") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-Hk38e", "Errors.Intent.NotSucceeded") } return idpIntentToIDPIntentPb(intent, s.idpAlg) } diff --git a/internal/api/grpc/user/v2/user_test.go b/internal/api/grpc/user/v2/user_test.go index 9b8ca8611..45775dc9e 100644 --- a/internal/api/grpc/user/v2/user_test.go +++ b/internal/api/grpc/user/v2/user_test.go @@ -16,8 +16,8 @@ import ( "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" object_pb "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) @@ -78,11 +78,11 @@ func Test_idpIntentToIDPIntentPb(t *testing.T) { UserID: "userID", State: domain.IDPIntentStateSucceeded, }, - alg: decryption(caos_errs.ThrowInternal(nil, "id", "invalid key id")), + alg: decryption(zerrors.ThrowInternal(nil, "id", "invalid key id")), }, res{ resp: nil, - err: caos_errs.ThrowInternal(nil, "id", "invalid key id"), + err: zerrors.ThrowInternal(nil, "id", "invalid key id"), }, }, { "successful oauth", diff --git a/internal/api/http/cookie.go b/internal/api/http/cookie.go index 18a748dc3..e40cfdaa3 100644 --- a/internal/api/http/cookie.go +++ b/internal/api/http/cookie.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/securecookie" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -102,7 +102,7 @@ func (c *CookieHandler) GetEncryptedCookieValue(r *http.Request, name string, va return err } if c.securecookie == nil { - return errors.ThrowInternal(nil, "HTTP-X6XpnL", "securecookie not configured") + return zerrors.ThrowInternal(nil, "HTTP-X6XpnL", "securecookie not configured") } return c.securecookie.Decode(name, cookie.Value, value) } @@ -113,7 +113,7 @@ func (c *CookieHandler) SetCookie(w http.ResponseWriter, name, domain, value str func (c *CookieHandler) SetEncryptedCookie(w http.ResponseWriter, name, domain string, value interface{}, sameSiteNone bool) error { if c.securecookie == nil { - return errors.ThrowInternal(nil, "HTTP-s2HUtx", "securecookie not configured") + return zerrors.ThrowInternal(nil, "HTTP-s2HUtx", "securecookie not configured") } encoded, err := c.securecookie.Encode(name, value) if err != nil { diff --git a/internal/api/http/domain_check.go b/internal/api/http/domain_check.go index 419682202..00ab0597d 100644 --- a/internal/api/http/domain_check.go +++ b/internal/api/http/domain_check.go @@ -7,7 +7,7 @@ import ( "net" "net/http" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type CheckType int @@ -27,30 +27,30 @@ func ValidateDomain(domain, token, verifier string, checkType CheckType) error { case CheckTypeDNS: return ValidateDomainDNS(domain, verifier) default: - return errors.ThrowInvalidArgument(nil, "HTTP-Iqd11", "Errors.Internal") + return zerrors.ThrowInvalidArgument(nil, "HTTP-Iqd11", "Errors.Internal") } } func ValidateDomainHTTP(domain, token, verifier string) error { resp, err := http.Get(tokenUrlHTTP(domain, token)) if err != nil { - return errors.ThrowInternal(err, "HTTP-BH42h", "Errors.Internal") + return zerrors.ThrowInternal(err, "HTTP-BH42h", "Errors.Internal") } if resp.StatusCode != 200 { if resp.StatusCode == 404 { - return errors.ThrowNotFound(err, "ORG-F4zhw", "Errors.Org.DomainVerificationHTTPNotFound") + return zerrors.ThrowNotFound(err, "ORG-F4zhw", "Errors.Org.DomainVerificationHTTPNotFound") } - return errors.ThrowInternal(err, "HTTP-G2zsw", "Errors.Internal") + return zerrors.ThrowInternal(err, "HTTP-G2zsw", "Errors.Internal") } defer resp.Body.Close() body, err := ioutil.ReadAll(resp.Body) if err != nil { - return errors.ThrowInternal(err, "HTTP-HB432", "Errors.Internal") + return zerrors.ThrowInternal(err, "HTTP-HB432", "Errors.Internal") } if string(body) == verifier { return nil } - return errors.ThrowNotFound(err, "ORG-GH422", "Errors.Org.DomainVerificationHTTPNoMatch") + return zerrors.ThrowNotFound(err, "ORG-GH422", "Errors.Org.DomainVerificationHTTPNoMatch") } func ValidateDomainDNS(domain, verifier string) error { @@ -59,13 +59,13 @@ func ValidateDomainDNS(domain, verifier string) error { var dnsError *net.DNSError if errorsAs.As(err, &dnsError) { if dnsError.IsNotFound { - return errors.ThrowNotFound(err, "ORG-G241f", "Errors.Org.DomainVerificationTXTNotFound") + return zerrors.ThrowNotFound(err, "ORG-G241f", "Errors.Org.DomainVerificationTXTNotFound") } if dnsError.IsTimeout { - return errors.ThrowNotFound(err, "ORG-K563l", "Errors.Org.DomainVerificationTimeout") + return zerrors.ThrowNotFound(err, "ORG-K563l", "Errors.Org.DomainVerificationTimeout") } } - return errors.ThrowInternal(err, "HTTP-Hwsw2", "Errors.Internal") + return zerrors.ThrowInternal(err, "HTTP-Hwsw2", "Errors.Internal") } for _, record := range txtRecords { @@ -73,7 +73,7 @@ func ValidateDomainDNS(domain, verifier string) error { return nil } } - return errors.ThrowNotFound(err, "ORG-G28if", "Errors.Org.DomainVerificationTXTNoMatch") + return zerrors.ThrowNotFound(err, "ORG-G28if", "Errors.Org.DomainVerificationTXTNoMatch") } func TokenUrl(domain, token string, checkType CheckType) (string, error) { @@ -83,7 +83,7 @@ func TokenUrl(domain, token string, checkType CheckType) (string, error) { case CheckTypeDNS: return tokenUrlDNS(domain), nil default: - return "", errors.ThrowInvalidArgument(nil, "HTTP-Iqd11", "") + return "", zerrors.ThrowInvalidArgument(nil, "HTTP-Iqd11", "") } } diff --git a/internal/api/http/error.go b/internal/api/http/error.go index e73f1def9..1469ab010 100644 --- a/internal/api/http/error.go +++ b/internal/api/http/error.go @@ -4,7 +4,7 @@ import ( "errors" "net/http" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func ZitadelErrorToHTTPStatusCode(err error) (statusCode int, ok bool) { @@ -13,32 +13,32 @@ func ZitadelErrorToHTTPStatusCode(err error) (statusCode int, ok bool) { } //nolint:errorlint switch err.(type) { - case *caos_errs.AlreadyExistsError: + case *zerrors.AlreadyExistsError: return http.StatusConflict, true - case *caos_errs.DeadlineExceededError: + case *zerrors.DeadlineExceededError: return http.StatusGatewayTimeout, true - case *caos_errs.InternalError: + case *zerrors.InternalError: return http.StatusInternalServerError, true - case *caos_errs.InvalidArgumentError: + case *zerrors.InvalidArgumentError: return http.StatusBadRequest, true - case *caos_errs.NotFoundError: + case *zerrors.NotFoundError: return http.StatusNotFound, true - case *caos_errs.PermissionDeniedError: + case *zerrors.PermissionDeniedError: return http.StatusForbidden, true - case *caos_errs.PreconditionFailedError: + case *zerrors.PreconditionFailedError: // use the same code as grpc-gateway: // https://github.com/grpc-ecosystem/grpc-gateway/blob/9e33e38f15cb7d2f11096366e62ea391a3459ba9/runtime/errors.go#L59 return http.StatusBadRequest, true - case *caos_errs.UnauthenticatedError: + case *zerrors.UnauthenticatedError: return http.StatusUnauthorized, true - case *caos_errs.UnavailableError: + case *zerrors.UnavailableError: return http.StatusServiceUnavailable, true - case *caos_errs.UnimplementedError: + case *zerrors.UnimplementedError: return http.StatusNotImplemented, true - case *caos_errs.ResourceExhaustedError: + case *zerrors.ResourceExhaustedError: return http.StatusTooManyRequests, true default: - c := new(caos_errs.CaosError) + c := new(zerrors.ZitadelError) if errors.As(err, &c) { return ZitadelErrorToHTTPStatusCode(errors.Unwrap(err)) } diff --git a/internal/api/http/error_test.go b/internal/api/http/error_test.go index 08fed349d..d44c206f8 100644 --- a/internal/api/http/error_test.go +++ b/internal/api/http/error_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestZitadelErrorToHTTPStatusCode(t *testing.T) { @@ -30,7 +30,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped already exists", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowAlreadyExists(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowAlreadyExists(nil, "id", "message")), }, wantStatusCode: http.StatusConflict, wantOk: true, @@ -38,7 +38,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped deadline exceeded", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowDeadlineExceeded(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowDeadlineExceeded(nil, "id", "message")), }, wantStatusCode: http.StatusGatewayTimeout, wantOk: true, @@ -46,7 +46,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped internal", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowInternal(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowInternal(nil, "id", "message")), }, wantStatusCode: http.StatusInternalServerError, wantOk: true, @@ -54,7 +54,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped invalid argument", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowInvalidArgument(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowInvalidArgument(nil, "id", "message")), }, wantStatusCode: http.StatusBadRequest, wantOk: true, @@ -62,7 +62,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped not found", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowNotFound(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowNotFound(nil, "id", "message")), }, wantStatusCode: http.StatusNotFound, wantOk: true, @@ -70,7 +70,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped permission denied", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowPermissionDenied(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowPermissionDenied(nil, "id", "message")), }, wantStatusCode: http.StatusForbidden, wantOk: true, @@ -78,7 +78,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped precondition failed", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowPreconditionFailed(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowPreconditionFailed(nil, "id", "message")), }, wantStatusCode: http.StatusBadRequest, wantOk: true, @@ -86,7 +86,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped unauthenticated", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowUnauthenticated(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowUnauthenticated(nil, "id", "message")), }, wantStatusCode: http.StatusUnauthorized, wantOk: true, @@ -94,7 +94,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped unavailable", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowUnavailable(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowUnavailable(nil, "id", "message")), }, wantStatusCode: http.StatusServiceUnavailable, wantOk: true, @@ -102,7 +102,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped unimplemented", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowUnimplemented(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowUnimplemented(nil, "id", "message")), }, wantStatusCode: http.StatusNotImplemented, wantOk: true, @@ -110,7 +110,7 @@ func TestZitadelErrorToHTTPStatusCode(t *testing.T) { { name: "wrapped resource exhausted", args: args{ - err: fmt.Errorf("wrapped %w", caos_errors.ThrowResourceExhausted(nil, "id", "message")), + err: fmt.Errorf("wrapped %w", zerrors.ThrowResourceExhausted(nil, "id", "message")), }, wantStatusCode: http.StatusTooManyRequests, wantOk: true, diff --git a/internal/api/http/middleware/instance_interceptor.go b/internal/api/http/middleware/instance_interceptor.go index e04ca9f7a..ac944278b 100644 --- a/internal/api/http/middleware/instance_interceptor.go +++ b/internal/api/http/middleware/instance_interceptor.go @@ -13,9 +13,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" zitadel_http "github.com/zitadel/zitadel/internal/api/http" - caos_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type instanceInterceptor struct { @@ -55,7 +55,7 @@ func (a *instanceInterceptor) handleInstance(w http.ResponseWriter, r *http.Requ } ctx, err := setInstance(r, a.verifier, a.headerName) if err != nil { - caosErr := new(caos_errors.NotFoundError) + caosErr := new(zerrors.NotFoundError) if errors.As(err, &caosErr) { caosErr.Message = a.translator.LocalizeFromRequest(r, caosErr.GetMessage(), nil) } @@ -74,7 +74,7 @@ func setInstance(r *http.Request, verifier authz.InstanceVerifier, headerName st host, err := HostFromRequest(r, headerName) if err != nil { - return nil, caos_errors.ThrowNotFound(err, "INST-zWq7X", "Errors.Instance.NotFound") + return nil, zerrors.ThrowNotFound(err, "INST-zWq7X", "Errors.Instance.NotFound") } instance, err := verifier.InstanceByHost(authCtx, host) diff --git a/internal/api/http/middleware/user_agent_cookie.go b/internal/api/http/middleware/user_agent_cookie.go index 36d5155f1..c156e6d94 100644 --- a/internal/api/http/middleware/user_agent_cookie.go +++ b/internal/api/http/middleware/user_agent_cookie.go @@ -10,8 +10,8 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" http_utils "github.com/zitadel/zitadel/internal/api/http" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/zerrors" ) type cookieKey int @@ -95,7 +95,7 @@ func (ua *userAgentHandler) getUserAgent(r *http.Request) (*UserAgent, error) { userAgent := new(UserAgent) err := ua.cookieHandler.GetEncryptedCookieValue(r, ua.cookieName, userAgent) if err != nil { - return nil, errors.ThrowPermissionDenied(err, "HTTP-YULqH4", "cannot read user agent cookie") + return nil, zerrors.ThrowPermissionDenied(err, "HTTP-YULqH4", "cannot read user agent cookie") } return userAgent, nil } @@ -103,7 +103,7 @@ func (ua *userAgentHandler) getUserAgent(r *http.Request) (*UserAgent, error) { func (ua *userAgentHandler) setUserAgent(w http.ResponseWriter, host string, agent *UserAgent, iframe bool) error { err := ua.cookieHandler.SetEncryptedCookie(w, ua.cookieName, host, agent, iframe) if err != nil { - return errors.ThrowPermissionDenied(err, "HTTP-AqgqdA", "cannot set user agent cookie") + return zerrors.ThrowPermissionDenied(err, "HTTP-AqgqdA", "cannot set user agent cookie") } return nil } diff --git a/internal/api/http/parser.go b/internal/api/http/parser.go index f53df0340..f51157a0d 100644 --- a/internal/api/http/parser.go +++ b/internal/api/http/parser.go @@ -5,7 +5,7 @@ import ( "github.com/gorilla/schema" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type Parser struct { @@ -21,7 +21,7 @@ func NewParser() *Parser { func (p *Parser) Parse(r *http.Request, data interface{}) error { err := r.ParseForm() if err != nil { - return errors.ThrowInternal(err, "FORM-lCC9zI", "error parsing http form") + return zerrors.ThrowInternal(err, "FORM-lCC9zI", "error parsing http form") } return p.decoder.Decode(data, r.Form) diff --git a/internal/api/idp/idp.go b/internal/api/idp/idp.go index f1fa32fc5..acae4f36b 100644 --- a/internal/api/idp/idp.go +++ b/internal/api/idp/idp.go @@ -18,7 +18,6 @@ import ( "github.com/zitadel/zitadel/internal/api/ui/login" "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/crypto" - z_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/form" "github.com/zitadel/zitadel/internal/idp" "github.com/zitadel/zitadel/internal/idp/providers/apple" @@ -32,6 +31,7 @@ import ( openid "github.com/zitadel/zitadel/internal/idp/providers/oidc" saml2 "github.com/zitadel/zitadel/internal/idp/providers/saml" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -147,7 +147,7 @@ func (h *Handler) handleCertificate(w http.ResponseWriter, r *http.Request) { } samlProvider, ok := provider.(*saml2.Provider) if !ok { - http.Error(w, z_errs.ThrowInvalidArgument(nil, "SAML-lrud8s9coi", "Errors.Intent.IDPInvalid").Error(), http.StatusBadRequest) + http.Error(w, zerrors.ThrowInvalidArgument(nil, "SAML-lrud8s9coi", "Errors.Intent.IDPInvalid").Error(), http.StatusBadRequest) return } @@ -178,7 +178,7 @@ func (h *Handler) handleMetadata(w http.ResponseWriter, r *http.Request) { samlProvider, ok := provider.(*saml2.Provider) if !ok { - http.Error(w, z_errs.ThrowInvalidArgument(nil, "SAML-lrud8s9coi", "Errors.Intent.IDPInvalid").Error(), http.StatusBadRequest) + http.Error(w, zerrors.ThrowInvalidArgument(nil, "SAML-lrud8s9coi", "Errors.Intent.IDPInvalid").Error(), http.StatusBadRequest) return } @@ -225,7 +225,7 @@ func (h *Handler) handleACS(w http.ResponseWriter, r *http.Request) { } samlProvider, ok := provider.(*saml2.Provider) if !ok { - err := z_errs.ThrowInvalidArgument(nil, "SAML-ui9wyux0hp", "Errors.Intent.IDPInvalid") + err := zerrors.ThrowInvalidArgument(nil, "SAML-ui9wyux0hp", "Errors.Intent.IDPInvalid") http.Error(w, err.Error(), http.StatusBadRequest) return } @@ -237,7 +237,7 @@ func (h *Handler) handleACS(w http.ResponseWriter, r *http.Request) { intent, err := h.commands.GetActiveIntent(ctx, data.RelayState) if err != nil { - if z_errs.IsNotFound(err) { + if zerrors.IsNotFound(err) { http.Error(w, err.Error(), http.StatusBadRequest) return } @@ -264,7 +264,7 @@ func (h *Handler) handleACS(w http.ResponseWriter, r *http.Request) { token, err := h.commands.SucceedSAMLIDPIntent(ctx, intent, idpUser, userID, session.Assertion) if err != nil { - redirectToFailureURLErr(w, r, intent, z_errs.ThrowInternal(err, "IDP-JdD3g", "Errors.Intent.TokenCreationFailed")) + redirectToFailureURLErr(w, r, intent, zerrors.ThrowInternal(err, "IDP-JdD3g", "Errors.Intent.TokenCreationFailed")) return } redirectToSuccessURL(w, r, intent, token, userID) @@ -279,7 +279,7 @@ func (h *Handler) handleCallback(w http.ResponseWriter, r *http.Request) { } intent, err := h.commands.GetActiveIntent(ctx, data.State) if err != nil { - if z_errs.IsNotFound(err) { + if zerrors.IsNotFound(err) { http.Error(w, err.Error(), http.StatusBadRequest) return } @@ -320,7 +320,7 @@ func (h *Handler) handleCallback(w http.ResponseWriter, r *http.Request) { token, err := h.commands.SucceedIDPIntent(ctx, intent, idpUser, idpSession, userID) if err != nil { - redirectToFailureURLErr(w, r, intent, z_errs.ThrowInternal(err, "IDP-JdD3g", "Errors.Intent.TokenCreationFailed")) + redirectToFailureURLErr(w, r, intent, zerrors.ThrowInternal(err, "IDP-JdD3g", "Errors.Intent.TokenCreationFailed")) return } redirectToSuccessURL(w, r, intent, token, userID) @@ -349,7 +349,7 @@ func (h *Handler) parseCallbackRequest(r *http.Request) (*externalIDPCallbackDat return nil, err } if data.State == "" { - return nil, z_errs.ThrowInvalidArgument(nil, "IDP-Hk38e", "Errors.Intent.StateMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "IDP-Hk38e", "Errors.Intent.StateMissing") } return data, nil } @@ -368,7 +368,7 @@ func redirectToSuccessURL(w http.ResponseWriter, r *http.Request, intent *comman func redirectToFailureURLErr(w http.ResponseWriter, r *http.Request, i *command.IDPIntentWriteModel, err error) { msg := err.Error() var description string - zErr := new(z_errs.CaosError) + zErr := new(zerrors.ZitadelError) if errors.As(err, &zErr) { msg = zErr.GetID() description = zErr.GetMessage() // TODO: i18n? @@ -403,9 +403,9 @@ func (h *Handler) fetchIDPUserFromCode(ctx context.Context, identityProvider idp case *apple.Provider: session = &apple.Session{Session: &openid.Session{Provider: provider.Provider, Code: code}, UserFormValue: appleUser} case *jwt.Provider, *ldap.Provider, *saml2.Provider: - return nil, nil, z_errs.ThrowInvalidArgument(nil, "IDP-52jmn", "Errors.ExternalIDP.IDPTypeNotImplemented") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "IDP-52jmn", "Errors.ExternalIDP.IDPTypeNotImplemented") default: - return nil, nil, z_errs.ThrowUnimplemented(nil, "IDP-SSDg", "Errors.ExternalIDP.IDPTypeNotImplemented") + return nil, nil, zerrors.ThrowUnimplemented(nil, "IDP-SSDg", "Errors.ExternalIDP.IDPTypeNotImplemented") } user, err = session.FetchUser(ctx) diff --git a/internal/api/idp/idp_test.go b/internal/api/idp/idp_test.go index 1e6395197..6804a035a 100644 --- a/internal/api/idp/idp_test.go +++ b/internal/api/idp/idp_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/command" - z_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/form" + "github.com/zitadel/zitadel/internal/zerrors" ) func Test_redirectToSuccessURL(t *testing.T) { @@ -146,7 +146,7 @@ func Test_redirectToFailureURLErr(t *testing.T) { id: "id", failureURL: "https://example.com/failure", successURL: "https://example.com/success", - err: z_errors.ThrowError(nil, "test", "testdesc"), + err: zerrors.ThrowError(nil, "test", "testdesc"), }, res{ "https://example.com/failure?error=test&error_description=testdesc&id=id", diff --git a/internal/api/oidc/access_token.go b/internal/api/oidc/access_token.go index 35ab1edea..173e50753 100644 --- a/internal/api/oidc/access_token.go +++ b/internal/api/oidc/access_token.go @@ -10,9 +10,9 @@ import ( "github.com/zitadel/oidc/v3/pkg/op" "github.com/zitadel/zitadel/internal/command" - zerrors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type accessToken struct { diff --git a/internal/api/oidc/auth_request.go b/internal/api/oidc/auth_request.go index fa1e919f6..fa99f544a 100644 --- a/internal/api/oidc/auth_request.go +++ b/internal/api/oidc/auth_request.go @@ -16,10 +16,10 @@ import ( "github.com/zitadel/zitadel/internal/api/http/middleware" "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/telemetry/tracing" "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -83,11 +83,11 @@ func (o *OPStorage) createAuthRequestLoginClient(ctx context.Context, req *oidc. func (o *OPStorage) createAuthRequest(ctx context.Context, req *oidc.AuthRequest, userID string) (_ op.AuthRequest, err error) { userAgentID, ok := middleware.UserAgentIDFromCtx(ctx) if !ok { - return nil, errors.ThrowPreconditionFailed(nil, "OIDC-sd436", "no user agent id") + return nil, zerrors.ThrowPreconditionFailed(nil, "OIDC-sd436", "no user agent id") } req.Scopes, err = o.assertProjectRoleScopes(ctx, req.ClientID, req.Scopes) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "OIDC-Gqrfg", "Errors.Internal") + return nil, zerrors.ThrowPreconditionFailed(err, "OIDC-Gqrfg", "Errors.Internal") } authRequest := CreateAuthRequestToBusiness(ctx, req, userAgentID, userID) resp, err := o.repo.CreateAuthRequest(ctx, authRequest) @@ -124,7 +124,7 @@ func (o *OPStorage) AuthRequestByID(ctx context.Context, id string) (_ op.AuthRe userAgentID, ok := middleware.UserAgentIDFromCtx(ctx) if !ok { - return nil, errors.ThrowPreconditionFailed(nil, "OIDC-D3g21", "no user agent id") + return nil, zerrors.ThrowPreconditionFailed(nil, "OIDC-D3g21", "no user agent id") } resp, err := o.repo.AuthRequestByIDCheckLoggedIn(ctx, id, userAgentID) if err != nil { @@ -174,7 +174,7 @@ func (o *OPStorage) SaveAuthCode(ctx context.Context, id, code string) (err erro userAgentID, ok := middleware.UserAgentIDFromCtx(ctx) if !ok { - return errors.ThrowPreconditionFailed(nil, "OIDC-Dgus2", "no user agent id") + return zerrors.ThrowPreconditionFailed(nil, "OIDC-Dgus2", "no user agent id") } return o.repo.SaveAuthCode(ctx, id, code, userAgentID) } @@ -236,7 +236,7 @@ func (o *OPStorage) CreateAccessAndRefreshTokens(ctx context.Context, req op.Tok userAgentID, applicationID, userOrgID, authTime, authMethodsReferences := getInfoFromRequest(req) scopes, err := o.assertProjectRoleScopes(ctx, applicationID, req.GetScopes()) if err != nil { - return "", "", time.Time{}, errors.ThrowPreconditionFailed(err, "OIDC-Df2fq", "Errors.Internal") + return "", "", time.Time{}, zerrors.ThrowPreconditionFailed(err, "OIDC-Df2fq", "Errors.Internal") } if request, ok := req.(op.RefreshTokenRequest); ok { request.SetCurrentScopes(scopes) @@ -251,7 +251,7 @@ func (o *OPStorage) CreateAccessAndRefreshTokens(ctx context.Context, req op.Tok refreshToken, req.GetAudience(), scopes, authMethodsReferences, accessTokenLifetime, refreshTokenIdleExpiration, refreshTokenExpiration, authTime) //PLANNED: lifetime from client if err != nil { - if errors.IsErrorInvalidArgument(err) { + if zerrors.IsErrorInvalidArgument(err) { err = oidc.ErrInvalidGrant().WithParent(err) } return "", "", time.Time{}, err @@ -308,7 +308,7 @@ func (o *OPStorage) TerminateSession(ctx context.Context, userID, clientID strin userAgentID, ok := middleware.UserAgentIDFromCtx(ctx) if !ok { logging.Error("no user agent id") - return errors.ThrowPreconditionFailed(nil, "OIDC-fso7F", "no user agent id") + return zerrors.ThrowPreconditionFailed(nil, "OIDC-fso7F", "no user agent id") } userIDs, err := o.repo.UserSessionUserIDsByAgentID(ctx, userAgentID) if err != nil { @@ -366,7 +366,7 @@ func (o *OPStorage) RevokeToken(ctx context.Context, token, userID, clientID str if err == nil { return nil } - if errors.IsPreconditionFailed(err) { + if zerrors.IsPreconditionFailed(err) { return oidc.ErrInvalidClient().WithDescription("token was not issued for this client") } return oidc.ErrServerError().WithParent(err) @@ -382,14 +382,14 @@ func (o *OPStorage) revokeTokenV1(ctx context.Context, token, userID, clientID s return oidc.ErrInvalidClient().WithDescription("token was not issued for this client") } _, err = o.command.RevokeRefreshToken(ctx, refreshToken.UserID, refreshToken.ResourceOwner, refreshToken.ID) - if err == nil || errors.IsNotFound(err) { + if err == nil || zerrors.IsNotFound(err) { return nil } return oidc.ErrServerError().WithParent(err) } accessToken, err := o.repo.TokenByIDs(ctx, userID, token) if err != nil { - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { return nil } return oidc.ErrServerError().WithParent(err) @@ -398,7 +398,7 @@ func (o *OPStorage) revokeTokenV1(ctx context.Context, token, userID, clientID s return oidc.ErrInvalidClient().WithDescription("token was not issued for this client") } _, err = o.command.RevokeAccessToken(ctx, userID, accessToken.ResourceOwner, accessToken.ID) - if err == nil || errors.IsNotFound(err) { + if err == nil || zerrors.IsNotFound(err) { return nil } return oidc.ErrServerError().WithParent(err) @@ -434,18 +434,18 @@ func (o *OPStorage) assertProjectRoleScopes(ctx context.Context, clientID string } projectID, err := o.query.ProjectIDFromOIDCClientID(ctx, clientID) if err != nil { - return nil, errors.ThrowPreconditionFailed(nil, "OIDC-AEG4d", "Errors.Internal") + return nil, zerrors.ThrowPreconditionFailed(nil, "OIDC-AEG4d", "Errors.Internal") } project, err := o.query.ProjectByID(ctx, false, projectID) if err != nil { - return nil, errors.ThrowPreconditionFailed(nil, "OIDC-w4wIn", "Errors.Internal") + return nil, zerrors.ThrowPreconditionFailed(nil, "OIDC-w4wIn", "Errors.Internal") } if !project.ProjectRoleAssertion { return scopes, nil } projectIDQuery, err := query.NewProjectRoleProjectIDSearchQuery(project.ID) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-Cyc78", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "OIDC-Cyc78", "Errors.Internal") } roles, err := o.query.SearchProjectRoles(ctx, true, &query.ProjectRoleSearchQueries{Queries: []query.SearchQuery{projectIDQuery}}) if err != nil { @@ -468,7 +468,7 @@ func (o *OPStorage) assertProjectRoleScopesByProject(ctx context.Context, projec } projectIDQuery, err := query.NewProjectRoleProjectIDSearchQuery(project.ID) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-Cyc78", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "OIDC-Cyc78", "Errors.Internal") } roles, err := o.query.SearchProjectRoles(ctx, true, &query.ProjectRoleSearchQueries{Queries: []query.SearchQuery{projectIDQuery}}) if err != nil { @@ -484,7 +484,7 @@ func (o *OPStorage) assertClientScopesForPAT(ctx context.Context, token *model.T token.Audience = append(token.Audience, clientID) projectIDQuery, err := query.NewProjectRoleProjectIDSearchQuery(projectID) if err != nil { - return errors.ThrowInternal(err, "OIDC-Cyc78", "Errors.Internal") + return zerrors.ThrowInternal(err, "OIDC-Cyc78", "Errors.Internal") } roles, err := o.query.SearchProjectRoles(ctx, true, &query.ProjectRoleSearchQueries{Queries: []query.SearchQuery{projectIDQuery}}) if err != nil { @@ -505,7 +505,7 @@ func setContextUserSystem(ctx context.Context) context.Context { func (o *OPStorage) getOIDCSettings(ctx context.Context) (accessTokenLifetime, idTokenLifetime, refreshTokenIdleExpiration, refreshTokenExpiration time.Duration, _ error) { oidcSettings, err := o.query.OIDCSettingsByAggID(ctx, authz.GetInstance(ctx).InstanceID()) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return time.Duration(0), time.Duration(0), time.Duration(0), time.Duration(0), err } diff --git a/internal/api/oidc/auth_request_converter.go b/internal/api/oidc/auth_request_converter.go index 8fbd18530..4cb3d60a8 100644 --- a/internal/api/oidc/auth_request_converter.go +++ b/internal/api/oidc/auth_request_converter.go @@ -13,8 +13,8 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" http_utils "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type AuthRequest struct { @@ -96,7 +96,7 @@ func (a *AuthRequest) oidc() *domain.AuthRequestOIDC { func AuthRequestFromBusiness(authReq *domain.AuthRequest) (_ op.AuthRequest, err error) { if _, ok := authReq.Request.(*domain.AuthRequestOIDC); !ok { - return nil, errors.ThrowInvalidArgument(nil, "OIDC-Haz7A", "auth request is not of type oidc") + return nil, zerrors.ThrowInvalidArgument(nil, "OIDC-Haz7A", "auth request is not of type oidc") } return &AuthRequest{authReq}, nil } diff --git a/internal/api/oidc/client.go b/internal/api/oidc/client.go index b97edc92b..ca8156a66 100644 --- a/internal/api/oidc/client.go +++ b/internal/api/oidc/client.go @@ -21,9 +21,9 @@ import ( "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -48,7 +48,7 @@ func (o *OPStorage) GetClientByClientID(ctx context.Context, id string) (_ op.Cl return nil, err } if client.State != domain.AppStateActive { - return nil, errors.ThrowPreconditionFailed(nil, "OIDC-sdaGg", "client is not active") + return nil, zerrors.ThrowPreconditionFailed(nil, "OIDC-sdaGg", "client is not active") } return ClientFromBusiness(client, o.defaultLoginURL, o.defaultLoginURLV2), nil } @@ -117,7 +117,7 @@ func (o *OPStorage) SetUserinfoFromToken(ctx context.Context, userInfo *oidc.Use token, err := o.repo.TokenByIDs(ctx, subject, tokenID) if err != nil { - return errors.ThrowPermissionDenied(nil, "OIDC-Dsfb2", "token is not valid or has expired") + return zerrors.ThrowPermissionDenied(nil, "OIDC-Dsfb2", "token is not valid or has expired") } if token.ApplicationID != "" { if err = o.isOriginAllowed(ctx, token.ApplicationID, origin); err != nil { @@ -138,7 +138,7 @@ func (o *OPStorage) SetUserinfoFromScopes(ctx context.Context, userInfo *oidc.Us if app.OIDCConfig.AssertIDTokenRole { scopes, err = o.assertProjectRoleScopes(ctx, applicationID, scopes) if err != nil { - return errors.ThrowPreconditionFailed(err, "OIDC-Dfe2s", "Errors.Internal") + return zerrors.ThrowPreconditionFailed(err, "OIDC-Dfe2s", "Errors.Internal") } } } @@ -168,7 +168,7 @@ func (o *OPStorage) SetIntrospectionFromToken(ctx context.Context, introspection } projectID, err := o.query.ProjectIDFromClientID(ctx, clientID) if err != nil { - return errors.ThrowPermissionDenied(nil, "OIDC-Adfg5", "client not found") + return zerrors.ThrowPermissionDenied(nil, "OIDC-Adfg5", "client not found") } return o.introspect(ctx, introspection, tokenID, token.UserID, token.ClientID, clientID, projectID, @@ -178,16 +178,16 @@ func (o *OPStorage) SetIntrospectionFromToken(ctx context.Context, introspection token, err := o.repo.TokenByIDs(ctx, subject, tokenID) if err != nil { - return errors.ThrowPermissionDenied(nil, "OIDC-Dsfb2", "token is not valid or has expired") + return zerrors.ThrowPermissionDenied(nil, "OIDC-Dsfb2", "token is not valid or has expired") } projectID, err := o.query.ProjectIDFromClientID(ctx, clientID) if err != nil { - return errors.ThrowPermissionDenied(nil, "OIDC-Adfg5", "client not found") + return zerrors.ThrowPermissionDenied(nil, "OIDC-Adfg5", "client not found") } if token.IsPAT { err = o.assertClientScopesForPAT(ctx, token, clientID, projectID) if err != nil { - return errors.ThrowPreconditionFailed(err, "OIDC-AGefw", "Errors.Internal") + return zerrors.ThrowPreconditionFailed(err, "OIDC-AGefw", "Errors.Internal") } } return o.introspect(ctx, introspection, @@ -216,7 +216,7 @@ func (o *OPStorage) ClientCredentialsTokenRequest(ctx context.Context, clientID // ClientCredentials method is kept to keep the storage interface implemented. // However, it should never be called as the VerifyClient method on the Server is overridden. func (o *OPStorage) ClientCredentials(context.Context, string, string) (op.Client, error) { - return nil, errors.ThrowInternal(nil, "OIDC-Su8So", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "OIDC-Su8So", "Errors.Internal") } // isOriginAllowed checks whether a call by the client to the endpoint is allowed from the provided origin @@ -232,7 +232,7 @@ func (o *OPStorage) isOriginAllowed(ctx context.Context, clientID, origin string if api_http.IsOriginAllowed(app.OIDCConfig.AllowedOrigins, origin) { return nil } - return errors.ThrowPermissionDenied(nil, "OIDC-da1f3", "origin is not allowed") + return zerrors.ThrowPermissionDenied(nil, "OIDC-da1f3", "origin is not allowed") } func (o *OPStorage) introspect( @@ -265,7 +265,7 @@ func (o *OPStorage) introspect( return nil } } - return errors.ThrowPermissionDenied(nil, "OIDC-sdg3G", "token is not valid for this client") + return zerrors.ThrowPermissionDenied(nil, "OIDC-sdg3G", "token is not valid for this client") } func (o *OPStorage) checkOrgScopes(ctx context.Context, user *query.User, scopes []string) ([]string, error) { @@ -732,7 +732,7 @@ func (o *OPStorage) assertRoles(ctx context.Context, userID, applicationID strin } projectID, err := o.query.ProjectIDFromClientID(ctx, applicationID) // applicationID might contain a username (e.g. client credentials) -> ignore the not found - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return nil, nil, err } // ensure the projectID of the requesting is part of the roleAudience @@ -914,7 +914,7 @@ func (s *Server) VerifyClient(ctx context.Context, r *op.Request[op.ClientCreden return nil, err } client, err := s.query.GetOIDCClientByID(ctx, clientID, assertion) - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { return nil, oidc.ErrInvalidClient().WithParent(err).WithDescription("client not found") } if err != nil { diff --git a/internal/api/oidc/client_credentials.go b/internal/api/oidc/client_credentials.go index e068f5138..c3622680c 100644 --- a/internal/api/oidc/client_credentials.go +++ b/internal/api/oidc/client_credentials.go @@ -8,8 +8,8 @@ import ( "github.com/zitadel/oidc/v3/pkg/op" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) type clientCredentialsRequest struct { @@ -35,18 +35,18 @@ func (c *clientCredentialsRequest) GetScopes() []string { func (s *Server) clientCredentialsAuth(ctx context.Context, clientID, clientSecret string) (op.Client, error) { user, err := s.query.GetUserByLoginName(ctx, false, clientID) - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { return nil, oidc.ErrInvalidClient().WithParent(err).WithDescription("client not found") } if err != nil { return nil, err // defaults to server error } if user.Machine == nil || user.Machine.Secret == nil { - return nil, errors.ThrowPreconditionFailed(nil, "OIDC-pieP8", "Errors.User.Machine.Secret.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "OIDC-pieP8", "Errors.User.Machine.Secret.NotExisting") } if err = crypto.CompareHash(user.Machine.Secret, []byte(clientSecret), s.hashAlg); err != nil { s.command.MachineSecretCheckFailed(ctx, user.ID, user.ResourceOwner) - return nil, errors.ThrowInvalidArgument(err, "OIDC-VoXo6", "Errors.User.Machine.Secret.Invalid") + return nil, zerrors.ThrowInvalidArgument(err, "OIDC-VoXo6", "Errors.User.Machine.Secret.Invalid") } s.command.MachineSecretCheckSucceeded(ctx, user.ID, user.ResourceOwner) diff --git a/internal/api/oidc/device_auth.go b/internal/api/oidc/device_auth.go index 80298e8af..42747ca49 100644 --- a/internal/api/oidc/device_auth.go +++ b/internal/api/oidc/device_auth.go @@ -10,8 +10,8 @@ import ( "github.com/zitadel/zitadel/internal/api/ui/login" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -85,12 +85,12 @@ func (o *OPStorage) StoreDeviceAuthorization(ctx context.Context, clientID, devi return err } if !op.ValidateGrantType(client, oidc.GrantTypeDeviceCode) { - return errors.ThrowPermissionDeniedf(nil, "OIDC-et1Ae", "grant type %q not allowed for client", oidc.GrantTypeDeviceCode) + return zerrors.ThrowPermissionDeniedf(nil, "OIDC-et1Ae", "grant type %q not allowed for client", oidc.GrantTypeDeviceCode) } scopes, err = o.assertProjectRoleScopes(ctx, clientID, scopes) if err != nil { - return errors.ThrowPreconditionFailed(err, "OIDC-She4t", "Errors.Internal") + return zerrors.ThrowPreconditionFailed(err, "OIDC-She4t", "Errors.Internal") } aggrID, details, err := o.command.AddDeviceAuth(ctx, clientID, deviceCode, userCode, expires, scopes) if err == nil { diff --git a/internal/api/oidc/introspect.go b/internal/api/oidc/introspect.go index cedac441e..90cda8de7 100644 --- a/internal/api/oidc/introspect.go +++ b/internal/api/oidc/introspect.go @@ -11,9 +11,9 @@ import ( "github.com/zitadel/oidc/v3/pkg/op" "github.com/zitadel/zitadel/internal/crypto" - zerrors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (s *Server) Introspect(ctx context.Context, r *op.Request[op.IntrospectionRequest]) (resp *op.Response, err error) { diff --git a/internal/api/oidc/jwt-profile.go b/internal/api/oidc/jwt-profile.go index a0bf491bb..805936dff 100644 --- a/internal/api/oidc/jwt-profile.go +++ b/internal/api/oidc/jwt-profile.go @@ -7,7 +7,7 @@ import ( "github.com/zitadel/oidc/v3/pkg/op" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func (o *OPStorage) JWTProfileTokenType(ctx context.Context, request op.TokenRequest) (op.AccessTokenType, error) { @@ -18,7 +18,7 @@ func (o *OPStorage) JWTProfileTokenType(ctx context.Context, request op.TokenReq } // the user should always be a machine, but let's just be sure if user.Machine == nil { - return 0, errors.ThrowInvalidArgument(nil, "OIDC-jk26S", "invalid client type") + return 0, zerrors.ThrowInvalidArgument(nil, "OIDC-jk26S", "invalid client type") } return accessTokenTypeToOIDC(user.Machine.AccessTokenType), nil } diff --git a/internal/api/oidc/key.go b/internal/api/oidc/key.go index 6f9e51407..d0e781a0c 100644 --- a/internal/api/oidc/key.go +++ b/internal/api/oidc/key.go @@ -14,12 +14,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/keypair" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) // keySetCache implements oidc.KeySet for Access Token verification. @@ -97,7 +97,7 @@ func (k *keySetCache) getKey(ctx context.Context, keyID string) (_ *jose.JSONWeb if key.Expiry().After(k.clock.Now()) { return jsonWebkey(key), nil } - return nil, errors.ThrowInvalidArgument(nil, "OIDC-Zoh9E", "Errors.Key.ExpireBeforeNow") + return nil, zerrors.ThrowInvalidArgument(nil, "OIDC-Zoh9E", "Errors.Key.ExpireBeforeNow") } key, err = k.queryKey(ctx, keyID, k.clock.Now()) @@ -114,7 +114,7 @@ func (k *keySetCache) VerifySignature(ctx context.Context, jws *jose.JSONWebSign defer func() { span.EndWithError(err) }() if len(jws.Signatures) != 1 { - return nil, errors.ThrowInvalidArgument(nil, "OIDC-Gid9s", "Errors.Token.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "OIDC-Gid9s", "Errors.Token.Invalid") } key, err := k.getKey(ctx, jws.Signatures[0].Header.KeyID) if err != nil { @@ -152,7 +152,7 @@ func (k keySetMap) getKey(keyID string) (*jose.JSONWebKey, error) { // VerifySignature implements the oidc.KeySet interface. func (k keySetMap) VerifySignature(ctx context.Context, jws *jose.JSONWebSignature) ([]byte, error) { if len(jws.Signatures) != 1 { - return nil, errors.ThrowInvalidArgument(nil, "OIDC-Eeth6", "Errors.Token.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "OIDC-Eeth6", "Errors.Token.Invalid") } key, err := k.getKey(jws.Signatures[0].Header.KeyID) if err != nil { @@ -248,7 +248,7 @@ func (o *OPStorage) SigningKey(ctx context.Context) (key op.SigningKey, err erro return err } if key == nil { - return errors.ThrowInternal(nil, "test", "test") + return zerrors.ThrowInternal(nil, "test", "test") } return nil }) @@ -273,13 +273,13 @@ func (o *OPStorage) getSigningKey(ctx context.Context) (op.SigningKey, error) { func (o *OPStorage) refreshSigningKey(ctx context.Context, algorithm string, position float64) error { ok, err := o.ensureIsLatestKey(ctx, position) if err != nil || !ok { - return errors.ThrowInternal(err, "OIDC-ASfh3", "cannot ensure that projection is up to date") + return zerrors.ThrowInternal(err, "OIDC-ASfh3", "cannot ensure that projection is up to date") } err = o.lockAndGenerateSigningKeyPair(ctx, algorithm) if err != nil { - return errors.ThrowInternal(err, "OIDC-ADh31", "could not create signing key") + return zerrors.ThrowInternal(err, "OIDC-ADh31", "could not create signing key") } - return errors.ThrowInternal(nil, "OIDC-Df1bh", "") + return zerrors.ThrowInternal(nil, "OIDC-Df1bh", "") } func (o *OPStorage) ensureIsLatestKey(ctx context.Context, position float64) (bool, error) { @@ -315,7 +315,7 @@ func (o *OPStorage) lockAndGenerateSigningKeyPair(ctx context.Context, algorithm errs := o.locker.Lock(ctx, lockDuration, authz.GetInstance(ctx).InstanceID()) err, ok := <-errs if err != nil || !ok { - if errors.IsErrorAlreadyExists(err) { + if zerrors.IsErrorAlreadyExists(err) { return nil } logging.OnError(err).Debug("initial lock failed") diff --git a/internal/api/oidc/op.go b/internal/api/oidc/op.go index f4020d3d8..272f2a285 100644 --- a/internal/api/oidc/op.go +++ b/internal/api/oidc/op.go @@ -18,11 +18,11 @@ import ( "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/telemetry/metrics" + "github.com/zitadel/zitadel/internal/zerrors" ) type Config struct { @@ -101,7 +101,7 @@ func NewServer( ) (*Server, error) { opConfig, err := createOPConfig(config, defaultLogoutRedirectURI, cryptoKey) if err != nil { - return nil, caos_errs.ThrowInternal(err, "OIDC-EGrqd", "cannot create op config: %w") + return nil, zerrors.ThrowInternal(err, "OIDC-EGrqd", "cannot create op config: %w") } storage := newStorage(config, command, query, repo, encryptionAlg, es, projections, externalSecure) var options []op.Option @@ -109,7 +109,7 @@ func NewServer( options = append(options, op.WithAllowInsecure()) } if err != nil { - return nil, caos_errs.ThrowInternal(err, "OIDC-D3gq1", "cannot create options: %w") + return nil, zerrors.ThrowInternal(err, "OIDC-D3gq1", "cannot create options: %w") } provider, err := op.NewProvider( opConfig, @@ -118,7 +118,7 @@ func NewServer( options..., ) if err != nil { - return nil, caos_errs.ThrowInternal(err, "OIDC-DAtg3", "cannot create provider") + return nil, zerrors.ThrowInternal(err, "OIDC-DAtg3", "cannot create provider") } server := &Server{ @@ -179,7 +179,7 @@ func createOPConfig(config Config, defaultLogoutRedirectURI string, cryptoKey [] DeviceAuthorization: config.DeviceAuth.toOPConfig(), } if cryptoLength := len(cryptoKey); cryptoLength != 32 { - return nil, caos_errs.ThrowInternalf(nil, "OIDC-D43gf", "crypto key must be 32 bytes, but is %d", cryptoLength) + return nil, zerrors.ThrowInternalf(nil, "OIDC-D43gf", "crypto key must be 32 bytes, but is %d", cryptoLength) } copy(opConfig.CryptoKey[:], cryptoKey) return opConfig, nil diff --git a/internal/api/saml/auth_request_converter.go b/internal/api/saml/auth_request_converter.go index 28f2a3c54..cf4450f85 100644 --- a/internal/api/saml/auth_request_converter.go +++ b/internal/api/saml/auth_request_converter.go @@ -9,7 +9,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var _ models.AuthRequestInt = &AuthRequest{} @@ -66,7 +66,7 @@ func (a *AuthRequest) GetUserName() string { func AuthRequestFromBusiness(authReq *domain.AuthRequest) (_ models.AuthRequestInt, err error) { if _, ok := authReq.Request.(*domain.AuthRequestSAML); !ok { - return nil, errors.ThrowInvalidArgument(nil, "SAML-Hbz7A", "auth request is not of type saml") + return nil, zerrors.ThrowInvalidArgument(nil, "SAML-Hbz7A", "auth request is not of type saml") } return &AuthRequest{authReq}, nil } diff --git a/internal/api/saml/certificate.go b/internal/api/saml/certificate.go index 6dd02e1bc..1dd6a7407 100644 --- a/internal/api/saml/certificate.go +++ b/internal/api/saml/certificate.go @@ -12,11 +12,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -60,7 +60,7 @@ func (p *Storage) GetCertificateAndKey(ctx context.Context, usage domain.KeyUsag return err } if certAndKey == nil { - return errors.ThrowInternal(err, "SAML-8u01nks", "no certificate found") + return zerrors.ThrowInternal(err, "SAML-8u01nks", "no certificate found") } return nil }) @@ -120,7 +120,7 @@ func (p *Storage) lockAndGenerateCertificateAndKey(ctx context.Context, usage do errs := p.locker.Lock(ctx, lockDuration, authz.GetInstance(ctx).InstanceID()) err, ok := <-errs if err != nil || !ok { - if errors.IsErrorAlreadyExists(err) { + if zerrors.IsErrorAlreadyExists(err) { return nil } logging.OnError(err).Debug("initial lock failed") diff --git a/internal/api/saml/storage.go b/internal/api/saml/storage.go index afcc06d98..54378bb91 100644 --- a/internal/api/saml/storage.go +++ b/internal/api/saml/storage.go @@ -21,11 +21,11 @@ import ( "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/crdb" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var _ provider.EntityStorage = &Storage{} @@ -60,7 +60,7 @@ func (p *Storage) GetEntityByID(ctx context.Context, entityID string) (*servicep return nil, err } if app.State != domain.AppStateActive { - return nil, errors.ThrowPreconditionFailed(nil, "SAML-sdaGg", "app is not active") + return nil, zerrors.ThrowPreconditionFailed(nil, "SAML-sdaGg", "app is not active") } return serviceprovider.NewServiceProvider( app.ID, @@ -77,7 +77,7 @@ func (p *Storage) GetEntityIDByAppID(ctx context.Context, appID string) (string, return "", err } if app.State != domain.AppStateActive { - return "", errors.ThrowPreconditionFailed(nil, "SAML-sdaGg", "app is not active") + return "", zerrors.ThrowPreconditionFailed(nil, "SAML-sdaGg", "app is not active") } return app.SAMLConfig.EntityID, nil } @@ -103,7 +103,7 @@ func (p *Storage) CreateAuthRequest(ctx context.Context, req *samlp.AuthnRequest defer func() { span.EndWithError(err) }() userAgentID, ok := middleware.UserAgentIDFromCtx(ctx) if !ok { - return nil, errors.ThrowPreconditionFailed(nil, "SAML-sd436", "no user agent id") + return nil, zerrors.ThrowPreconditionFailed(nil, "SAML-sd436", "no user agent id") } authRequest := CreateAuthRequestToBusiness(ctx, req, acsUrl, protocolBinding, applicationID, relayState, userAgentID) @@ -121,7 +121,7 @@ func (p *Storage) AuthRequestByID(ctx context.Context, id string) (_ models.Auth defer func() { span.EndWithError(err) }() userAgentID, ok := middleware.UserAgentIDFromCtx(ctx) if !ok { - return nil, errors.ThrowPreconditionFailed(nil, "SAML-D3g21", "no user agent id") + return nil, zerrors.ThrowPreconditionFailed(nil, "SAML-D3g21", "no user agent id") } resp, err := p.repo.AuthRequestByIDCheckLoggedIn(ctx, id, userAgentID) if err != nil { diff --git a/internal/api/ui/login/device_auth.go b/internal/api/ui/login/device_auth.go index ff5031ebc..150843dea 100644 --- a/internal/api/ui/login/device_auth.go +++ b/internal/api/ui/login/device_auth.go @@ -1,7 +1,7 @@ package login import ( - errs "errors" + "errors" "fmt" "net/http" "net/url" @@ -14,7 +14,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/http/middleware" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -95,7 +95,7 @@ func (l *Login) handleDeviceAuthUserCode(w http.ResponseWriter, r *http.Request) userCode := r.Form.Get("user_code") if userCode == "" { if prompt, _ := url.QueryUnescape(r.Form.Get("prompt")); prompt != "" { - err = errs.New(prompt) + err = errors.New(prompt) } l.renderDeviceAuthUserCode(w, r, err) return @@ -107,7 +107,7 @@ func (l *Login) handleDeviceAuthUserCode(w http.ResponseWriter, r *http.Request) } userAgentID, ok := middleware.UserAgentIDFromCtx(ctx) if !ok { - l.renderDeviceAuthUserCode(w, r, errs.New("internal error: agent ID missing")) + l.renderDeviceAuthUserCode(w, r, errors.New("internal error: agent ID missing")) return } authRequest, err := l.authRepo.CreateAuthRequest(ctx, &domain.AuthRequest{ @@ -151,7 +151,7 @@ func (l *Login) redirectDeviceAuthStart(w http.ResponseWriter, r *http.Request, func (l *Login) handleDeviceAuthAction(w http.ResponseWriter, r *http.Request) { authReq, err := l.getAuthRequest(r) if authReq == nil { - err = errors.ThrowInvalidArgument(err, "LOGIN-OLah8", "invalid or missing auth request") + err = zerrors.ThrowInvalidArgument(err, "LOGIN-OLah8", "invalid or missing auth request") l.redirectDeviceAuthStart(w, r, err.Error()) return } diff --git a/internal/api/ui/login/external_provider_handler.go b/internal/api/ui/login/external_provider_handler.go index a2f0afcbc..2a01a74f4 100644 --- a/internal/api/ui/login/external_provider_handler.go +++ b/internal/api/ui/login/external_provider_handler.go @@ -17,7 +17,6 @@ import ( http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/idp" "github.com/zitadel/zitadel/internal/idp/providers/apple" @@ -32,6 +31,7 @@ import ( "github.com/zitadel/zitadel/internal/idp/providers/saml" "github.com/zitadel/zitadel/internal/idp/providers/saml/requesttracker" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -106,7 +106,7 @@ func (l *Login) handleExternalLoginStep(w http.ResponseWriter, r *http.Request, return } } - l.renderLogin(w, r, authReq, errors.ThrowInvalidArgument(nil, "VIEW-Fsj7f", "Errors.User.ExternalIDP.NotAllowed")) + l.renderLogin(w, r, authReq, zerrors.ThrowInvalidArgument(nil, "VIEW-Fsj7f", "Errors.User.ExternalIDP.NotAllowed")) } // handleExternalLogin is called when a user selects the idp on the login page @@ -179,7 +179,7 @@ func (l *Login) handleIDP(w http.ResponseWriter, r *http.Request, authReq *domai case domain.IDPTypeUnspecified: fallthrough default: - l.renderLogin(w, r, authReq, errors.ThrowInvalidArgument(nil, "LOGIN-AShek", "Errors.ExternalIDP.IDPTypeNotImplemented")) + l.renderLogin(w, r, authReq, zerrors.ThrowInvalidArgument(nil, "LOGIN-AShek", "Errors.ExternalIDP.IDPTypeNotImplemented")) return } if err != nil { @@ -330,7 +330,7 @@ func (l *Login) handleExternalLoginCallback(w http.ResponseWriter, r *http.Reque domain.IDPTypeUnspecified: fallthrough default: - l.renderLogin(w, r, authReq, errors.ThrowInvalidArgument(nil, "LOGIN-SFefg", "Errors.ExternalIDP.IDPTypeNotImplemented")) + l.renderLogin(w, r, authReq, zerrors.ThrowInvalidArgument(nil, "LOGIN-SFefg", "Errors.ExternalIDP.IDPTypeNotImplemented")) return } @@ -365,7 +365,7 @@ func (l *Login) migrateExternalUserID(r *http.Request, authReq *domain.AuthReque // always reset to the mapped ID externalUser.ExternalUserID = externalUserID // but ignore the error if the user was just not found with the previousID - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { return false, nil } return false, err @@ -395,11 +395,11 @@ func (l *Login) handleExternalUserAuthenticated( externalUser := mapIDPUserToExternalUser(user, provider.ID) // check and fill in local linked user externalErr := l.authRepo.CheckExternalUserLogin(setContext(r.Context(), ""), authReq.ID, authReq.AgentID, externalUser, domain.BrowserInfoFromRequest(r), false) - if externalErr != nil && !errors.IsNotFound(externalErr) { + if externalErr != nil && !zerrors.IsNotFound(externalErr) { l.renderError(w, r, authReq, externalErr) return } - if externalErr != nil && errors.IsNotFound(externalErr) { + if externalErr != nil && zerrors.IsNotFound(externalErr) { previousIDMatched, err := l.tryMigrateExternalUserID(r, session, authReq, externalUser) if err != nil { l.renderError(w, r, authReq, err) @@ -423,7 +423,7 @@ func (l *Login) handleExternalUserAuthenticated( return } // if action is done and no user linked then link or register - if errors.IsNotFound(externalErr) { + if zerrors.IsNotFound(externalErr) { l.externalUserNotExisting(w, r, authReq, provider, externalUser, externalUserChange) return } @@ -489,7 +489,7 @@ func (l *Login) externalUserNotExisting(w http.ResponseWriter, r *http.Request, // autoCreateExternalUser takes the externalUser and creates it automatically (without user interaction) func (l *Login) autoCreateExternalUser(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest) { if len(authReq.LinkingUsers) == 0 { - l.renderError(w, r, authReq, errors.ThrowPreconditionFailed(nil, "LOGIN-asfg3", "Errors.ExternalIDP.NoExternalUserData")) + l.renderError(w, r, authReq, zerrors.ThrowPreconditionFailed(nil, "LOGIN-asfg3", "Errors.ExternalIDP.NoExternalUserData")) return } @@ -613,7 +613,7 @@ func (l *Login) handleExternalNotFoundOptionCheck(w http.ResponseWriter, r *http // if the user selects the linking button if data.Link { if !idpTemplate.IsLinkingAllowed { - l.renderExternalNotFoundOption(w, r, authReq, nil, nil, nil, errors.ThrowPreconditionFailed(nil, "LOGIN-AS3ff", "Errors.ExternalIDP.LinkingNotAllowed")) + l.renderExternalNotFoundOption(w, r, authReq, nil, nil, nil, zerrors.ThrowPreconditionFailed(nil, "LOGIN-AS3ff", "Errors.ExternalIDP.LinkingNotAllowed")) return } l.renderLogin(w, r, authReq, nil) @@ -621,7 +621,7 @@ func (l *Login) handleExternalNotFoundOptionCheck(w http.ResponseWriter, r *http } // if the user selects the creation button if !idpTemplate.IsCreationAllowed { - l.renderExternalNotFoundOption(w, r, authReq, nil, nil, nil, errors.ThrowPreconditionFailed(nil, "LOGIN-dsfd3", "Errors.ExternalIDP.CreationNotAllowed")) + l.renderExternalNotFoundOption(w, r, authReq, nil, nil, nil, zerrors.ThrowPreconditionFailed(nil, "LOGIN-dsfd3", "Errors.ExternalIDP.CreationNotAllowed")) return } linkingUser := mapExternalNotFoundOptionFormDataToLoginUser(data) @@ -682,7 +682,7 @@ func (l *Login) updateExternalUser(ctx context.Context, authReq *domain.AuthRequ return err } if user.Human == nil { - return errors.ThrowPreconditionFailed(nil, "LOGIN-WLTce", "Errors.User.NotHuman") + return zerrors.ThrowPreconditionFailed(nil, "LOGIN-WLTce", "Errors.User.NotHuman") } err = l.updateExternalUserEmail(ctx, user, externalUser) logging.WithFields("authReq", authReq.ID, "user", authReq.UserID).OnError(err).Error("unable to update email") diff --git a/internal/api/ui/login/init_password_handler.go b/internal/api/ui/login/init_password_handler.go index e52a470e4..f17709970 100644 --- a/internal/api/ui/login/init_password_handler.go +++ b/internal/api/ui/login/init_password_handler.go @@ -6,7 +6,7 @@ import ( http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -64,7 +64,7 @@ func (l *Login) handleInitPasswordCheck(w http.ResponseWriter, r *http.Request) func (l *Login) checkPWCode(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, data *initPasswordFormData) { if data.Password != data.PasswordConfirm { - err := errors.ThrowInvalidArgument(nil, "VIEW-KaGue", "Errors.User.Password.ConfirmationWrong") + err := zerrors.ThrowInvalidArgument(nil, "VIEW-KaGue", "Errors.User.Password.ConfirmationWrong") l.renderInitPassword(w, r, authReq, data.UserID, data.Code, err) return } @@ -83,7 +83,7 @@ func (l *Login) checkPWCode(w http.ResponseWriter, r *http.Request, authReq *dom func (l *Login) resendPasswordSet(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest) { if authReq == nil { - l.renderError(w, r, nil, errors.ThrowInternal(nil, "LOGIN-8sn7s", "Errors.AuthRequest.NotFound")) + l.renderError(w, r, nil, zerrors.ThrowInternal(nil, "LOGIN-8sn7s", "Errors.AuthRequest.NotFound")) return } userOrg := login diff --git a/internal/api/ui/login/init_user_handler.go b/internal/api/ui/login/init_user_handler.go index 850ddb32a..f88480a5b 100644 --- a/internal/api/ui/login/init_user_handler.go +++ b/internal/api/ui/login/init_user_handler.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -72,7 +72,7 @@ func (l *Login) handleInitUserCheck(w http.ResponseWriter, r *http.Request) { func (l *Login) checkUserInitCode(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, data *initUserFormData, err error) { if data.Password != data.PasswordConfirm { - err := caos_errs.ThrowInvalidArgument(nil, "VIEW-fsdfd", "Errors.User.Password.ConfirmationWrong") + err := zerrors.ThrowInvalidArgument(nil, "VIEW-fsdfd", "Errors.User.Password.ConfirmationWrong") l.renderInitUser(w, r, authReq, data.UserID, data.LoginName, data.Code, data.PasswordSet, err) return } diff --git a/internal/api/ui/login/jwt_handler.go b/internal/api/ui/login/jwt_handler.go index aa7a4466d..7c643e9a4 100644 --- a/internal/api/ui/login/jwt_handler.go +++ b/internal/api/ui/login/jwt_handler.go @@ -13,9 +13,9 @@ import ( http_util "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/idp/providers/jwt" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) type jwtRequest struct { @@ -31,7 +31,7 @@ func (l *Login) handleJWTRequest(w http.ResponseWriter, r *http.Request) { return } if data.AuthRequestID == "" || data.UserAgentID == "" { - l.renderError(w, r, nil, errors.ThrowInvalidArgument(nil, "LOGIN-adfzz", "Errors.AuthRequest.MissingParameters")) + l.renderError(w, r, nil, zerrors.ThrowInvalidArgument(nil, "LOGIN-adfzz", "Errors.AuthRequest.MissingParameters")) return } id, err := base64.RawURLEncoding.DecodeString(data.UserAgentID) @@ -158,7 +158,7 @@ func getToken(r *http.Request, headerName string) (string, error) { } auth := r.Header.Get(headerName) if auth == "" { - return "", errors.ThrowInvalidArgument(nil, "LOGIN-adh42", "Errors.AuthRequest.TokenNotFound") + return "", zerrors.ThrowInvalidArgument(nil, "LOGIN-adh42", "Errors.AuthRequest.TokenNotFound") } return strings.TrimPrefix(auth, oidc.PrefixBearer), nil } diff --git a/internal/api/ui/login/login_handler.go b/internal/api/ui/login/login_handler.go index 236949063..31f16b855 100644 --- a/internal/api/ui/login/login_handler.go +++ b/internal/api/ui/login/login_handler.go @@ -7,7 +7,7 @@ import ( http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -77,7 +77,7 @@ func (l *Login) handleLoginNameCheck(w http.ResponseWriter, r *http.Request) { return } if authReq == nil { - l.renderLogin(w, r, nil, errors.ThrowInvalidArgument(nil, "LOGIN-adrg3", "Errors.AuthRequest.NotFound")) + l.renderLogin(w, r, nil, zerrors.ThrowInvalidArgument(nil, "LOGIN-adrg3", "Errors.AuthRequest.NotFound")) return } userAgentID, _ := http_mw.UserAgentIDFromCtx(r.Context()) diff --git a/internal/api/ui/login/login_success_handler.go b/internal/api/ui/login/login_success_handler.go index 8186bfe61..00f29becf 100644 --- a/internal/api/ui/login/login_success_handler.go +++ b/internal/api/ui/login/login_success_handler.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -73,6 +73,6 @@ func (l *Login) authRequestCallback(ctx context.Context, authReq *domain.AuthReq case *domain.AuthRequestDevice: return l.deviceAuthCallbackURL(authReq.ID), nil default: - return "", caos_errs.ThrowInternal(nil, "LOGIN-rhjQF", "Errors.AuthRequest.RequestTypeNotSupported") + return "", zerrors.ThrowInternal(nil, "LOGIN-rhjQF", "Errors.AuthRequest.RequestTypeNotSupported") } } diff --git a/internal/api/ui/login/mfa_prompt_handler.go b/internal/api/ui/login/mfa_prompt_handler.go index 7aba58197..bee8df216 100644 --- a/internal/api/ui/login/mfa_prompt_handler.go +++ b/internal/api/ui/login/mfa_prompt_handler.go @@ -4,8 +4,7 @@ import ( "net/http" "github.com/zitadel/zitadel/internal/domain" - - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -61,7 +60,7 @@ func (l *Login) renderMFAPrompt(w http.ResponseWriter, r *http.Request, authReq } if mfaPromptData == nil { - l.renderError(w, r, authReq, caos_errs.ThrowPreconditionFailed(nil, "APP-XU0tj", "Errors.User.MFA.NoProviders")) + l.renderError(w, r, authReq, zerrors.ThrowPreconditionFailed(nil, "APP-XU0tj", "Errors.User.MFA.NoProviders")) return } @@ -93,7 +92,7 @@ func (l *Login) handleMFACreation(w http.ResponseWriter, r *http.Request, authRe l.renderRegisterU2F(w, r, authReq, nil) return } - l.renderError(w, r, authReq, caos_errs.ThrowPreconditionFailed(nil, "APP-Or3HO", "Errors.User.MFA.NoProviders")) + l.renderError(w, r, authReq, zerrors.ThrowPreconditionFailed(nil, "APP-Or3HO", "Errors.User.MFA.NoProviders")) } func (l *Login) handleTOTPCreation(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest, data *mfaVerifyData) { diff --git a/internal/api/ui/login/password_reset_handler.go b/internal/api/ui/login/password_reset_handler.go index 9cadc583f..ad5782db5 100644 --- a/internal/api/ui/login/password_reset_handler.go +++ b/internal/api/ui/login/password_reset_handler.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -19,7 +19,7 @@ func (l *Login) handlePasswordReset(w http.ResponseWriter, r *http.Request) { } user, err := l.query.GetUserByLoginName(setContext(r.Context(), authReq.UserOrgID), true, authReq.LoginName) if err != nil { - if authReq.LoginPolicy.IgnoreUnknownUsernames && errors.IsNotFound(err) { + if authReq.LoginPolicy.IgnoreUnknownUsernames && zerrors.IsNotFound(err) { err = nil } l.renderPasswordResetDone(w, r, authReq, err) @@ -27,7 +27,7 @@ func (l *Login) handlePasswordReset(w http.ResponseWriter, r *http.Request) { } passwordCodeGenerator, err := l.query.InitEncryptionGenerator(r.Context(), domain.SecretGeneratorTypePasswordResetCode, l.userCodeAlg) if err != nil { - if authReq.LoginPolicy.IgnoreUnknownUsernames && errors.IsNotFound(err) { + if authReq.LoginPolicy.IgnoreUnknownUsernames && zerrors.IsNotFound(err) { err = nil } l.renderPasswordResetDone(w, r, authReq, err) diff --git a/internal/api/ui/login/register_handler.go b/internal/api/ui/login/register_handler.go index 99ce94b3d..8fed0d46e 100644 --- a/internal/api/ui/login/register_handler.go +++ b/internal/api/ui/login/register_handler.go @@ -8,7 +8,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -57,7 +57,7 @@ func (l *Login) handleRegisterCheck(w http.ResponseWriter, r *http.Request) { return } if data.Password != data.Password2 { - err := caos_errs.ThrowInvalidArgument(nil, "VIEW-KaGue", "Errors.User.Password.ConfirmationWrong") + err := zerrors.ThrowInvalidArgument(nil, "VIEW-KaGue", "Errors.User.Password.ConfirmationWrong") l.renderRegister(w, r, authRequest, data, err) return } diff --git a/internal/api/ui/login/register_org_handler.go b/internal/api/ui/login/register_org_handler.go index fbea67784..0243a3756 100644 --- a/internal/api/ui/login/register_org_handler.go +++ b/internal/api/ui/login/register_org_handler.go @@ -6,7 +6,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -73,7 +73,7 @@ func (l *Login) handleRegisterOrgCheck(w http.ResponseWriter, r *http.Request) { return } if data.Password != data.Password2 { - err := caos_errs.ThrowInvalidArgument(nil, "VIEW-KaGue", "Errors.User.Password.ConfirmationWrong") + err := zerrors.ThrowInvalidArgument(nil, "VIEW-KaGue", "Errors.User.Password.ConfirmationWrong") l.renderRegisterOrg(w, r, authRequest, data, err) return } diff --git a/internal/api/ui/login/renderer.go b/internal/api/ui/login/renderer.go index a50ed2d4e..c5f6bd50e 100644 --- a/internal/api/ui/login/renderer.go +++ b/internal/api/ui/login/renderer.go @@ -16,12 +16,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/notification/templates" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/renderer" "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -247,7 +247,7 @@ func CreateRenderer(pathPrefix string, staticStorage static.Storage, cookieName func (l *Login) renderNextStep(w http.ResponseWriter, r *http.Request, authReq *domain.AuthRequest) { if authReq == nil { - l.renderInternalError(w, r, nil, caos_errs.ThrowInvalidArgument(nil, "LOGIN-Df3f2", "Errors.AuthRequest.NotFound")) + l.renderInternalError(w, r, nil, zerrors.ThrowInvalidArgument(nil, "LOGIN-Df3f2", "Errors.AuthRequest.NotFound")) return } authReq, err := l.authRepo.AuthRequestByID(r.Context(), authReq.ID, authReq.AgentID) @@ -256,7 +256,7 @@ func (l *Login) renderNextStep(w http.ResponseWriter, r *http.Request, authReq * return } if len(authReq.PossibleSteps) == 0 { - l.renderInternalError(w, r, authReq, caos_errs.ThrowInternal(nil, "APP-9sdp4", "no possible steps")) + l.renderInternalError(w, r, authReq, zerrors.ThrowInternal(nil, "APP-9sdp4", "no possible steps")) return } l.chooseNextStep(w, r, authReq, 0, nil) @@ -268,7 +268,7 @@ func (l *Login) renderError(w http.ResponseWriter, r *http.Request, authReq *dom return } if authReq == nil || len(authReq.PossibleSteps) == 0 { - l.renderInternalError(w, r, authReq, caos_errs.ThrowInternal(err, "APP-OVOiT", "no possible steps")) + l.renderInternalError(w, r, authReq, zerrors.ThrowInternal(err, "APP-OVOiT", "no possible steps")) return } l.chooseNextStep(w, r, authReq, 0, err) @@ -323,11 +323,11 @@ func (l *Login) chooseNextStep(w http.ResponseWriter, r *http.Request, authReq * case *domain.ExternalLoginStep: l.handleExternalLoginStep(w, r, authReq, step.SelectedIDPConfigID) case *domain.GrantRequiredStep: - l.renderInternalError(w, r, authReq, caos_errs.ThrowPreconditionFailed(nil, "APP-asb43", "Errors.User.GrantRequired")) + l.renderInternalError(w, r, authReq, zerrors.ThrowPreconditionFailed(nil, "APP-asb43", "Errors.User.GrantRequired")) case *domain.ProjectRequiredStep: - l.renderInternalError(w, r, authReq, caos_errs.ThrowPreconditionFailed(nil, "APP-m92d", "Errors.User.ProjectRequired")) + l.renderInternalError(w, r, authReq, zerrors.ThrowPreconditionFailed(nil, "APP-m92d", "Errors.User.ProjectRequired")) default: - l.renderInternalError(w, r, authReq, caos_errs.ThrowInternal(nil, "APP-ds3QF", "step no possible")) + l.renderInternalError(w, r, authReq, zerrors.ThrowInternal(nil, "APP-ds3QF", "step no possible")) } } @@ -470,7 +470,7 @@ func (l *Login) setLinksOnBaseData(baseData baseData, privacyPolicy *domain.Priv } func (l *Login) getErrorMessage(r *http.Request, err error) (errID, errMsg string) { - caosErr := new(caos_errs.CaosError) + caosErr := new(zerrors.ZitadelError) if errors.As(err, &caosErr) { localized := l.renderer.LocalizeFromRequest(l.getTranslator(r.Context(), nil), r, caosErr.Message, nil) return caosErr.ID, localized diff --git a/internal/auth/repository/eventsourcing/eventstore/auth_request.go b/internal/auth/repository/eventsourcing/eventstore/auth_request.go index 5da4dcee6..5f5dbd083 100644 --- a/internal/auth/repository/eventsourcing/eventstore/auth_request.go +++ b/internal/auth/repository/eventsourcing/eventstore/auth_request.go @@ -14,7 +14,6 @@ import ( "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" @@ -23,6 +22,7 @@ import ( "github.com/zitadel/zitadel/internal/telemetry/tracing" user_model "github.com/zitadel/zitadel/internal/user/model" user_view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const unknownUserID = "UNKNOWN" @@ -262,7 +262,7 @@ func (repo *AuthRequestRepo) CheckExternalUserLogin(ctx context.Context, authReq return err } err = repo.checkExternalUserLogin(ctx, request, externalUser.IDPConfigID, externalUser.ExternalUserID) - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { // clear potential user information (e.g. when username was entered but another external user was returned) request.SetUserInfo("", "", "", "", "", request.UserOrgID) // in case the check was done with an ID, that was retrieved by a session that allows migration, @@ -328,7 +328,7 @@ func (repo *AuthRequestRepo) SelectUser(ctx context.Context, id, userID, userAge return err } if request.RequestedOrgID != "" && request.RequestedOrgID != user.ResourceOwner { - return errors.ThrowPreconditionFailed(nil, "EVENT-fJe2a", "Errors.User.NotAllowedOrg") + return zerrors.ThrowPreconditionFailed(nil, "EVENT-fJe2a", "Errors.User.NotAllowedOrg") } username := user.UserName if request.RequestedOrgID == "" { @@ -344,7 +344,7 @@ func (repo *AuthRequestRepo) VerifyPassword(ctx context.Context, authReqID, user request, err := repo.getAuthRequestEnsureUser(ctx, authReqID, userAgentID, userID) if err != nil { if isIgnoreUserNotFoundError(err, request) { - return errors.ThrowInvalidArgument(nil, "EVENT-SDe2f", "Errors.User.UsernameOrPassword.Invalid") + return zerrors.ThrowInvalidArgument(nil, "EVENT-SDe2f", "Errors.User.UsernameOrPassword.Invalid") } return err } @@ -354,17 +354,17 @@ func (repo *AuthRequestRepo) VerifyPassword(ctx context.Context, authReqID, user } err = repo.Command.HumanCheckPassword(ctx, resourceOwner, userID, password, request.WithCurrentInfo(info), lockoutPolicyToDomain(policy)) if isIgnoreUserInvalidPasswordError(err, request) { - return errors.ThrowInvalidArgument(nil, "EVENT-Jsf32", "Errors.User.UsernameOrPassword.Invalid") + return zerrors.ThrowInvalidArgument(nil, "EVENT-Jsf32", "Errors.User.UsernameOrPassword.Invalid") } return err } func isIgnoreUserNotFoundError(err error, request *domain.AuthRequest) bool { - return request != nil && request.LoginPolicy != nil && request.LoginPolicy.IgnoreUnknownUsernames && errors.IsNotFound(err) && errors.Contains(err, "Errors.User.NotFound") + return request != nil && request.LoginPolicy != nil && request.LoginPolicy.IgnoreUnknownUsernames && zerrors.IsNotFound(err) && zerrors.Contains(err, "Errors.User.NotFound") } func isIgnoreUserInvalidPasswordError(err error, request *domain.AuthRequest) bool { - return request != nil && request.LoginPolicy != nil && request.LoginPolicy.IgnoreUnknownUsernames && errors.IsErrorInvalidArgument(err) && errors.Contains(err, "Errors.User.Password.Invalid") + return request != nil && request.LoginPolicy != nil && request.LoginPolicy.IgnoreUnknownUsernames && zerrors.IsErrorInvalidArgument(err) && zerrors.Contains(err, "Errors.User.Password.Invalid") } func lockoutPolicyToDomain(policy *query.LockoutPolicy) *domain.LockoutPolicy { @@ -613,7 +613,7 @@ func (repo *AuthRequestRepo) getAuthRequestEnsureUser(ctx context.Context, authR } } if request.UserID != userID { - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-GBH32", "Errors.User.NotMatchingUserID") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-GBH32", "Errors.User.NotMatchingUserID") } _, err = activeUserByID(ctx, repo.UserViewProvider, repo.UserEventProvider, repo.OrgViewProvider, repo.LockoutPolicyViewProvider, request.UserID, false) if err != nil { @@ -631,7 +631,7 @@ func (repo *AuthRequestRepo) getAuthRequest(ctx context.Context, id, userAgentID return nil, err } if request.AgentID != userAgentID { - return nil, errors.ThrowPermissionDenied(nil, "EVENT-adk13", "Errors.AuthRequest.UserAgentNotCorresponding") + return nil, zerrors.ThrowPermissionDenied(nil, "EVENT-adk13", "Errors.AuthRequest.UserAgentNotCorresponding") } err = repo.fillPolicies(ctx, request) if err != nil { @@ -743,7 +743,7 @@ func (repo *AuthRequestRepo) checkLoginName(ctx context.Context, request *domain user, err = repo.checkLoginNameInput(ctx, request, preferredLoginName) } // return any error apart from not found ones directly - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } // if there's an active (human) user, let's use it @@ -759,11 +759,11 @@ func (repo *AuthRequestRepo) checkLoginName(ctx context.Context, request *domain } // let's once again check if the user was just inactive if user != nil && user.State == int32(domain.UserStateInactive) { - return errors.ThrowPreconditionFailed(nil, "AUTH-2n8fs", "Errors.User.Inactive") + return zerrors.ThrowPreconditionFailed(nil, "AUTH-2n8fs", "Errors.User.Inactive") } // or locked if user != nil && user.State == int32(domain.UserStateLocked) { - return errors.ThrowPreconditionFailed(nil, "AUTH-SF3gb", "Errors.User.Locked") + return zerrors.ThrowPreconditionFailed(nil, "AUTH-SF3gb", "Errors.User.Locked") } // let's just check if unknown usernames are ignored if request.LoginPolicy != nil && request.LoginPolicy.IgnoreUnknownUsernames { @@ -780,11 +780,11 @@ func (repo *AuthRequestRepo) checkLoginName(ctx context.Context, request *domain } // let's check if it was a machine user if !user.MachineView.IsZero() { - return errors.ThrowPreconditionFailed(nil, "AUTH-DGV4g", "Errors.User.NotHuman") + return zerrors.ThrowPreconditionFailed(nil, "AUTH-DGV4g", "Errors.User.NotHuman") } // everything should be handled by now logging.WithFields("authRequest", request.ID, "loginName", loginName).Error("unhandled state for checkLoginName") - return errors.ThrowInternal(nil, "AUTH-asf3df", "Errors.Internal") + return zerrors.ThrowInternal(nil, "AUTH-asf3df", "Errors.Internal") } func (repo *AuthRequestRepo) checkDomainDiscovery(ctx context.Context, request *domain.AuthRequest, loginName string) (bool, error) { @@ -889,12 +889,12 @@ func (repo *AuthRequestRepo) checkLoginPolicyWithResourceOwner(ctx context.Conte return err } if len(request.LinkingUsers) != 0 && !loginPolicy.AllowExternalIDPs { - return errors.ThrowInvalidArgument(nil, "LOGIN-s9sio", "Errors.User.NotAllowedToLink") + return zerrors.ThrowInvalidArgument(nil, "LOGIN-s9sio", "Errors.User.NotAllowedToLink") } if len(request.LinkingUsers) != 0 { exists := linkingIDPConfigExistingInAllowedIDPs(request.LinkingUsers, idpProviders) if !exists { - return errors.ThrowInvalidArgument(nil, "LOGIN-Dj89o", "Errors.User.NotAllowedToLink") + return zerrors.ThrowInvalidArgument(nil, "LOGIN-Dj89o", "Errors.User.NotAllowedToLink") } } request.LoginPolicy = queryLoginPolicyToDomain(loginPolicy) @@ -941,7 +941,7 @@ func (repo *AuthRequestRepo) checkSelectedExternalIDP(request *domain.AuthReques return nil } } - return errors.ThrowNotFound(nil, "LOGIN-Nsm8r", "Errors.User.ExternalIDP.NotAllowed") + return zerrors.ThrowNotFound(nil, "LOGIN-Nsm8r", "Errors.User.ExternalIDP.NotAllowed") } func (repo *AuthRequestRepo) checkExternalUserLogin(ctx context.Context, request *domain.AuthRequest, idpConfigID, externalUserID string) (err error) { @@ -968,7 +968,7 @@ func (repo *AuthRequestRepo) checkExternalUserLogin(ctx context.Context, request return err } if len(links.Links) != 1 { - return errors.ThrowNotFound(nil, "AUTH-Sf8sd", "Errors.ExternalIDP.NotFound") + return zerrors.ThrowNotFound(nil, "AUTH-Sf8sd", "Errors.ExternalIDP.NotFound") } user, err := activeUserByID(ctx, repo.UserViewProvider, repo.UserEventProvider, repo.OrgViewProvider, repo.LockoutPolicyViewProvider, links.Links[0].UserID, false) if err != nil { @@ -988,7 +988,7 @@ func (repo *AuthRequestRepo) nextSteps(ctx context.Context, request *domain.Auth defer func() { span.EndWithError(err) }() if request == nil { - return nil, errors.ThrowInvalidArgument(nil, "EVENT-ds27a", "Errors.Internal") + return nil, zerrors.ThrowInvalidArgument(nil, "EVENT-ds27a", "Errors.Internal") } steps = make([]domain.NextStep, 0) if !checkLoggedIn && domain.IsPrompt(request.Prompt, domain.PromptNone) { @@ -1216,7 +1216,7 @@ func (repo *AuthRequestRepo) mfaChecked(userSession *user_model.UserSessionView, if promptRequired || !repo.mfaSkippedOrSetUp(user, request) { types := user.MFATypesSetupPossible(mfaLevel, request.LoginPolicy) if promptRequired && len(types) == 0 { - return nil, false, errors.ThrowPreconditionFailed(nil, "LOGIN-5Hm8s", "Errors.Login.LoginPolicy.MFA.ForceAndNotConfigured") + return nil, false, zerrors.ThrowPreconditionFailed(nil, "LOGIN-5Hm8s", "Errors.Login.LoginPolicy.MFA.ForceAndNotConfigured") } if len(types) == 0 { return nil, true, nil @@ -1265,7 +1265,7 @@ func (repo *AuthRequestRepo) mfaSkippedOrSetUp(user *user_model.UserView, reques func (repo *AuthRequestRepo) GetPrivacyPolicy(ctx context.Context, orgID string) (*domain.PrivacyPolicy, error) { policy, err := repo.PrivacyPolicyProvider.PrivacyPolicyByOrg(ctx, false, orgID, false) - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { return new(domain.PrivacyPolicy), nil } if err != nil { @@ -1460,7 +1460,7 @@ func userSessionByIDs(ctx context.Context, provider userSessionViewProvider, eve instanceID := authz.GetInstance(ctx).InstanceID() session, err := provider.UserSessionByIDs(agentID, user.ID, instanceID) if err != nil { - if !errors.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return nil, err } sequence, err := provider.GetLatestUserSessionSequence(ctx, instanceID) @@ -1506,7 +1506,7 @@ func userSessionByIDs(ctx context.Context, provider userSessionViewProvider, eve continue } case user_repo.UserRemovedType: - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-dG2fe", "Errors.User.NotActive") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-dG2fe", "Errors.User.NotActive") } err := sessionCopy.AppendEvent(event) logging.WithFields("traceID", tracing.TraceIDFromCtx(ctx)).OnError(err).Warn("error appending event") @@ -1518,7 +1518,7 @@ func activeUserByID(ctx context.Context, userViewProvider userViewProvider, user // PLANNED: Check LockoutPolicy user, err = userByID(ctx, userViewProvider, userEventProvider, userID) if err != nil { - if ignoreUnknownUsernames && errors.IsNotFound(err) { + if ignoreUnknownUsernames && zerrors.IsNotFound(err) { return &user_model.UserView{ ID: userID, HumanView: &user_model.HumanView{}, @@ -1528,20 +1528,20 @@ func activeUserByID(ctx context.Context, userViewProvider userViewProvider, user } if user.HumanView == nil { - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-Lm69x", "Errors.User.NotHuman") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-Lm69x", "Errors.User.NotHuman") } if user.State == user_model.UserStateLocked || user.State == user_model.UserStateSuspend { - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-FJ262", "Errors.User.Locked") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-FJ262", "Errors.User.Locked") } if !(user.State == user_model.UserStateActive || user.State == user_model.UserStateInitial) { - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-FJ262", "Errors.User.NotActive") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-FJ262", "Errors.User.NotActive") } org, err := queries.OrgByID(ctx, false, user.ResourceOwner) if err != nil { return nil, err } if org.State != domain.OrgStateActive { - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-Zws3s", "Errors.User.NotActive") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-Zws3s", "Errors.User.NotActive") } return user, nil } @@ -1551,7 +1551,7 @@ func userByID(ctx context.Context, viewProvider userViewProvider, eventProvider defer func() { span.EndWithError(err) }() user, viewErr := viewProvider.UserByID(userID, authz.GetInstance(ctx).InstanceID()) - if viewErr != nil && !errors.IsNotFound(viewErr) { + if viewErr != nil && !zerrors.IsNotFound(viewErr) { return nil, viewErr } else if user == nil { user = new(user_view_model.UserView) @@ -1574,7 +1574,7 @@ func userByID(ctx context.Context, viewProvider userViewProvider, eventProvider } } if userCopy.State == int32(user_model.UserStateDeleted) { - return nil, errors.ThrowNotFound(nil, "EVENT-3F9so", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "EVENT-3F9so", "Errors.User.NotFound") } return user_view_model.UserToModel(&userCopy), nil } @@ -1622,7 +1622,7 @@ func userGrantRequired(ctx context.Context, request *domain.AuthRequest, user *u return false, err } default: - return false, errors.ThrowPreconditionFailed(nil, "EVENT-dfrw2", "Errors.AuthRequest.RequestTypeNotSupported") + return false, zerrors.ThrowPreconditionFailed(nil, "EVENT-dfrw2", "Errors.AuthRequest.RequestTypeNotSupported") } if !project.ProjectRoleCheck { return false, nil @@ -1643,7 +1643,7 @@ func projectRequired(ctx context.Context, request *domain.AuthRequest, projectPr return false, err } default: - return false, errors.ThrowPreconditionFailed(nil, "EVENT-ku4He", "Errors.AuthRequest.RequestTypeNotSupported") + return false, zerrors.ThrowPreconditionFailed(nil, "EVENT-ku4He", "Errors.AuthRequest.RequestTypeNotSupported") } // if the user and project are part of the same organisation we do not need to check if the project exists on that org if !project.HasProjectCheck || project.ResourceOwner == request.UserOrgID { diff --git a/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go b/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go index 08d0cd56d..e57fb9c7d 100644 --- a/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go +++ b/internal/auth/repository/eventsourcing/eventstore/auth_request_test.go @@ -14,7 +14,6 @@ import ( "github.com/zitadel/zitadel/internal/auth_request/repository/mock" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/query" @@ -22,6 +21,7 @@ import ( user_model "github.com/zitadel/zitadel/internal/user/model" user_es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" user_view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -31,7 +31,7 @@ var ( type mockViewNoUserSession struct{} func (m *mockViewNoUserSession) UserSessionByIDs(string, string, string) (*user_view_model.UserSessionView, error) { - return nil, errors.ThrowNotFound(nil, "id", "user session not found") + return nil, zerrors.ThrowNotFound(nil, "id", "user session not found") } func (m *mockViewNoUserSession) UserSessionsByAgentID(string, string) ([]*user_view_model.UserSessionView, error) { @@ -45,11 +45,11 @@ func (m *mockViewNoUserSession) GetLatestUserSessionSequence(ctx context.Context type mockViewErrUserSession struct{} func (m *mockViewErrUserSession) UserSessionByIDs(string, string, string) (*user_view_model.UserSessionView, error) { - return nil, errors.ThrowInternal(nil, "id", "internal error") + return nil, zerrors.ThrowInternal(nil, "id", "internal error") } func (m *mockViewErrUserSession) UserSessionsByAgentID(string, string) ([]*user_view_model.UserSessionView, error) { - return nil, errors.ThrowInternal(nil, "id", "internal error") + return nil, zerrors.ThrowInternal(nil, "id", "internal error") } func (m *mockViewErrUserSession) GetLatestUserSessionSequence(ctx context.Context, instanceID string) (*query.CurrentState, error) { @@ -102,7 +102,7 @@ func (m *mockViewUserSession) GetLatestUserSessionSequence(ctx context.Context, type mockViewNoUser struct{} func (m *mockViewNoUser) UserByID(string, string) (*user_view_model.UserView, error) { - return nil, errors.ThrowNotFound(nil, "id", "user not found") + return nil, zerrors.ThrowNotFound(nil, "id", "user not found") } type mockEventUser struct { @@ -127,11 +127,11 @@ func (m *mockEventUser) BulkAddExternalIDPs(ctx context.Context, userID string, type mockEventErrUser struct{} func (m *mockEventErrUser) UserEventsByID(ctx context.Context, id string, sequence uint64, types []eventstore.EventType) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "id", "internal error") + return nil, zerrors.ThrowInternal(nil, "id", "internal error") } func (m *mockEventErrUser) BulkAddExternalIDPs(ctx context.Context, userID string, externalIDPs []*user_model.ExternalIDP) error { - return errors.ThrowInternal(nil, "id", "internal error") + return zerrors.ThrowInternal(nil, "id", "internal error") } type mockViewUser struct { @@ -226,11 +226,11 @@ func (m *mockViewOrg) OrgByPrimaryDomain(context.Context, string) (*query.Org, e type mockViewErrOrg struct{} func (m *mockViewErrOrg) OrgByID(context.Context, bool, string) (*query.Org, error) { - return nil, errors.ThrowInternal(nil, "id", "internal error") + return nil, zerrors.ThrowInternal(nil, "id", "internal error") } func (m *mockViewErrOrg) OrgByPrimaryDomain(context.Context, string) (*query.Org, error) { - return nil, errors.ThrowInternal(nil, "id", "internal error") + return nil, zerrors.ThrowInternal(nil, "id", "internal error") } type mockUserGrants struct { @@ -276,7 +276,7 @@ func (m *mockApp) AppByOIDCClientID(ctx context.Context, id string) (*query.App, if m.app != nil { return m.app, nil } - return nil, errors.ThrowNotFound(nil, "ERROR", "error") + return nil, zerrors.ThrowNotFound(nil, "ERROR", "error") } type mockIDPUserLinks struct { @@ -321,7 +321,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) { fields{}, args{nil, false}, nil, - errors.IsErrorInvalidArgument, + zerrors.IsErrorInvalidArgument, }, { "prompt none and checkLoggedIn false, callback step", @@ -386,7 +386,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) { }, args{&domain.AuthRequest{Prompt: []domain.Prompt{domain.PromptSelectAccount}}, false}, nil, - errors.IsInternal, + zerrors.IsInternal, }, { "user not set, prompt select account, select account step", @@ -666,7 +666,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) { }, args{&domain.AuthRequest{UserID: "UserID", LoginPolicy: &domain.LoginPolicy{}}, false}, nil, - errors.IsNotFound, + zerrors.IsNotFound, }, { "user not active, precondition failed error", @@ -688,7 +688,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) { }, args{&domain.AuthRequest{UserID: "UserID", LoginPolicy: &domain.LoginPolicy{}}, false}, nil, - errors.IsPreconditionFailed, + zerrors.IsPreconditionFailed, }, { "user locked, precondition failed error", @@ -709,7 +709,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) { }, args{&domain.AuthRequest{UserID: "UserID", LoginPolicy: &domain.LoginPolicy{}}, false}, nil, - errors.IsPreconditionFailed, + zerrors.IsPreconditionFailed, }, { "org error, internal error", @@ -725,7 +725,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) { }, args{&domain.AuthRequest{UserID: "UserID", LoginPolicy: &domain.LoginPolicy{}}, false}, nil, - errors.IsInternal, + zerrors.IsInternal, }, { "org not active, precondition failed error", @@ -741,7 +741,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) { }, args{&domain.AuthRequest{UserID: "UserID", LoginPolicy: &domain.LoginPolicy{}}, false}, nil, - errors.IsPreconditionFailed, + zerrors.IsPreconditionFailed, }, { "usersession not found, new user session, password step", @@ -779,7 +779,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) { }, args{&domain.AuthRequest{UserID: "UserID", LoginPolicy: &domain.LoginPolicy{}}, false}, nil, - errors.IsInternal, + zerrors.IsInternal, }, { "user not initialized, init user step", @@ -1716,7 +1716,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) { }, nil, false, - errors.IsPreconditionFailed, + zerrors.IsPreconditionFailed, }, { "not set up, no mfas configured, no prompt and true", @@ -2073,7 +2073,7 @@ func Test_userSessionByIDs(t *testing.T) { user: &user_model.UserView{ID: "id"}, }, nil, - errors.IsInternal, + zerrors.IsInternal, }, { "error user events, old view model state", @@ -2184,7 +2184,7 @@ func Test_userSessionByIDs(t *testing.T) { }, }, nil, - errors.IsPreconditionFailed, + zerrors.IsPreconditionFailed, }, } for _, tt := range tests { @@ -2220,7 +2220,7 @@ func Test_userByID(t *testing.T) { eventProvider: &mockEventUser{}, }, nil, - errors.IsNotFound, + zerrors.IsNotFound, }, { "error user events, old view model state", diff --git a/internal/auth/repository/eventsourcing/eventstore/refresh_token.go b/internal/auth/repository/eventsourcing/eventstore/refresh_token.go index 39c5e441d..36808d7c6 100644 --- a/internal/auth/repository/eventsourcing/eventstore/refresh_token.go +++ b/internal/auth/repository/eventsourcing/eventstore/refresh_token.go @@ -10,12 +10,12 @@ import ( "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/telemetry/tracing" usr_model "github.com/zitadel/zitadel/internal/user/model" usr_view "github.com/zitadel/zitadel/internal/user/repository/view" "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type RefreshTokenRepo struct { @@ -35,7 +35,7 @@ func (r *RefreshTokenRepo) RefreshTokenByToken(ctx context.Context, refreshToken return nil, err } if tokenView.Token != token { - return nil, errors.ThrowNotFound(nil, "EVENT-5Bm9s", "Errors.User.RefreshToken.Invalid") + return nil, zerrors.ThrowNotFound(nil, "EVENT-5Bm9s", "Errors.User.RefreshToken.Invalid") } return tokenView, nil } @@ -43,10 +43,10 @@ func (r *RefreshTokenRepo) RefreshTokenByToken(ctx context.Context, refreshToken func (r *RefreshTokenRepo) RefreshTokenByID(ctx context.Context, tokenID, userID string) (*usr_model.RefreshTokenView, error) { instanceID := authz.GetInstance(ctx).InstanceID() tokenView, viewErr := r.View.RefreshTokenByID(tokenID, instanceID) - if viewErr != nil && !errors.IsNotFound(viewErr) { + if viewErr != nil && !zerrors.IsNotFound(viewErr) { return nil, viewErr } - if errors.IsNotFound(viewErr) { + if zerrors.IsNotFound(viewErr) { sequence, err := r.View.GetLatestRefreshTokenSequence(ctx) logging.WithFields("instanceID", instanceID, "userID", userID, "tokenID", tokenID). OnError(err). @@ -62,8 +62,8 @@ func (r *RefreshTokenRepo) RefreshTokenByID(ctx context.Context, tokenID, userID } events, esErr := r.getUserEvents(ctx, userID, tokenView.InstanceID, tokenView.Sequence, tokenView.GetRelevantEventTypes()) - if errors.IsNotFound(viewErr) && len(events) == 0 { - return nil, errors.ThrowNotFound(nil, "EVENT-BHB52", "Errors.User.RefreshToken.Invalid") + if zerrors.IsNotFound(viewErr) && len(events) == 0 { + return nil, zerrors.ThrowNotFound(nil, "EVENT-BHB52", "Errors.User.RefreshToken.Invalid") } if esErr != nil { @@ -78,7 +78,7 @@ func (r *RefreshTokenRepo) RefreshTokenByID(ctx context.Context, tokenID, userID } } if !tokenView.Expiration.After(time.Now()) { - return nil, errors.ThrowNotFound(nil, "EVENT-5Bm9s", "Errors.User.RefreshToken.Invalid") + return nil, zerrors.ThrowNotFound(nil, "EVENT-5Bm9s", "Errors.User.RefreshToken.Invalid") } return model.RefreshTokenViewToModel(tokenView), nil } diff --git a/internal/auth/repository/eventsourcing/eventstore/token.go b/internal/auth/repository/eventsourcing/eventstore/token.go index b1af743a7..820ecdba2 100644 --- a/internal/auth/repository/eventsourcing/eventstore/token.go +++ b/internal/auth/repository/eventsourcing/eventstore/token.go @@ -8,12 +8,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/telemetry/tracing" usr_model "github.com/zitadel/zitadel/internal/user/model" usr_view "github.com/zitadel/zitadel/internal/user/repository/view" "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type TokenRepo struct { @@ -25,10 +25,10 @@ func (repo *TokenRepo) TokenByIDs(ctx context.Context, userID, tokenID string) ( instanceID := authz.GetInstance(ctx).InstanceID() token, viewErr := repo.View.TokenByIDs(tokenID, userID, instanceID) - if viewErr != nil && !errors.IsNotFound(viewErr) { + if viewErr != nil && !zerrors.IsNotFound(viewErr) { return nil, viewErr } - if errors.IsNotFound(viewErr) { + if zerrors.IsNotFound(viewErr) { sequence, err := repo.View.GetLatestTokenSequence(ctx, instanceID) logging.WithFields("instanceID", instanceID, "userID", userID, "tokenID", tokenID). OnError(err). @@ -44,8 +44,8 @@ func (repo *TokenRepo) TokenByIDs(ctx context.Context, userID, tokenID string) ( } events, esErr := repo.getUserEvents(ctx, userID, token.InstanceID, token.Sequence, token.GetRelevantEventTypes()) - if errors.IsNotFound(viewErr) && len(events) == 0 { - return nil, errors.ThrowNotFound(nil, "EVENT-4T90g", "Errors.Token.NotFound") + if zerrors.IsNotFound(viewErr) && len(events) == 0 { + return nil, zerrors.ThrowNotFound(nil, "EVENT-4T90g", "Errors.Token.NotFound") } if esErr != nil { @@ -60,7 +60,7 @@ func (repo *TokenRepo) TokenByIDs(ctx context.Context, userID, tokenID string) ( } } if !token.Expiration.After(time.Now().UTC()) || token.Deactivated { - return nil, errors.ThrowNotFound(nil, "EVENT-5Bm9s", "Errors.Token.NotFound") + return nil, zerrors.ThrowNotFound(nil, "EVENT-5Bm9s", "Errors.Token.NotFound") } return model.TokenViewToModel(token), nil } diff --git a/internal/auth/repository/eventsourcing/handler/refresh_token.go b/internal/auth/repository/eventsourcing/handler/refresh_token.go index 5a1b59d49..4dac7eab6 100644 --- a/internal/auth/repository/eventsourcing/handler/refresh_token.go +++ b/internal/auth/repository/eventsourcing/handler/refresh_token.go @@ -6,13 +6,13 @@ import ( "github.com/zitadel/logging" auth_view "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -112,7 +112,7 @@ func (t *RefreshToken) Reduce(event eventstore.Event) (_ *handler.Statement, err e := new(user.HumanRefreshTokenRenewedEvent) if err := event.Unmarshal(e); err != nil { logging.WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(nil, "MODEL-BHn75", "could not unmarshal data") + return zerrors.ThrowInternal(nil, "MODEL-BHn75", "could not unmarshal data") } token, err := t.view.RefreshTokenByID(e.TokenID, event.Aggregate().InstanceID) if err != nil { @@ -127,7 +127,7 @@ func (t *RefreshToken) Reduce(event eventstore.Event) (_ *handler.Statement, err e := new(user.HumanRefreshTokenRemovedEvent) if err := event.Unmarshal(e); err != nil { logging.WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(nil, "MODEL-Bz653", "could not unmarshal data") + return zerrors.ThrowInternal(nil, "MODEL-Bz653", "could not unmarshal data") } return t.view.DeleteRefreshToken(e.TokenID, event.Aggregate().InstanceID) case user.UserLockedType, diff --git a/internal/auth/repository/eventsourcing/handler/token.go b/internal/auth/repository/eventsourcing/handler/token.go index 03827aa44..14641cacd 100644 --- a/internal/auth/repository/eventsourcing/handler/token.go +++ b/internal/auth/repository/eventsourcing/handler/token.go @@ -6,7 +6,6 @@ import ( "github.com/zitadel/logging" auth_view "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" @@ -18,6 +17,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -242,7 +242,7 @@ func agentIDFromSession(event eventstore.Event) (string, error) { session := make(map[string]interface{}) if err := event.Unmarshal(&session); err != nil { logging.WithError(err).Error("could not unmarshal event data") - return "", caos_errs.ThrowInternal(nil, "MODEL-sd325", "could not unmarshal data") + return "", zerrors.ThrowInternal(nil, "MODEL-sd325", "could not unmarshal data") } return session["userAgentID"].(string), nil } @@ -251,7 +251,7 @@ func applicationFromSession(event eventstore.Event) (*project_es_model.Applicati application := new(project_es_model.Application) if err := event.Unmarshal(application); err != nil { logging.WithError(err).Error("could not unmarshal event data") - return nil, caos_errs.ThrowInternal(nil, "MODEL-Hrw1q", "could not unmarshal data") + return nil, zerrors.ThrowInternal(nil, "MODEL-Hrw1q", "could not unmarshal data") } return application, nil } @@ -260,7 +260,7 @@ func tokenIDFromRemovedEvent(event eventstore.Event) (string, error) { removed := make(map[string]interface{}) if err := event.Unmarshal(&removed); err != nil { logging.WithError(err).Error("could not unmarshal event data") - return "", caos_errs.ThrowInternal(nil, "MODEL-Sff32", "could not unmarshal data") + return "", zerrors.ThrowInternal(nil, "MODEL-Sff32", "could not unmarshal data") } return removed["tokenId"].(string), nil } @@ -269,7 +269,7 @@ func refreshTokenIDFromRemovedEvent(event eventstore.Event) (string, error) { removed := make(map[string]interface{}) if err := event.Unmarshal(&removed); err != nil { logging.WithError(err).Error("could not unmarshal event data") - return "", caos_errs.ThrowInternal(nil, "MODEL-Dfb3w", "could not unmarshal data") + return "", zerrors.ThrowInternal(nil, "MODEL-Dfb3w", "could not unmarshal data") } return removed["tokenId"].(string), nil } @@ -293,7 +293,7 @@ func (t *Token) getProjectByID(ctx context.Context, projID, instanceID string) ( } if esProject.Sequence == 0 { - return nil, caos_errs.ThrowNotFound(nil, "EVENT-Dsdw2", "Errors.Project.NotFound") + return nil, zerrors.ThrowNotFound(nil, "EVENT-Dsdw2", "Errors.Project.NotFound") } return project_es_model.ProjectToModel(esProject), nil } diff --git a/internal/auth/repository/eventsourcing/handler/user.go b/internal/auth/repository/eventsourcing/handler/user.go index 46e60ff30..90fd37d80 100644 --- a/internal/auth/repository/eventsourcing/handler/user.go +++ b/internal/auth/repository/eventsourcing/handler/user.go @@ -5,7 +5,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" auth_view "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" @@ -18,6 +17,7 @@ import ( user_repo "github.com/zitadel/zitadel/internal/repository/user" usr_view "github.com/zitadel/zitadel/internal/user/repository/view" view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -388,7 +388,7 @@ func (u *User) ProcessUser(event eventstore.Event) (_ *handler.Statement, err er user_repo.HumanPasswordlessInitCodeRequestedType: user, err = u.view.UserByID(event.Aggregate().ID, event.Aggregate().InstanceID) if err != nil { - if !errors.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return err } user, err = u.userFromEventstore(event.Aggregate(), user.EventTypes()) @@ -401,7 +401,7 @@ func (u *User) ProcessUser(event eventstore.Event) (_ *handler.Statement, err er user_repo.UserUserNameChangedType: user, err = u.view.UserByID(event.Aggregate().ID, event.Aggregate().InstanceID) if err != nil { - if !errors.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return err } user, err = u.userFromEventstore(event.Aggregate(), user.EventTypes()) @@ -520,7 +520,7 @@ func (u *User) getOrgByID(ctx context.Context, orgID, instanceID string) (*org_m return nil, err } if esOrg.Sequence == 0 { - return nil, errors.ThrowNotFound(nil, "EVENT-3m9vs", "Errors.Org.NotFound") + return nil, zerrors.ThrowNotFound(nil, "EVENT-3m9vs", "Errors.Org.NotFound") } return org_es_model.OrgToModel(esOrg), nil diff --git a/internal/auth/repository/eventsourcing/handler/user_session.go b/internal/auth/repository/eventsourcing/handler/user_session.go index a9cefccca..65d1facf5 100644 --- a/internal/auth/repository/eventsourcing/handler/user_session.go +++ b/internal/auth/repository/eventsourcing/handler/user_session.go @@ -6,7 +6,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" auth_view "github.com/zitadel/zitadel/internal/auth/repository/eventsourcing/view" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/eventstore/v1/models" @@ -18,6 +17,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -241,7 +241,7 @@ func (u *UserSession) Reduce(event eventstore.Event) (_ *handler.Statement, err } session, err = u.view.UserSessionByIDs(eventData.UserAgentID, event.Aggregate().ID, event.Aggregate().InstanceID) if err != nil { - if !errors.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return err } session = &view_model.UserSessionView{ @@ -392,7 +392,7 @@ func (u *UserSession) getOrgByID(ctx context.Context, orgID, instanceID string) } if esOrg.Sequence == 0 { - return nil, errors.ThrowNotFound(nil, "EVENT-3m9vs", "Errors.Org.NotFound") + return nil, zerrors.ThrowNotFound(nil, "EVENT-3m9vs", "Errors.Org.NotFound") } return org_es_model.OrgToModel(esOrg), nil } diff --git a/internal/auth/repository/eventsourcing/view/refresh_token.go b/internal/auth/repository/eventsourcing/view/refresh_token.go index 64933bc7c..b45f769cb 100644 --- a/internal/auth/repository/eventsourcing/view/refresh_token.go +++ b/internal/auth/repository/eventsourcing/view/refresh_token.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/api/authz" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/query" user_model "github.com/zitadel/zitadel/internal/user/model" usr_view "github.com/zitadel/zitadel/internal/user/repository/view" "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -39,7 +39,7 @@ func (v *View) PutRefreshTokens(token []*model.RefreshTokenView) error { func (v *View) DeleteRefreshToken(tokenID, instanceID string) error { err := usr_view.DeleteRefreshToken(v.Db, refreshTokenTable, tokenID, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -47,7 +47,7 @@ func (v *View) DeleteRefreshToken(tokenID, instanceID string) error { func (v *View) DeleteUserRefreshTokens(userID, instanceID string) error { err := usr_view.DeleteUserRefreshTokens(v.Db, refreshTokenTable, userID, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -55,7 +55,7 @@ func (v *View) DeleteUserRefreshTokens(userID, instanceID string) error { func (v *View) DeleteApplicationRefreshTokens(event *models.Event, ids ...string) error { err := usr_view.DeleteApplicationTokens(v.Db, refreshTokenTable, event.InstanceID, ids) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -63,7 +63,7 @@ func (v *View) DeleteApplicationRefreshTokens(event *models.Event, ids ...string func (v *View) DeleteInstanceRefreshTokens(instanceID string) error { err := usr_view.DeleteInstanceRefreshTokens(v.Db, refreshTokenTable, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -71,7 +71,7 @@ func (v *View) DeleteInstanceRefreshTokens(instanceID string) error { func (v *View) DeleteOrgRefreshTokens(event eventstore.Event) error { err := usr_view.DeleteOrgRefreshTokens(v.Db, refreshTokenTable, event.Aggregate().InstanceID, event.Aggregate().ResourceOwner) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil diff --git a/internal/auth/repository/eventsourcing/view/token.go b/internal/auth/repository/eventsourcing/view/token.go index 549907d89..b19f5a69a 100644 --- a/internal/auth/repository/eventsourcing/view/token.go +++ b/internal/auth/repository/eventsourcing/view/token.go @@ -3,11 +3,11 @@ package view import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/query" usr_view "github.com/zitadel/zitadel/internal/user/repository/view" "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -32,7 +32,7 @@ func (v *View) PutTokens(token []*model.TokenView) error { func (v *View) DeleteToken(tokenID, instanceID string) error { err := usr_view.DeleteToken(v.Db, tokenTable, tokenID, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -40,7 +40,7 @@ func (v *View) DeleteToken(tokenID, instanceID string) error { func (v *View) DeleteSessionTokens(agentID string, event eventstore.Event) error { err := usr_view.DeleteSessionTokens(v.Db, tokenTable, agentID, event.Aggregate().ID, event.Aggregate().InstanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -48,7 +48,7 @@ func (v *View) DeleteSessionTokens(agentID string, event eventstore.Event) error func (v *View) DeleteUserTokens(event eventstore.Event) error { err := usr_view.DeleteUserTokens(v.Db, tokenTable, event.Aggregate().ID, event.Aggregate().InstanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -56,7 +56,7 @@ func (v *View) DeleteUserTokens(event eventstore.Event) error { func (v *View) DeleteApplicationTokens(event eventstore.Event, ids ...string) error { err := usr_view.DeleteApplicationTokens(v.Db, tokenTable, event.Aggregate().InstanceID, ids) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -64,7 +64,7 @@ func (v *View) DeleteApplicationTokens(event eventstore.Event, ids ...string) er func (v *View) DeleteTokensFromRefreshToken(refreshTokenID, instanceID string) error { err := usr_view.DeleteTokensFromRefreshToken(v.Db, tokenTable, refreshTokenID, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -72,7 +72,7 @@ func (v *View) DeleteTokensFromRefreshToken(refreshTokenID, instanceID string) e func (v *View) DeleteInstanceTokens(event eventstore.Event) error { err := usr_view.DeleteInstanceTokens(v.Db, tokenTable, event.Aggregate().InstanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -80,7 +80,7 @@ func (v *View) DeleteInstanceTokens(event eventstore.Event) error { func (v *View) DeleteOrgTokens(event eventstore.Event) error { err := usr_view.DeleteOrgTokens(v.Db, tokenTable, event.Aggregate().InstanceID, event.Aggregate().ResourceOwner) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil diff --git a/internal/auth/repository/eventsourcing/view/user.go b/internal/auth/repository/eventsourcing/view/user.go index cc8027b03..d2101dcfd 100644 --- a/internal/auth/repository/eventsourcing/view/user.go +++ b/internal/auth/repository/eventsourcing/view/user.go @@ -5,12 +5,12 @@ import ( "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/query" usr_model "github.com/zitadel/zitadel/internal/user/model" "github.com/zitadel/zitadel/internal/user/repository/view" "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -43,7 +43,7 @@ func (v *View) UserByLoginNameAndResourceOwner(ctx context.Context, loginName, r return nil, err } if user.ResourceOwner != resourceOwner { - return nil, errors.ThrowNotFound(nil, "VIEW-qScmi", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "VIEW-qScmi", "Errors.User.NotFound") } return user, nil @@ -98,7 +98,7 @@ func (v *View) userByID(ctx context.Context, instanceID string, queries ...query } user, err := view.UserByID(v.Db, userTable, queriedUser.ID, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return nil, err } @@ -133,7 +133,7 @@ func (v *View) userByID(ctx context.Context, instanceID string, queries ...query } if user.State == int32(usr_model.UserStateDeleted) { - return nil, errors.ThrowNotFound(nil, "VIEW-r4y8r", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "VIEW-r4y8r", "Errors.User.NotFound") } return user, nil @@ -153,7 +153,7 @@ func (v *View) PutUsers(users []*model.UserView, event eventstore.Event) error { func (v *View) DeleteUser(userID, instanceID string, event eventstore.Event) error { err := view.DeleteUser(v.Db, userTable, userID, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -161,7 +161,7 @@ func (v *View) DeleteUser(userID, instanceID string, event eventstore.Event) err func (v *View) DeleteInstanceUsers(event eventstore.Event) error { err := view.DeleteInstanceUsers(v.Db, userTable, event.Aggregate().InstanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -169,7 +169,7 @@ func (v *View) DeleteInstanceUsers(event eventstore.Event) error { func (v *View) UpdateOrgOwnerRemovedUsers(event eventstore.Event) error { err := view.UpdateOrgOwnerRemovedUsers(v.Db, userTable, event.Aggregate().InstanceID, event.Aggregate().ID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil diff --git a/internal/auth/repository/eventsourcing/view/user_session.go b/internal/auth/repository/eventsourcing/view/user_session.go index 5303b0dea..e2e4938d6 100644 --- a/internal/auth/repository/eventsourcing/view/user_session.go +++ b/internal/auth/repository/eventsourcing/view/user_session.go @@ -3,11 +3,11 @@ package view import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/user/repository/view" "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -44,7 +44,7 @@ func (v *View) PutUserSessions(userSession []*model.UserSessionView) error { func (v *View) DeleteUserSessions(userID, instanceID string) error { err := view.DeleteUserSessions(v.Db, userSessionTable, userID, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -52,7 +52,7 @@ func (v *View) DeleteUserSessions(userID, instanceID string) error { func (v *View) DeleteInstanceUserSessions(instanceID string) error { err := view.DeleteInstanceUserSessions(v.Db, userSessionTable, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -60,7 +60,7 @@ func (v *View) DeleteInstanceUserSessions(instanceID string) error { func (v *View) DeleteOrgUserSessions(event eventstore.Event) error { err := view.DeleteOrgUserSessions(v.Db, userSessionTable, event.Aggregate().InstanceID, event.Aggregate().ResourceOwner) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil diff --git a/internal/auth_request/repository/cache/cache.go b/internal/auth_request/repository/cache/cache.go index 10090ef28..63c442ef2 100644 --- a/internal/auth_request/repository/cache/cache.go +++ b/internal/auth_request/repository/cache/cache.go @@ -11,7 +11,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type AuthRequestCache struct { @@ -50,7 +50,7 @@ func (c *AuthRequestCache) UpdateAuthRequest(_ context.Context, request *domain. func (c *AuthRequestCache) DeleteAuthRequest(ctx context.Context, id string) error { _, err := c.client.Exec("DELETE FROM auth.auth_requests WHERE instance_id = $1 and id = $2", authz.GetInstance(ctx).InstanceID(), id) if err != nil { - return caos_errs.ThrowInternal(err, "CACHE-dsHw3", "unable to delete auth request") + return zerrors.ThrowInternal(err, "CACHE-dsHw3", "unable to delete auth request") } return nil } @@ -67,16 +67,16 @@ func (c *AuthRequestCache) getAuthRequest(key, value, instanceID string) (*domai if err != nil { if errors.Is(err, sql.ErrNoRows) { - return nil, caos_errs.ThrowNotFound(err, "CACHE-d24aD", "Errors.AuthRequest.NotFound") + return nil, zerrors.ThrowNotFound(err, "CACHE-d24aD", "Errors.AuthRequest.NotFound") } - return nil, caos_errs.ThrowInternal(err, "CACHE-as3kj", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "CACHE-as3kj", "Errors.Internal") } request, err := domain.NewAuthRequestFromType(requestType) if err == nil { err = json.Unmarshal(b, request) } if err != nil { - return nil, caos_errs.ThrowInternal(err, "CACHE-2wshg", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "CACHE-2wshg", "Errors.Internal") } return request, nil } @@ -84,11 +84,11 @@ func (c *AuthRequestCache) getAuthRequest(key, value, instanceID string) (*domai func (c *AuthRequestCache) saveAuthRequest(request *domain.AuthRequest, query string, date time.Time, param interface{}) error { b, err := json.Marshal(request) if err != nil { - return caos_errs.ThrowInternal(err, "CACHE-os0GH", "Errors.Internal") + return zerrors.ThrowInternal(err, "CACHE-os0GH", "Errors.Internal") } _, err = c.client.Exec(query, request.ID, b, request.InstanceID, date, param) if err != nil { - return caos_errs.ThrowInternal(err, "CACHE-su3GK", "Errors.Internal") + return zerrors.ThrowInternal(err, "CACHE-su3GK", "Errors.Internal") } return nil } diff --git a/internal/authz/repository/eventsourcing/eventstore/token_verifier.go b/internal/authz/repository/eventsourcing/eventstore/token_verifier.go index cac3a908f..80dda8272 100644 --- a/internal/authz/repository/eventsourcing/eventstore/token_verifier.go +++ b/internal/authz/repository/eventsourcing/eventstore/token_verifier.go @@ -18,13 +18,13 @@ import ( "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/telemetry/tracing" usr_model "github.com/zitadel/zitadel/internal/user/model" usr_view "github.com/zitadel/zitadel/internal/user/repository/view" "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type TokenVerifierRepo struct { @@ -53,10 +53,10 @@ func (repo *TokenVerifierRepo) tokenByID(ctx context.Context, tokenID, userID st Errorf("could not get current sequence for token check") token, viewErr := repo.View.TokenByIDs(tokenID, userID, instanceID) - if viewErr != nil && !caos_errs.IsNotFound(viewErr) { + if viewErr != nil && !zerrors.IsNotFound(viewErr) { return nil, viewErr } - if caos_errs.IsNotFound(viewErr) { + if zerrors.IsNotFound(viewErr) { token = new(model.TokenView) token.ID = tokenID token.UserID = userID @@ -66,8 +66,8 @@ func (repo *TokenVerifierRepo) tokenByID(ctx context.Context, tokenID, userID st } events, esErr := repo.getUserEvents(ctx, userID, instanceID, token.Sequence, token.GetRelevantEventTypes()) - if caos_errs.IsNotFound(viewErr) && len(events) == 0 { - return nil, caos_errs.ThrowNotFound(nil, "EVENT-4T90g", "Errors.Token.NotFound") + if zerrors.IsNotFound(viewErr) && len(events) == 0 { + return nil, zerrors.ThrowNotFound(nil, "EVENT-4T90g", "Errors.Token.NotFound") } if esErr != nil { @@ -82,7 +82,7 @@ func (repo *TokenVerifierRepo) tokenByID(ctx context.Context, tokenID, userID st } } if !token.Expiration.After(time.Now().UTC()) || token.Deactivated { - return nil, caos_errs.ThrowNotFound(nil, "EVENT-5Bm9s", "Errors.Token.NotFound") + return nil, zerrors.ThrowNotFound(nil, "EVENT-5Bm9s", "Errors.Token.NotFound") } return model.TokenViewToModel(token), nil } @@ -93,7 +93,7 @@ func (repo *TokenVerifierRepo) VerifyAccessToken(ctx context.Context, tokenStrin tokenID, subject, ok := repo.getTokenIDAndSubject(ctx, tokenString) if !ok { - return "", "", "", "", "", caos_errs.ThrowUnauthenticated(nil, "APP-Reb32", "invalid token") + return "", "", "", "", "", zerrors.ThrowUnauthenticated(nil, "APP-Reb32", "invalid token") } if strings.HasPrefix(tokenID, command.IDPrefixV2) { userID, clientID, resourceOwner, err = repo.verifyAccessTokenV2(ctx, tokenID, verifierClientID, projectID) @@ -114,10 +114,10 @@ func (repo *TokenVerifierRepo) verifyAccessTokenV1(ctx context.Context, tokenID, token, err := repo.tokenByID(ctx, tokenID, subject) tokenSpan.EndWithError(err) if err != nil { - return "", "", "", "", "", caos_errs.ThrowUnauthenticated(err, "APP-BxUSiL", "invalid token") + return "", "", "", "", "", zerrors.ThrowUnauthenticated(err, "APP-BxUSiL", "invalid token") } if !token.Expiration.After(time.Now().UTC()) { - return "", "", "", "", "", caos_errs.ThrowUnauthenticated(err, "APP-k9KS0", "invalid token") + return "", "", "", "", "", zerrors.ThrowUnauthenticated(err, "APP-k9KS0", "invalid token") } if token.IsPAT { return token.UserID, "", "", "", token.ResourceOwner, nil @@ -154,7 +154,7 @@ func (repo *TokenVerifierRepo) verifySessionToken(ctx context.Context, sessionID return "", "", "", err } if !session.Expiration.IsZero() && session.Expiration.Before(time.Now()) { - return "", "", "", caos_errs.ThrowPermissionDenied(nil, "AUTHZ-EGDo3", "session expired") + return "", "", "", zerrors.ThrowPermissionDenied(nil, "AUTHZ-EGDo3", "session expired") } if err = repo.checkAuthentication(ctx, authMethodsFromSession(session), session.UserFactor.UserID); err != nil { return "", "", "", err @@ -166,7 +166,7 @@ func (repo *TokenVerifierRepo) verifySessionToken(ctx context.Context, sessionID // It will also check if there was a multi factor authentication, if either MFA is forced by the login policy or if the user has set up any func (repo *TokenVerifierRepo) checkAuthentication(ctx context.Context, authMethods []domain.UserAuthMethodType, userID string) error { if len(authMethods) == 0 { - return caos_errs.ThrowPermissionDenied(nil, "AUTHZ-Kl3p0", "authentication required") + return zerrors.ThrowPermissionDenied(nil, "AUTHZ-Kl3p0", "authentication required") } if domain.HasMFA(authMethods) { return nil @@ -176,7 +176,7 @@ func (repo *TokenVerifierRepo) checkAuthentication(ctx context.Context, authMeth return err } if domain.RequiresMFA(forceMFA, forceMFALocalOnly, hasIDPAuthentication(authMethods)) || domain.HasMFA(availableAuthMethods) { - return caos_errs.ThrowPermissionDenied(nil, "AUTHZ-Kl3p0", "mfa required") + return zerrors.ThrowPermissionDenied(nil, "AUTHZ-Kl3p0", "mfa required") } return nil } @@ -288,11 +288,11 @@ func (repo *TokenVerifierRepo) jwtTokenVerifier(ctx context.Context) *op.AccessT func (repo *TokenVerifierRepo) decryptAccessToken(token string) (string, error) { tokenData, err := base64.RawURLEncoding.DecodeString(token) if err != nil { - return "", caos_errs.ThrowUnauthenticated(nil, "APP-ASdgg", "invalid token") + return "", zerrors.ThrowUnauthenticated(nil, "APP-ASdgg", "invalid token") } tokenIDSubject, err := repo.TokenVerificationKey.DecryptString(tokenData, repo.TokenVerificationKey.EncryptionKeyID()) if err != nil { - return "", caos_errs.ThrowUnauthenticated(nil, "APP-8EF0zZ", "invalid token") + return "", zerrors.ThrowUnauthenticated(nil, "APP-8EF0zZ", "invalid token") } return tokenIDSubject, nil } @@ -303,7 +303,7 @@ func verifyAudience(audience []string, verifierClientID, projectID string) error return nil } } - return caos_errs.ThrowUnauthenticated(nil, "APP-Zxfako", "invalid audience") + return zerrors.ThrowUnauthenticated(nil, "APP-Zxfako", "invalid audience") } type openIDKeySet struct { diff --git a/internal/authz/repository/eventsourcing/view/application.go b/internal/authz/repository/eventsourcing/view/application.go index 8958f2e7e..8db8ec8e3 100644 --- a/internal/authz/repository/eventsourcing/view/application.go +++ b/internal/authz/repository/eventsourcing/view/application.go @@ -3,9 +3,9 @@ package view import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (v *View) ApplicationByOIDCClientID(ctx context.Context, clientID string) (*query.App, error) { @@ -37,7 +37,7 @@ func (v *View) ApplicationByProjecIDAndAppName(ctx context.Context, projectID, a return nil, err } if len(apps.Apps) != 1 { - return nil, errors.ThrowNotFound(nil, "VIEW-svLQq", "app not found") + return nil, zerrors.ThrowNotFound(nil, "VIEW-svLQq", "app not found") } return apps.Apps[0], nil diff --git a/internal/authz/repository/eventsourcing/view/token.go b/internal/authz/repository/eventsourcing/view/token.go index 20baf2274..47667ae68 100644 --- a/internal/authz/repository/eventsourcing/view/token.go +++ b/internal/authz/repository/eventsourcing/view/token.go @@ -4,11 +4,11 @@ import ( "context" "github.com/zitadel/zitadel/internal/api/authz" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/query" usr_view "github.com/zitadel/zitadel/internal/user/repository/view" usr_view_model "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -25,7 +25,7 @@ func (v *View) PutToken(token *usr_view_model.TokenView, event *models.Event) er func (v *View) DeleteToken(tokenID, instanceID string, event *models.Event) error { err := usr_view.DeleteToken(v.Db, tokenTable, tokenID, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil @@ -33,7 +33,7 @@ func (v *View) DeleteToken(tokenID, instanceID string, event *models.Event) erro func (v *View) DeleteSessionTokens(agentID, userID, instanceID string, event *models.Event) error { err := usr_view.DeleteSessionTokens(v.Db, tokenTable, agentID, userID, instanceID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return err } return nil diff --git a/internal/cache/bigcache/bigcache_test.go b/internal/cache/bigcache/bigcache_test.go index 2c91f019c..cc48e3240 100644 --- a/internal/cache/bigcache/bigcache_test.go +++ b/internal/cache/bigcache/bigcache_test.go @@ -5,8 +5,9 @@ import ( "testing" a_cache "github.com/allegro/bigcache" - "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type TestStruct struct { @@ -52,7 +53,7 @@ func TestSet(t *testing.T) { value: &TestStruct{Test: "Test"}, }, res: res{ - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, { @@ -62,7 +63,7 @@ func TestSet(t *testing.T) { key: "KEY", }, res: res{ - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, } @@ -124,7 +125,7 @@ func TestGet(t *testing.T) { getValue: &TestStruct{Test: "Test"}, }, res: res{ - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, { @@ -135,7 +136,7 @@ func TestGet(t *testing.T) { setValue: &TestStruct{Test: "Test"}, }, res: res{ - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, } @@ -197,7 +198,7 @@ func TestDelete(t *testing.T) { getValue: &TestStruct{Test: "Test"}, }, res: res{ - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, } diff --git a/internal/cache/bigcache/cache.go b/internal/cache/bigcache/cache.go index 9e7baea93..68ce57119 100644 --- a/internal/cache/bigcache/cache.go +++ b/internal/cache/bigcache/cache.go @@ -7,7 +7,8 @@ import ( a_cache "github.com/allegro/bigcache" "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" + + "github.com/zitadel/zitadel/internal/zerrors" ) type Bigcache struct { @@ -29,27 +30,27 @@ func NewBigcache(c *Config) (*Bigcache, error) { func (c *Bigcache) Set(key string, object interface{}) error { if key == "" || reflect.ValueOf(object).IsNil() { - return errors.ThrowInvalidArgument(nil, "BIGCA-du73s", "key or value should not be empty") + return zerrors.ThrowInvalidArgument(nil, "BIGCA-du73s", "key or value should not be empty") } var b bytes.Buffer enc := gob.NewEncoder(&b) if err := enc.Encode(object); err != nil { - return errors.ThrowInvalidArgument(err, "BIGCA-RUyxI", "unable to encode object") + return zerrors.ThrowInvalidArgument(err, "BIGCA-RUyxI", "unable to encode object") } return c.cache.Set(key, b.Bytes()) } func (c *Bigcache) Get(key string, ptrToObject interface{}) error { if key == "" || reflect.ValueOf(ptrToObject).IsNil() { - return errors.ThrowInvalidArgument(nil, "BIGCA-dksoe", "key or value should not be empty") + return zerrors.ThrowInvalidArgument(nil, "BIGCA-dksoe", "key or value should not be empty") } value, err := c.cache.Get(key) if err == a_cache.ErrEntryNotFound { - return errors.ThrowNotFound(err, "BIGCA-we32s", "not in cache") + return zerrors.ThrowNotFound(err, "BIGCA-we32s", "not in cache") } if err != nil { logging.Log("BIGCA-ftofbc").WithError(err).Info("read from cache failed") - return errors.ThrowInvalidArgument(err, "BIGCA-3idls", "error in reading from cache") + return zerrors.ThrowInvalidArgument(err, "BIGCA-3idls", "error in reading from cache") } b := bytes.NewBuffer(value) @@ -60,7 +61,7 @@ func (c *Bigcache) Get(key string, ptrToObject interface{}) error { func (c *Bigcache) Delete(key string) error { if key == "" { - return errors.ThrowInvalidArgument(nil, "BIGCA-clsi2", "key should not be empty") + return zerrors.ThrowInvalidArgument(nil, "BIGCA-clsi2", "key should not be empty") } return c.cache.Delete(key) } diff --git a/internal/cache/config/config.go b/internal/cache/config/config.go index 7cabee8fc..739387ef4 100644 --- a/internal/cache/config/config.go +++ b/internal/cache/config/config.go @@ -6,7 +6,7 @@ import ( "github.com/zitadel/zitadel/internal/cache" "github.com/zitadel/zitadel/internal/cache/bigcache" "github.com/zitadel/zitadel/internal/cache/fastcache" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type CacheConfig struct { @@ -26,7 +26,7 @@ func (c *CacheConfig) UnmarshalJSON(data []byte) error { } if err := json.Unmarshal(data, &rc); err != nil { - return errors.ThrowInternal(err, "CONFI-98ejs", "unable to unmarshal config") + return zerrors.ThrowInternal(err, "CONFI-98ejs", "unable to unmarshal config") } c.Type = rc.Type @@ -34,7 +34,7 @@ func (c *CacheConfig) UnmarshalJSON(data []byte) error { var err error c.Config, err = newCacheConfig(c.Type, rc.Config) if err != nil { - return errors.ThrowInternal(err, "CONFI-do9es", "unable create config") + return zerrors.ThrowInternal(err, "CONFI-do9es", "unable create config") } return nil @@ -43,7 +43,7 @@ func (c *CacheConfig) UnmarshalJSON(data []byte) error { func newCacheConfig(cacheType string, configData []byte) (cache.Config, error) { t, ok := caches[cacheType] if !ok { - return nil, errors.ThrowInternal(nil, "CONFI-di328s", "no config") + return nil, zerrors.ThrowInternal(nil, "CONFI-di328s", "no config") } cacheConfig := t() @@ -52,7 +52,7 @@ func newCacheConfig(cacheType string, configData []byte) (cache.Config, error) { } if err := json.Unmarshal(configData, cacheConfig); err != nil { - return nil, errors.ThrowInternal(nil, "CONFI-skei3", "could not read config") + return nil, zerrors.ThrowInternal(nil, "CONFI-skei3", "could not read config") } return cacheConfig, nil diff --git a/internal/cache/fastcache/fastcache.go b/internal/cache/fastcache/fastcache.go index 1ff4eee14..54b7778c7 100644 --- a/internal/cache/fastcache/fastcache.go +++ b/internal/cache/fastcache/fastcache.go @@ -5,9 +5,9 @@ import ( "encoding/gob" "reflect" - "github.com/zitadel/zitadel/internal/errors" - "github.com/VictoriaMetrics/fastcache" + + "github.com/zitadel/zitadel/internal/zerrors" ) type Fastcache struct { @@ -22,12 +22,12 @@ func NewFastcache(config *Config) (*Fastcache, error) { func (fc *Fastcache) Set(key string, object interface{}) error { if key == "" || reflect.ValueOf(object).IsNil() { - return errors.ThrowInvalidArgument(nil, "FASTC-87dj3", "key or value should not be empty") + return zerrors.ThrowInvalidArgument(nil, "FASTC-87dj3", "key or value should not be empty") } var b bytes.Buffer enc := gob.NewEncoder(&b) if err := enc.Encode(object); err != nil { - return errors.ThrowInvalidArgument(err, "FASTC-RUyxI", "unable to encode object") + return zerrors.ThrowInvalidArgument(err, "FASTC-RUyxI", "unable to encode object") } fc.cache.Set([]byte(key), b.Bytes()) return nil @@ -35,11 +35,11 @@ func (fc *Fastcache) Set(key string, object interface{}) error { func (fc *Fastcache) Get(key string, ptrToObject interface{}) error { if key == "" || reflect.ValueOf(ptrToObject).IsNil() { - return errors.ThrowInvalidArgument(nil, "FASTC-di8es", "key or value should not be empty") + return zerrors.ThrowInvalidArgument(nil, "FASTC-di8es", "key or value should not be empty") } data := fc.cache.Get(nil, []byte(key)) if len(data) == 0 { - return errors.ThrowNotFound(nil, "FASTC-xYzSm", "key not found") + return zerrors.ThrowNotFound(nil, "FASTC-xYzSm", "key not found") } b := bytes.NewBuffer(data) @@ -50,7 +50,7 @@ func (fc *Fastcache) Get(key string, ptrToObject interface{}) error { func (fc *Fastcache) Delete(key string) error { if key == "" { - return errors.ThrowInvalidArgument(nil, "FASTC-lod92", "key should not be empty") + return zerrors.ThrowInvalidArgument(nil, "FASTC-lod92", "key should not be empty") } fc.cache.Del([]byte(key)) return nil diff --git a/internal/cache/fastcache/fastcache_test.go b/internal/cache/fastcache/fastcache_test.go index e17566e12..6d4e41533 100644 --- a/internal/cache/fastcache/fastcache_test.go +++ b/internal/cache/fastcache/fastcache_test.go @@ -5,8 +5,9 @@ import ( "testing" "github.com/VictoriaMetrics/fastcache" - "github.com/zitadel/zitadel/internal/errors" + es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type TestStruct struct { @@ -47,7 +48,7 @@ func TestSet(t *testing.T) { value: &TestStruct{Test: "Test"}, }, res: res{ - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, { @@ -57,7 +58,7 @@ func TestSet(t *testing.T) { key: "KEY", }, res: res{ - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, } @@ -119,7 +120,7 @@ func TestGet(t *testing.T) { getValue: &TestStruct{Test: "Test"}, }, res: res{ - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, { @@ -130,7 +131,7 @@ func TestGet(t *testing.T) { setValue: &TestStruct{Test: "Test"}, }, res: res{ - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, } @@ -192,7 +193,7 @@ func TestDelete(t *testing.T) { getValue: &TestStruct{Test: "Test"}, }, res: res{ - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, } diff --git a/internal/command/auth_checks.go b/internal/command/auth_checks.go index 703c2a89e..994060f0d 100644 --- a/internal/command/auth_checks.go +++ b/internal/command/auth_checks.go @@ -4,7 +4,7 @@ import ( "context" "github.com/zitadel/zitadel/internal/api/authz" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func checkExplicitProjectPermission(ctx context.Context, grantID, projectID string) error { @@ -19,7 +19,7 @@ func checkExplicitProjectPermission(ctx context.Context, grantID, projectID stri if listContainsID(ids, projectID) { return nil } - return caos_errors.ThrowPermissionDenied(nil, "EVENT-Shu7e", "Errors.UserGrant.NoPermissionForProject") + return zerrors.ThrowPermissionDenied(nil, "EVENT-Shu7e", "Errors.UserGrant.NoPermissionForProject") } func listContainsID(ids []string, id string) bool { diff --git a/internal/command/auth_request.go b/internal/command/auth_request.go index b0b022610..1a24e75b5 100644 --- a/internal/command/auth_request.go +++ b/internal/command/auth_request.go @@ -6,9 +6,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/authrequest" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type AuthRequest struct { @@ -50,7 +50,7 @@ func (c *Commands) AddAuthRequest(ctx context.Context, authRequest *AuthRequest) return nil, err } if writeModel.AuthRequestState != domain.AuthRequestStateUnspecified { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-Sf3gt", "Errors.AuthRequest.AlreadyExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sf3gt", "Errors.AuthRequest.AlreadyExisting") } err = c.pushAppendAndReduce(ctx, writeModel, authrequest.NewAddedEvent( ctx, @@ -82,13 +82,13 @@ func (c *Commands) LinkSessionToAuthRequest(ctx context.Context, id, sessionID, return nil, nil, err } if writeModel.AuthRequestState == domain.AuthRequestStateUnspecified { - return nil, nil, errors.ThrowNotFound(nil, "COMMAND-jae5P", "Errors.AuthRequest.NotExisting") + return nil, nil, zerrors.ThrowNotFound(nil, "COMMAND-jae5P", "Errors.AuthRequest.NotExisting") } if writeModel.AuthRequestState != domain.AuthRequestStateAdded { - return nil, nil, errors.ThrowPreconditionFailed(nil, "COMMAND-Sx208nt", "Errors.AuthRequest.AlreadyHandled") + return nil, nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sx208nt", "Errors.AuthRequest.AlreadyHandled") } if checkLoginClient && authz.GetCtxData(ctx).UserID != writeModel.LoginClient { - return nil, nil, errors.ThrowPermissionDenied(nil, "COMMAND-rai9Y", "Errors.AuthRequest.WrongLoginClient") + return nil, nil, zerrors.ThrowPermissionDenied(nil, "COMMAND-rai9Y", "Errors.AuthRequest.WrongLoginClient") } sessionWriteModel := NewSessionWriteModel(sessionID, authz.GetInstance(ctx).InstanceID()) err = c.eventstore.FilterToQueryReducer(ctx, sessionWriteModel) @@ -120,7 +120,7 @@ func (c *Commands) FailAuthRequest(ctx context.Context, id string, reason domain return nil, nil, err } if writeModel.AuthRequestState != domain.AuthRequestStateAdded { - return nil, nil, errors.ThrowPreconditionFailed(nil, "COMMAND-Sx202nt", "Errors.AuthRequest.AlreadyHandled") + return nil, nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sx202nt", "Errors.AuthRequest.AlreadyHandled") } err = c.pushAppendAndReduce(ctx, writeModel, authrequest.NewFailedEvent( ctx, @@ -135,14 +135,14 @@ func (c *Commands) FailAuthRequest(ctx context.Context, id string, reason domain func (c *Commands) AddAuthRequestCode(ctx context.Context, authRequestID, code string) (err error) { if code == "" { - return errors.ThrowPreconditionFailed(nil, "COMMAND-Ht52d", "Errors.AuthRequest.InvalidCode") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Ht52d", "Errors.AuthRequest.InvalidCode") } writeModel, err := c.getAuthRequestWriteModel(ctx, authRequestID) if err != nil { return err } if writeModel.AuthRequestState != domain.AuthRequestStateAdded || writeModel.SessionID == "" { - return errors.ThrowPreconditionFailed(nil, "COMMAND-SFwd2", "Errors.AuthRequest.AlreadyHandled") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-SFwd2", "Errors.AuthRequest.AlreadyHandled") } return c.pushAppendAndReduce(ctx, writeModel, authrequest.NewCodeAddedEvent(ctx, &authrequest.NewAggregate(writeModel.AggregateID, authz.GetInstance(ctx).InstanceID()).Aggregate)) @@ -150,14 +150,14 @@ func (c *Commands) AddAuthRequestCode(ctx context.Context, authRequestID, code s func (c *Commands) ExchangeAuthCode(ctx context.Context, code string) (authRequest *CurrentAuthRequest, err error) { if code == "" { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-Sf3g2", "Errors.AuthRequest.InvalidCode") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sf3g2", "Errors.AuthRequest.InvalidCode") } writeModel, err := c.getAuthRequestWriteModel(ctx, code) if err != nil { return nil, err } if writeModel.AuthRequestState != domain.AuthRequestStateCodeAdded { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-SFwd2", "Errors.AuthRequest.NoCode") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-SFwd2", "Errors.AuthRequest.NoCode") } err = c.pushAppendAndReduce(ctx, writeModel, authrequest.NewCodeExchangedEvent(ctx, &authrequest.NewAggregate(writeModel.AggregateID, authz.GetInstance(ctx).InstanceID()).Aggregate)) diff --git a/internal/command/auth_request_model.go b/internal/command/auth_request_model.go index d27caf876..235477f62 100644 --- a/internal/command/auth_request_model.go +++ b/internal/command/auth_request_model.go @@ -6,9 +6,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/authrequest" + "github.com/zitadel/zitadel/internal/zerrors" ) type AuthRequestWriteModel struct { @@ -95,7 +95,7 @@ func (m *AuthRequestWriteModel) Query() *eventstore.SearchQueryBuilder { // and in case of a Code Flow the code must have been exchanged func (m *AuthRequestWriteModel) CheckAuthenticated() error { if m.SessionID == "" { - return caos_errs.ThrowPreconditionFailed(nil, "AUTHR-SF2r2", "Errors.AuthRequest.NotAuthenticated") + return zerrors.ThrowPreconditionFailed(nil, "AUTHR-SF2r2", "Errors.AuthRequest.NotAuthenticated") } // in case of OIDC Code Flow, the code must have been exchanged if m.ResponseType == domain.OIDCResponseTypeCode && m.AuthRequestState == domain.AuthRequestStateCodeExchanged { @@ -106,5 +106,5 @@ func (m *AuthRequestWriteModel) CheckAuthenticated() error { m.AuthRequestState == domain.AuthRequestStateAdded { return nil } - return caos_errs.ThrowPreconditionFailed(nil, "AUTHR-sajk3", "Errors.AuthRequest.NotAuthenticated") + return zerrors.ThrowPreconditionFailed(nil, "AUTHR-sajk3", "Errors.AuthRequest.NotAuthenticated") } diff --git a/internal/command/auth_request_test.go b/internal/command/auth_request_test.go index e077c90f9..a70a592bb 100644 --- a/internal/command/auth_request_test.go +++ b/internal/command/auth_request_test.go @@ -13,12 +13,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/authrequest" "github.com/zitadel/zitadel/internal/repository/session" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_AddAuthRequest(t *testing.T) { @@ -70,7 +70,7 @@ func TestCommands_AddAuthRequest(t *testing.T) { request: &AuthRequest{}, }, nil, - caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sf3gt", "Errors.AuthRequest.AlreadyExisting"), + zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sf3gt", "Errors.AuthRequest.AlreadyExisting"), }, { "added", @@ -199,7 +199,7 @@ func TestCommands_LinkSessionToAuthRequest(t *testing.T) { sessionID: "sessionID", }, res{ - wantErr: caos_errs.ThrowNotFound(nil, "COMMAND-jae5P", "Errors.AuthRequest.NotExisting"), + wantErr: zerrors.ThrowNotFound(nil, "COMMAND-jae5P", "Errors.AuthRequest.NotExisting"), }, }, { @@ -239,7 +239,7 @@ func TestCommands_LinkSessionToAuthRequest(t *testing.T) { sessionID: "sessionID", }, res{ - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sx208nt", "Errors.AuthRequest.AlreadyHandled"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sx208nt", "Errors.AuthRequest.AlreadyHandled"), }, }, { @@ -277,7 +277,7 @@ func TestCommands_LinkSessionToAuthRequest(t *testing.T) { checkLoginClient: true, }, res{ - wantErr: caos_errs.ThrowPermissionDenied(nil, "COMMAND-rai9Y", "Errors.AuthRequest.WrongLoginClient"), + wantErr: zerrors.ThrowPermissionDenied(nil, "COMMAND-rai9Y", "Errors.AuthRequest.WrongLoginClient"), }, }, { @@ -314,7 +314,7 @@ func TestCommands_LinkSessionToAuthRequest(t *testing.T) { sessionID: "sessionID", }, res{ - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Flk38", "Errors.Session.NotExisting"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Flk38", "Errors.Session.NotExisting"), }, }, { @@ -374,7 +374,7 @@ func TestCommands_LinkSessionToAuthRequest(t *testing.T) { sessionToken: "token", }, res{ - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Hkl3d", "Errors.Session.Expired"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Hkl3d", "Errors.Session.Expired"), }, }, { @@ -423,7 +423,7 @@ func TestCommands_LinkSessionToAuthRequest(t *testing.T) { sessionToken: "invalid", }, res{ - wantErr: caos_errs.ThrowPermissionDenied(nil, "COMMAND-sGr42", "Errors.Session.Token.Invalid"), + wantErr: zerrors.ThrowPermissionDenied(nil, "COMMAND-sGr42", "Errors.Session.Token.Invalid"), }, }, { @@ -650,7 +650,7 @@ func TestCommands_FailAuthRequest(t *testing.T) { reason: domain.OIDCErrorReasonLoginRequired, }, res{ - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sx202nt", "Errors.AuthRequest.AlreadyHandled"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sx202nt", "Errors.AuthRequest.AlreadyHandled"), }, }, { @@ -745,7 +745,7 @@ func TestCommands_AddAuthRequestCode(t *testing.T) { id: "V2_authRequestID", code: "", }, - caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Ht52d", "Errors.AuthRequest.InvalidCode"), + zerrors.ThrowPreconditionFailed(nil, "COMMAND-Ht52d", "Errors.AuthRequest.InvalidCode"), }, { "no session linked error", @@ -781,7 +781,7 @@ func TestCommands_AddAuthRequestCode(t *testing.T) { id: "V2_authRequestID", code: "V2_authRequestID", }, - caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SFwd2", "Errors.AuthRequest.AlreadyHandled"), + zerrors.ThrowPreconditionFailed(nil, "COMMAND-SFwd2", "Errors.AuthRequest.AlreadyHandled"), }, { "success", @@ -871,7 +871,7 @@ func TestCommands_ExchangeAuthCode(t *testing.T) { code: "", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sf3g2", "Errors.AuthRequest.InvalidCode"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sf3g2", "Errors.AuthRequest.InvalidCode"), }, }, { @@ -908,7 +908,7 @@ func TestCommands_ExchangeAuthCode(t *testing.T) { code: "V2_authRequestID", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SFwd2", "Errors.AuthRequest.NoCode"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-SFwd2", "Errors.AuthRequest.NoCode"), }, }, { diff --git a/internal/command/command.go b/internal/command/command.go index e8e25203c..1cdf544d7 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -20,7 +20,6 @@ import ( sd "github.com/zitadel/zitadel/internal/config/systemdefaults" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/repository/action" @@ -42,6 +41,7 @@ import ( "github.com/zitadel/zitadel/internal/static" "github.com/zitadel/zitadel/internal/telemetry/tracing" webauthn_helper "github.com/zitadel/zitadel/internal/webauthn" + "github.com/zitadel/zitadel/internal/zerrors" ) type Commands struct { @@ -111,7 +111,7 @@ func StartCommands( defaultSecretGenerators *SecretGenerators, ) (repo *Commands, err error) { if externalDomain == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-Df21s", "no external domain specified") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Df21s", "no external domain specified") } idGenerator := id.SonyFlakeGenerator() // reuse the oidcEncryption to be able to handle both tokens in the interceptor later on @@ -255,7 +255,7 @@ func samlCertificateAndKeyGenerator(keySize int) func(id string) ([]byte, []byte derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, pub, priv) if err != nil { - return nil, nil, errors.ThrowInternalf(err, "COMMAND-x92u101j", "failed to create certificate") + return nil, nil, zerrors.ThrowInternalf(err, "COMMAND-x92u101j", "failed to create certificate") } keyBlock := &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)} diff --git a/internal/command/crypto.go b/internal/command/crypto.go index 0f7fe11ce..dfbbc0001 100644 --- a/internal/command/crypto.go +++ b/internal/command/crypto.go @@ -7,7 +7,7 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type cryptoCodeFunc func(ctx context.Context, filter preparation.FilterToQueryReducer, typ domain.SecretGeneratorType, alg crypto.Crypto) (*CryptoCode, error) @@ -61,7 +61,7 @@ func secretGenerator(ctx context.Context, filter preparation.FilterToQueryReduce case crypto.EncryptionAlgorithm: return crypto.NewEncryptionGenerator(*config, a), config, nil default: - return nil, nil, errors.ThrowInternalf(nil, "COMMA-RreV6", "Errors.Internal unsupported crypto algorithm type %T", a) + return nil, nil, zerrors.ThrowInternalf(nil, "COMMA-RreV6", "Errors.Internal unsupported crypto algorithm type %T", a) } } diff --git a/internal/command/crypto_test.go b/internal/command/crypto_test.go index cebd1118e..14df176d1 100644 --- a/internal/command/crypto_test.go +++ b/internal/command/crypto_test.go @@ -13,9 +13,9 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func mockCode(code string, exp time.Duration) cryptoCodeFunc { @@ -270,7 +270,7 @@ func Test_secretGenerator(t *testing.T) { alg: nil, defaultConfig: emptyConfig, }, - wantErr: errors.ThrowInternalf(nil, "COMMA-RreV6", "Errors.Internal unsupported crypto algorithm type %T", nil), + wantErr: zerrors.ThrowInternalf(nil, "COMMA-RreV6", "Errors.Internal unsupported crypto algorithm type %T", nil), }, } for _, tt := range tests { diff --git a/internal/command/device_auth.go b/internal/command/device_auth.go index 6c3e1a3cf..fcbe2fc37 100644 --- a/internal/command/device_auth.go +++ b/internal/command/device_auth.go @@ -6,9 +6,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/deviceauth" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDeviceAuth(ctx context.Context, clientID, deviceCode, userCode string, expires time.Time, scopes []string) (string, *domain.ObjectDetails, error) { @@ -46,7 +46,7 @@ func (c *Commands) ApproveDeviceAuth(ctx context.Context, id, subject string) (* return nil, err } if !model.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Hief9", "Errors.DeviceAuth.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-Hief9", "Errors.DeviceAuth.NotFound") } aggr := deviceauth.NewAggregate(model.AggregateID, model.InstanceID) @@ -68,7 +68,7 @@ func (c *Commands) CancelDeviceAuth(ctx context.Context, id string, reason domai return nil, err } if !model.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-gee5A", "Errors.DeviceAuth.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-gee5A", "Errors.DeviceAuth.NotFound") } aggr := deviceauth.NewAggregate(model.AggregateID, model.InstanceID) diff --git a/internal/command/device_auth_test.go b/internal/command/device_auth_test.go index 3b74e1322..a21a64f84 100644 --- a/internal/command/device_auth_test.go +++ b/internal/command/device_auth_test.go @@ -12,11 +12,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/deviceauth" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_AddDeviceAuth(t *testing.T) { @@ -176,7 +176,7 @@ func TestCommands_ApproveDeviceAuth(t *testing.T) { ), }, args: args{ctx, "1999", "subj"}, - wantErr: caos_errs.ThrowNotFound(nil, "COMMAND-Hief9", "Errors.DeviceAuth.NotFound"), + wantErr: zerrors.ThrowNotFound(nil, "COMMAND-Hief9", "Errors.DeviceAuth.NotFound"), }, { name: "push error", @@ -283,7 +283,7 @@ func TestCommands_CancelDeviceAuth(t *testing.T) { ), }, args: args{ctx, "1999", domain.DeviceAuthCanceledDenied}, - wantErr: caos_errs.ThrowNotFound(nil, "COMMAND-gee5A", "Errors.DeviceAuth.NotFound"), + wantErr: zerrors.ThrowNotFound(nil, "COMMAND-gee5A", "Errors.DeviceAuth.NotFound"), }, { name: "push error", diff --git a/internal/command/idp.go b/internal/command/idp.go index 3dc8f1ad5..997a77278 100644 --- a/internal/command/idp.go +++ b/internal/command/idp.go @@ -6,8 +6,8 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/idp" + "github.com/zitadel/zitadel/internal/zerrors" ) type GenericOAuthProvider struct { @@ -167,7 +167,7 @@ func IDPProviderWriteModel(ctx context.Context, filter preparation.FilterToQuery return nil, err } if len(events) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-as02jin", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-as02jin", "Errors.IDPConfig.NotExisting") } writeModel.AppendEvents(events...) if err := writeModel.Reduce(); err != nil { diff --git a/internal/command/idp_intent.go b/internal/command/idp_intent.go index edf28ef46..1afc823fb 100644 --- a/internal/command/idp_intent.go +++ b/internal/command/idp_intent.go @@ -14,7 +14,6 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/idp" "github.com/zitadel/zitadel/internal/idp/providers/apple" @@ -23,20 +22,21 @@ import ( "github.com/zitadel/zitadel/internal/idp/providers/oauth" openid "github.com/zitadel/zitadel/internal/idp/providers/oidc" "github.com/zitadel/zitadel/internal/repository/idpintent" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) prepareCreateIntent(writeModel *IDPIntentWriteModel, idpID string, successURL, failureURL string) preparation.Validation { return func() (_ preparation.CreateCommands, err error) { if idpID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-x8j2bk", "Errors.Intent.IDPMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-x8j2bk", "Errors.Intent.IDPMissing") } successURL, err := url.Parse(successURL) if err != nil { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-x8j3bk", "Errors.Intent.SuccessURLMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-x8j3bk", "Errors.Intent.SuccessURLMissing") } failureURL, err := url.Parse(failureURL) if err != nil { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-x8j4bk", "Errors.Intent.FailureURLMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-x8j4bk", "Errors.Intent.FailureURLMissing") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { err = getIDPIntentWriteModel(ctx, writeModel, filter) @@ -45,7 +45,7 @@ func (c *Commands) prepareCreateIntent(writeModel *IDPIntentWriteModel, idpID st } exists, err := ExistsIDP(ctx, filter, idpID, writeModel.ResourceOwner) if !exists || err != nil { - return nil, errors.ThrowPreconditionFailed(err, "COMMAND-39n221fs", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-39n221fs", "Errors.IDPConfig.NotExisting") } return []eventstore.Command{ idpintent.NewStartedEvent(ctx, writeModel.aggregate, successURL, failureURL, idpID), @@ -117,10 +117,10 @@ func (c *Commands) GetActiveIntent(ctx context.Context, intentID string) (*IDPIn return nil, err } if intent.State == domain.IDPIntentStateUnspecified { - return nil, errors.ThrowNotFound(nil, "IDP-Hk38e", "Errors.Intent.NotStarted") + return nil, zerrors.ThrowNotFound(nil, "IDP-Hk38e", "Errors.Intent.NotStarted") } if intent.State != domain.IDPIntentStateStarted { - return nil, errors.ThrowInvalidArgument(nil, "IDP-Sfrgs", "Errors.Intent.NotStarted") + return nil, zerrors.ThrowInvalidArgument(nil, "IDP-Sfrgs", "Errors.Intent.NotStarted") } return intent, nil } diff --git a/internal/command/idp_intent_test.go b/internal/command/idp_intent_test.go index f930530c3..a297548f6 100644 --- a/internal/command/idp_intent_test.go +++ b/internal/command/idp_intent_test.go @@ -16,7 +16,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - z_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/id/mock" @@ -29,6 +28,7 @@ import ( rep_idp "github.com/zitadel/zitadel/internal/repository/idp" "github.com/zitadel/zitadel/internal/repository/idpintent" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_CreateIntent(t *testing.T) { @@ -58,7 +58,7 @@ func TestCommands_CreateIntent(t *testing.T) { "error no id generator", fields{ eventstore: eventstoreExpect(t), - idGenerator: mock.NewIDGeneratorExpectError(t, z_errors.ThrowInternal(nil, "", "error id")), + idGenerator: mock.NewIDGeneratorExpectError(t, zerrors.ThrowInternal(nil, "", "error id")), }, args{ ctx: authz.SetCtxData(context.Background(), authz.CtxData{OrgID: "ro"}), @@ -67,7 +67,7 @@ func TestCommands_CreateIntent(t *testing.T) { failureURL: "https://failure.url", }, res{ - err: z_errors.ThrowInternal(nil, "", "error id"), + err: zerrors.ThrowInternal(nil, "", "error id"), }, }, { @@ -83,7 +83,7 @@ func TestCommands_CreateIntent(t *testing.T) { failureURL: "https://failure.url", }, res{ - err: z_errors.ThrowInvalidArgument(nil, "COMMAND-x8j2bk", "Errors.Intent.IDPMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-x8j2bk", "Errors.Intent.IDPMissing"), }, }, { @@ -99,7 +99,7 @@ func TestCommands_CreateIntent(t *testing.T) { failureURL: "https://failure.url", }, res{ - err: z_errors.ThrowInvalidArgument(nil, "COMMAND-x8j3bk", "Errors.Intent.SuccessURLMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-x8j3bk", "Errors.Intent.SuccessURLMissing"), }, }, { @@ -115,7 +115,7 @@ func TestCommands_CreateIntent(t *testing.T) { failureURL: ":", }, res{ - err: z_errors.ThrowInvalidArgument(nil, "COMMAND-x8j4bk", "Errors.Intent.FailureURLMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-x8j4bk", "Errors.Intent.FailureURLMissing"), }, }, { @@ -135,7 +135,7 @@ func TestCommands_CreateIntent(t *testing.T) { failureURL: "https://failure.url", }, res{ - err: z_errors.ThrowPreconditionFailed(nil, "COMMAND-39n221fs", "Errors.IDPConfig.NotExisting"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-39n221fs", "Errors.IDPConfig.NotExisting"), }, }, { @@ -249,7 +249,7 @@ func TestCommands_AuthFromProvider(t *testing.T) { callbackURL: "url", }, res{ - err: z_errors.ThrowPreconditionFailed(nil, "", ""), + err: zerrors.ThrowPreconditionFailed(nil, "", ""), }, }, { @@ -293,7 +293,7 @@ func TestCommands_AuthFromProvider(t *testing.T) { callbackURL: "url", }, res{ - err: z_errors.ThrowInternal(nil, "COMMAND-xw921211", "Errors.IDPConfig.NotExisting"), + err: zerrors.ThrowInternal(nil, "COMMAND-xw921211", "Errors.IDPConfig.NotExisting"), }, }, { @@ -620,7 +620,7 @@ func TestCommands_SucceedIDPIntent(t *testing.T) { fields{ idpConfigEncryption: func() crypto.EncryptionAlgorithm { m := crypto.NewMockEncryptionAlgorithm(gomock.NewController(t)) - m.EXPECT().Encrypt(gomock.Any()).Return(nil, z_errors.ThrowInternal(nil, "id", "encryption failed")) + m.EXPECT().Encrypt(gomock.Any()).Return(nil, zerrors.ThrowInternal(nil, "id", "encryption failed")) return m }(), }, @@ -629,7 +629,7 @@ func TestCommands_SucceedIDPIntent(t *testing.T) { writeModel: NewIDPIntentWriteModel("id", "ro"), }, res{ - err: z_errors.ThrowInternal(nil, "id", "encryption failed"), + err: zerrors.ThrowInternal(nil, "id", "encryption failed"), }, }, { @@ -640,7 +640,7 @@ func TestCommands_SucceedIDPIntent(t *testing.T) { m.EXPECT().Encrypt(gomock.Any()).DoAndReturn(func(value []byte) ([]byte, error) { return value, nil }) - m.EXPECT().Encrypt(gomock.Any()).Return(nil, z_errors.ThrowInternal(nil, "id", "encryption failed")) + m.EXPECT().Encrypt(gomock.Any()).Return(nil, zerrors.ThrowInternal(nil, "id", "encryption failed")) return m }(), }, @@ -656,7 +656,7 @@ func TestCommands_SucceedIDPIntent(t *testing.T) { }, }, res{ - err: z_errors.ThrowInternal(nil, "id", "encryption failed"), + err: zerrors.ThrowInternal(nil, "id", "encryption failed"), }, }, { @@ -749,7 +749,7 @@ func TestCommands_SucceedSAMLIDPIntent(t *testing.T) { fields{ idpConfigEncryption: func() crypto.EncryptionAlgorithm { m := crypto.NewMockEncryptionAlgorithm(gomock.NewController(t)) - m.EXPECT().Encrypt(gomock.Any()).Return(nil, z_errors.ThrowInternal(nil, "id", "encryption failed")) + m.EXPECT().Encrypt(gomock.Any()).Return(nil, zerrors.ThrowInternal(nil, "id", "encryption failed")) return m }(), }, @@ -758,7 +758,7 @@ func TestCommands_SucceedSAMLIDPIntent(t *testing.T) { writeModel: NewIDPIntentWriteModel("id", "ro"), }, res{ - err: z_errors.ThrowInternal(nil, "id", "encryption failed"), + err: zerrors.ThrowInternal(nil, "id", "encryption failed"), }, }, { @@ -930,7 +930,7 @@ func TestCommands_SucceedLDAPIDPIntent(t *testing.T) { fields{ idpConfigEncryption: func() crypto.EncryptionAlgorithm { m := crypto.NewMockEncryptionAlgorithm(gomock.NewController(t)) - m.EXPECT().Encrypt(gomock.Any()).Return(nil, z_errors.ThrowInternal(nil, "id", "encryption failed")) + m.EXPECT().Encrypt(gomock.Any()).Return(nil, zerrors.ThrowInternal(nil, "id", "encryption failed")) return m }(), }, @@ -939,7 +939,7 @@ func TestCommands_SucceedLDAPIDPIntent(t *testing.T) { writeModel: NewIDPIntentWriteModel("id", "ro"), }, res{ - err: z_errors.ThrowInternal(nil, "id", "encryption failed"), + err: zerrors.ThrowInternal(nil, "id", "encryption failed"), }, }, { @@ -1089,14 +1089,14 @@ func Test_tokensForSucceededIDPIntent(t *testing.T) { }, func() crypto.EncryptionAlgorithm { m := crypto.NewMockEncryptionAlgorithm(gomock.NewController(t)) - m.EXPECT().Encrypt(gomock.Any()).Return(nil, z_errors.ThrowInternal(nil, "id", "encryption failed")) + m.EXPECT().Encrypt(gomock.Any()).Return(nil, zerrors.ThrowInternal(nil, "id", "encryption failed")) return m }(), }, res{ accessToken: nil, idToken: "", - err: z_errors.ThrowInternal(nil, "id", "encryption failed"), + err: zerrors.ThrowInternal(nil, "id", "encryption failed"), }, }, { diff --git a/internal/command/idp_model.go b/internal/command/idp_model.go index e9949fb40..a71391d51 100644 --- a/internal/command/idp_model.go +++ b/internal/command/idp_model.go @@ -12,7 +12,6 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" providers "github.com/zitadel/zitadel/internal/idp" "github.com/zitadel/zitadel/internal/idp/providers/apple" @@ -30,6 +29,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) type OAuthIDPWriteModel struct { @@ -2172,7 +2172,7 @@ func NewAllIDPWriteModel(resourceOwner string, instanceBool bool, id string, idp case domain.IDPTypeUnspecified: fallthrough default: - return nil, errors.ThrowInternal(nil, "COMMAND-xw921211", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowInternal(nil, "COMMAND-xw921211", "Errors.IDPConfig.NotExisting") } } else { switch idpType { @@ -2203,7 +2203,7 @@ func NewAllIDPWriteModel(resourceOwner string, instanceBool bool, id string, idp case domain.IDPTypeUnspecified: fallthrough default: - return nil, errors.ThrowInternal(nil, "COMMAND-xw921111", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowInternal(nil, "COMMAND-xw921111", "Errors.IDPConfig.NotExisting") } } return writeModel, nil @@ -2233,7 +2233,7 @@ func (wm *AllIDPWriteModel) AppendEvents(events ...eventstore.Event) { func (wm *AllIDPWriteModel) ToProvider(callbackURL string, idpAlg crypto.EncryptionAlgorithm) (providers.Provider, error) { if wm.model == nil { - return nil, errors.ThrowInternal(nil, "COMMAND-afvf0gc9sa", "ErrorsIDPConfig.NotExisting") + return nil, zerrors.ThrowInternal(nil, "COMMAND-afvf0gc9sa", "ErrorsIDPConfig.NotExisting") } return wm.model.ToProvider(callbackURL, idpAlg) } @@ -2247,7 +2247,7 @@ func (wm *AllIDPWriteModel) GetProviderOptions() idp.Options { func (wm *AllIDPWriteModel) ToSAMLProvider(callbackURL string, idpAlg crypto.EncryptionAlgorithm, getRequest requesttracker.GetRequest, addRequest requesttracker.AddRequest) (providers.Provider, error) { if wm.samlModel == nil { - return nil, errors.ThrowInternal(nil, "COMMAND-csi30hdscv", "ErrorsIDPConfig.NotExisting") + return nil, zerrors.ThrowInternal(nil, "COMMAND-csi30hdscv", "ErrorsIDPConfig.NotExisting") } return wm.samlModel.ToProvider(callbackURL, idpAlg, getRequest, addRequest) } diff --git a/internal/command/idp_model_test.go b/internal/command/idp_model_test.go index 42c2112bf..423bff39b 100644 --- a/internal/command/idp_model_test.go +++ b/internal/command/idp_model_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_AllIDPWriteModel(t *testing.T) { @@ -179,7 +179,7 @@ func TestCommands_AllIDPWriteModel(t *testing.T) { idpType: domain.IDPTypeUnspecified, }, res: res{ - err: errors.ThrowInternal(nil, "COMMAND-xw921211", "Errors.IDPConfig.NotExisting"), + err: zerrors.ThrowInternal(nil, "COMMAND-xw921211", "Errors.IDPConfig.NotExisting"), }, }, { @@ -334,7 +334,7 @@ func TestCommands_AllIDPWriteModel(t *testing.T) { idpType: domain.IDPTypeUnspecified, }, res: res{ - err: errors.ThrowInternal(nil, "COMMAND-xw921111", "Errors.IDPConfig.NotExisting"), + err: zerrors.ThrowInternal(nil, "COMMAND-xw921111", "Errors.IDPConfig.NotExisting"), }, }, } diff --git a/internal/command/instance.go b/internal/command/instance.go index 6913cdc5b..ce660bc13 100644 --- a/internal/command/instance.go +++ b/internal/command/instance.go @@ -11,7 +11,6 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/id" @@ -24,6 +23,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/quota" "github.com/zitadel/zitadel/internal/repository/restrictions" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -378,7 +378,7 @@ func setupFeatures(commands *Commands, validations *[]preparation.Validation, en } *validations = append(*validations, prepareSetFeature(wm, feature.Boolean{Boolean: v}, commands.idGenerator)) default: - return errors.ThrowInvalidArgument(nil, "INST-GE4tg", "Errors.Feature.TypeNotSupported") + return zerrors.ThrowInvalidArgument(nil, "INST-GE4tg", "Errors.Feature.TypeNotSupported") } } return nil @@ -657,7 +657,7 @@ func SetIAMConsoleID(a *instance.Aggregate, clientID, appID *string) preparation func (c *Commands) prepareSetDefaultOrg(a *instance.Aggregate, orgID string) preparation.Validation { return func() (preparation.CreateCommands, error) { if orgID == "" { - return nil, errors.ThrowInvalidArgument(nil, "INST-SWffe", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SWffe", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel, err := getInstanceWriteModel(ctx, filter) @@ -665,10 +665,10 @@ func (c *Commands) prepareSetDefaultOrg(a *instance.Aggregate, orgID string) pre return nil, err } if writeModel.DefaultOrgID == orgID { - return nil, errors.ThrowPreconditionFailed(nil, "INST-SDfw2", "Errors.Instance.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INST-SDfw2", "Errors.Instance.NotChanged") } if exists, err := ExistsOrg(ctx, filter, orgID); err != nil || !exists { - return nil, errors.ThrowPreconditionFailed(err, "INSTA-Wfe21", "Errors.Org.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "INSTA-Wfe21", "Errors.Org.NotFound") } return []eventstore.Command{instance.NewDefaultOrgSetEventEvent(ctx, &a.Aggregate, orgID)}, nil }, nil @@ -681,7 +681,7 @@ func (c *Commands) setIAMProject(ctx context.Context, iamAgg *eventstore.Aggrega return nil, err } if iamWriteModel.ProjectID != "" { - return nil, errors.ThrowPreconditionFailed(nil, "IAM-EGbw2", "Errors.IAM.IAMProjectAlreadySet") + return nil, zerrors.ThrowPreconditionFailed(nil, "IAM-EGbw2", "Errors.IAM.IAMProjectAlreadySet") } return instance.NewIAMProjectSetEvent(ctx, iamAgg, projectID), nil } @@ -689,7 +689,7 @@ func (c *Commands) setIAMProject(ctx context.Context, iamAgg *eventstore.Aggrega func (c *Commands) prepareUpdateInstance(a *instance.Aggregate, name string) preparation.Validation { return func() (preparation.CreateCommands, error) { if name == "" { - return nil, errors.ThrowInvalidArgument(nil, "INST-092mid", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-092mid", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel, err := getInstanceWriteModel(ctx, filter) @@ -697,10 +697,10 @@ func (c *Commands) prepareUpdateInstance(a *instance.Aggregate, name string) pre return nil, err } if !writeModel.State.Exists() { - return nil, errors.ThrowNotFound(nil, "INST-nuso2m", "Errors.Instance.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INST-nuso2m", "Errors.Instance.NotFound") } if writeModel.Name == name { - return nil, errors.ThrowPreconditionFailed(nil, "INST-alpxism", "Errors.Instance.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INST-alpxism", "Errors.Instance.NotChanged") } return []eventstore.Command{instance.NewInstanceChangedEvent(ctx, &a.Aggregate, name)}, nil }, nil @@ -718,7 +718,7 @@ func (c *Commands) prepareSetDefaultLanguage(a *instance.Aggregate, defaultLangu return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel, err := getInstanceWriteModel(ctx, filter) if writeModel.DefaultLanguage == defaultLanguage { - return nil, errors.ThrowPreconditionFailed(nil, "INST-DS3rq", "Errors.Instance.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INST-DS3rq", "Errors.Instance.NotChanged") } instanceID := authz.GetInstance(ctx).InstanceID() restrictionsWM, err := c.getRestrictionsWriteModel(ctx, instanceID, instanceID) @@ -788,10 +788,10 @@ func (c *Commands) prepareRemoveInstance(a *instance.Aggregate) preparation.Vali return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel, err := c.getInstanceWriteModelByID(ctx, a.ID) if err != nil { - return nil, errors.ThrowNotFound(err, "COMMA-pax9m3", "Errors.Instance.NotFound") + return nil, zerrors.ThrowNotFound(err, "COMMA-pax9m3", "Errors.Instance.NotFound") } if !writeModel.State.Exists() { - return nil, errors.ThrowNotFound(err, "COMMA-AE3GS", "Errors.Instance.NotFound") + return nil, zerrors.ThrowNotFound(err, "COMMA-AE3GS", "Errors.Instance.NotFound") } return []eventstore.Command{instance.NewInstanceRemovedEvent(ctx, &a.Aggregate, diff --git a/internal/command/instance_custom_login_text.go b/internal/command/instance_custom_login_text.go index 321d15976..ca86a4829 100644 --- a/internal/command/instance_custom_login_text.go +++ b/internal/command/instance_custom_login_text.go @@ -2,14 +2,15 @@ package command import ( "context" + "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) // SetCustomInstanceLoginText only validates if the language is supported, not if it is allowed. @@ -33,14 +34,14 @@ func (c *Commands) SetCustomInstanceLoginText(ctx context.Context, loginText *do func (c *Commands) RemoveCustomInstanceLoginTexts(ctx context.Context, lang language.Tag) (*domain.ObjectDetails, error) { if lang == language.Und { - return nil, caos_errs.ThrowInvalidArgument(nil, "IAM-Gfbg3", "Errors.CustomText.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "IAM-Gfbg3", "Errors.CustomText.Invalid") } customText, err := c.defaultLoginTextWriteModelByID(ctx, lang) if err != nil { return nil, err } if customText.State == domain.PolicyStateUnspecified || customText.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "IAM-fru44", "Errors.CustomText.NotFound") + return nil, zerrors.ThrowNotFound(nil, "IAM-fru44", "Errors.CustomText.NotFound") } iamAgg := InstanceAggregateFromWriteModel(&customText.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewCustomTextTemplateRemovedEvent(ctx, iamAgg, domain.LoginCustomText, lang)) diff --git a/internal/command/instance_custom_login_text_test.go b/internal/command/instance_custom_login_text_test.go index 8b5603be0..4ec29acab 100644 --- a/internal/command/instance_custom_login_text_test.go +++ b/internal/command/instance_custom_login_text_test.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_SetCustomIAMLoginText(t *testing.T) { @@ -63,7 +63,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) { config: &domain.CustomLoginText{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -78,7 +78,7 @@ func TestCommandSide_SetCustomIAMLoginText(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/instance_custom_message_text.go b/internal/command/instance_custom_message_text.go index 2f67c6eb2..03c073e4d 100644 --- a/internal/command/instance_custom_message_text.go +++ b/internal/command/instance_custom_message_text.go @@ -7,10 +7,10 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) // SetDefaultMessageText only validates if the language is supported, not if it is allowed. @@ -97,14 +97,14 @@ func (c *Commands) setDefaultMessageText(ctx context.Context, instanceAgg *event func (c *Commands) RemoveInstanceMessageTexts(ctx context.Context, messageTextType string, lang language.Tag) (*domain.ObjectDetails, error) { if messageTextType == "" || lang == language.Und { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-fjw9b", "Errors.CustomMessageText.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-fjw9b", "Errors.CustomMessageText.Invalid") } customText, err := c.defaultCustomMessageTextWriteModelByID(ctx, messageTextType, lang) if err != nil { return nil, err } if customText.State == domain.PolicyStateUnspecified || customText.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-fju90", "Errors.CustomMessageText.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-fju90", "Errors.CustomMessageText.NotFound") } instanceAgg := InstanceAggregateFromWriteModel(&customText.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewCustomTextTemplateRemovedEvent(ctx, instanceAgg, messageTextType, lang)) diff --git a/internal/command/instance_custom_message_text_test.go b/internal/command/instance_custom_message_text_test.go index c7eef8b77..edb330c6a 100644 --- a/internal/command/instance_custom_message_text_test.go +++ b/internal/command/instance_custom_message_text_test.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - zitadel_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_SetDefaultMessageText(t *testing.T) { @@ -45,7 +45,7 @@ func TestCommandSide_SetDefaultMessageText(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -80,7 +80,7 @@ func TestCommandSide_SetDefaultMessageText(t *testing.T) { config: &domain.CustomMessageText{}, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -95,7 +95,7 @@ func TestCommandSide_SetDefaultMessageText(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/instance_debug_notification_file.go b/internal/command/instance_debug_notification_file.go index 830b4e1b6..6bb58a85a 100644 --- a/internal/command/instance_debug_notification_file.go +++ b/internal/command/instance_debug_notification_file.go @@ -4,11 +4,11 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/notification/channels/fs" iam_repo "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDebugNotificationProviderFile(ctx context.Context, fileSystemProvider *fs.Config) (*domain.ObjectDetails, error) { @@ -35,7 +35,7 @@ func (c *Commands) addDefaultDebugNotificationFile(ctx context.Context, instance return nil, err } if addedWriteModel.State.Exists() { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-d93nfs", "Errors.IAM.DebugNotificationProvider.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-d93nfs", "Errors.IAM.DebugNotificationProvider.AlreadyExists") } events := []eventstore.Command{ @@ -70,7 +70,7 @@ func (c *Commands) changeDefaultDebugNotificationProviderFile(ctx context.Contex return nil, err } if !existingProvider.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-fm9wl", "Errors.IAM.DebugNotificationProvider.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-fm9wl", "Errors.IAM.DebugNotificationProvider.NotFound") } events := make([]eventstore.Command, 0) changedEvent, hasChanged := existingProvider.NewChangedEvent(ctx, @@ -80,7 +80,7 @@ func (c *Commands) changeDefaultDebugNotificationProviderFile(ctx context.Contex events = append(events, changedEvent) } if len(events) == 0 { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-5M9vdd", "Errors.IAM.LoginPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-5M9vdd", "Errors.IAM.LoginPolicy.NotChanged") } return events, nil @@ -94,7 +94,7 @@ func (c *Commands) RemoveDefaultNotificationFile(ctx context.Context) (*domain.O return nil, err } if !existingProvider.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-dj9ew", "Errors.IAM.DebugNotificationProvider.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-dj9ew", "Errors.IAM.DebugNotificationProvider.NotFound") } events, err := c.eventstore.Push(ctx, iam_repo.NewDebugNotificationProviderFileRemovedEvent(ctx, instanceAgg)) diff --git a/internal/command/instance_debug_notification_file_test.go b/internal/command/instance_debug_notification_file_test.go index 10c75e193..73e8b6bc2 100644 --- a/internal/command/instance_debug_notification_file_test.go +++ b/internal/command/instance_debug_notification_file_test.go @@ -8,11 +8,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/notification/channels/fs" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/settings" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultDebugNotificationProviderFile(t *testing.T) { @@ -57,7 +57,7 @@ func TestCommandSide_AddDefaultDebugNotificationProviderFile(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -140,7 +140,7 @@ func TestCommandSide_ChangeDebugNotificationProviderFile(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -166,7 +166,7 @@ func TestCommandSide_ChangeDebugNotificationProviderFile(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -192,7 +192,7 @@ func TestCommandSide_ChangeDebugNotificationProviderFile(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -277,7 +277,7 @@ func TestCommandSide_RemoveDebugNotificationProviderFile(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/instance_debug_notification_log.go b/internal/command/instance_debug_notification_log.go index fd4c42cb1..907dfab42 100644 --- a/internal/command/instance_debug_notification_log.go +++ b/internal/command/instance_debug_notification_log.go @@ -4,11 +4,11 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/notification/channels/fs" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDebugNotificationProviderLog(ctx context.Context, fileSystemProvider *fs.Config) (*domain.ObjectDetails, error) { @@ -35,7 +35,7 @@ func (c *Commands) addDefaultDebugNotificationLog(ctx context.Context, instanceA return nil, err } if addedWriteModel.State.Exists() { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-3h0fs", "Errors.IAM.DebugNotificationProvider.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-3h0fs", "Errors.IAM.DebugNotificationProvider.AlreadyExists") } events := []eventstore.Command{ @@ -70,13 +70,13 @@ func (c *Commands) changeDefaultDebugNotificationProviderLog(ctx context.Context return nil, err } if !existingProvider.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-2h0s3", "Errors.IAM.DebugNotificationProvider.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-2h0s3", "Errors.IAM.DebugNotificationProvider.NotFound") } changedEvent, hasChanged := existingProvider.NewChangedEvent(ctx, instanceAgg, fileSystemProvider.Compact) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-fn9p3", "Errors.IAM.LoginPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-fn9p3", "Errors.IAM.LoginPolicy.NotChanged") } return changedEvent, nil } @@ -89,7 +89,7 @@ func (c *Commands) RemoveDefaultNotificationLog(ctx context.Context) (*domain.Ob return nil, err } if !existingProvider.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-39lse", "Errors.IAM.DebugNotificationProvider.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-39lse", "Errors.IAM.DebugNotificationProvider.NotFound") } events, err := c.eventstore.Push(ctx, instance.NewDebugNotificationProviderLogRemovedEvent(ctx, instanceAgg)) diff --git a/internal/command/instance_debug_notification_log_test.go b/internal/command/instance_debug_notification_log_test.go index cb7031feb..bac918602 100644 --- a/internal/command/instance_debug_notification_log_test.go +++ b/internal/command/instance_debug_notification_log_test.go @@ -8,11 +8,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/notification/channels/fs" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/settings" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultDebugNotificationProviderLog(t *testing.T) { @@ -58,7 +58,7 @@ func TestCommandSide_AddDefaultDebugNotificationProviderLog(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -169,7 +169,7 @@ func TestCommandSide_ChangeDebugNotificationProviderLog(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -195,7 +195,7 @@ func TestCommandSide_ChangeDebugNotificationProviderLog(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -313,7 +313,7 @@ func TestCommandSide_RemoveDebugNotificationProviderLog(t *testing.T) { ctx: ctx, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/instance_domain.go b/internal/command/instance_domain.go index 02ff63d40..d5f6808cf 100644 --- a/internal/command/instance_domain.go +++ b/internal/command/instance_domain.go @@ -9,10 +9,10 @@ import ( "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -87,10 +87,10 @@ func (c *Commands) addGeneratedInstanceDomain(ctx context.Context, a *instance.A func (c *Commands) addInstanceDomain(a *instance.Aggregate, instanceDomain string, generated bool) preparation.Validation { return func() (preparation.CreateCommands, error) { if instanceDomain = strings.TrimSpace(instanceDomain); instanceDomain == "" { - return nil, errors.ThrowInvalidArgument(nil, "INST-28nlD", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-28nlD", "Errors.Invalid.Argument") } if !allowDomainRunes.MatchString(instanceDomain) { - return nil, errors.ThrowInvalidArgument(nil, "INST-S3v3w", "Errors.Instance.Domain.InvalidCharacter") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-S3v3w", "Errors.Instance.Domain.InvalidCharacter") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { domainWriteModel, err := getInstanceDomainWriteModel(ctx, filter, instanceDomain) @@ -98,7 +98,7 @@ func (c *Commands) addInstanceDomain(a *instance.Aggregate, instanceDomain strin return nil, err } if domainWriteModel.State == domain.InstanceDomainStateActive { - return nil, errors.ThrowAlreadyExists(nil, "INST-i2nl", "Errors.Instance.Domain.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INST-i2nl", "Errors.Instance.Domain.AlreadyExists") } events := []eventstore.Command{ instance.NewDomainAddedEvent(ctx, &a.Aggregate, instanceDomain, generated), @@ -118,7 +118,7 @@ func (c *Commands) addInstanceDomain(a *instance.Aggregate, instanceDomain strin func (c *Commands) prepareUpdateConsoleRedirectURIs(instanceDomain string) preparation.Validation { return func() (preparation.CreateCommands, error) { if instanceDomain = strings.TrimSpace(instanceDomain); instanceDomain == "" { - return nil, errors.ThrowInvalidArgument(nil, "INST-E3j3s", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-E3j3s", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { consoleChangeEvent, err := c.updateConsoleRedirectURIs(ctx, filter, instanceDomain) @@ -166,7 +166,7 @@ func (c *Commands) updateConsoleRedirectURIs(ctx context.Context, filter prepara func setPrimaryInstanceDomain(a *instance.Aggregate, instanceDomain string) preparation.Validation { return func() (preparation.CreateCommands, error) { if instanceDomain = strings.TrimSpace(instanceDomain); instanceDomain == "" { - return nil, errors.ThrowInvalidArgument(nil, "INST-9mWjf", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-9mWjf", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { domainWriteModel, err := getInstanceDomainWriteModel(ctx, filter, instanceDomain) @@ -174,7 +174,7 @@ func setPrimaryInstanceDomain(a *instance.Aggregate, instanceDomain string) prep return nil, err } if !domainWriteModel.State.Exists() { - return nil, errors.ThrowNotFound(nil, "INSTANCE-9nkWf", "Errors.Instance.Domain.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-9nkWf", "Errors.Instance.Domain.NotFound") } return []eventstore.Command{instance.NewDomainPrimarySetEvent(ctx, &a.Aggregate, instanceDomain)}, nil }, nil @@ -184,7 +184,7 @@ func setPrimaryInstanceDomain(a *instance.Aggregate, instanceDomain string) prep func removeInstanceDomain(a *instance.Aggregate, instanceDomain string) preparation.Validation { return func() (preparation.CreateCommands, error) { if instanceDomain = strings.TrimSpace(instanceDomain); instanceDomain == "" { - return nil, errors.ThrowInvalidArgument(nil, "INST-39nls", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-39nls", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { domainWriteModel, err := getInstanceDomainWriteModel(ctx, filter, instanceDomain) @@ -192,10 +192,10 @@ func removeInstanceDomain(a *instance.Aggregate, instanceDomain string) preparat return nil, err } if domainWriteModel.State != domain.InstanceDomainStateActive { - return nil, errors.ThrowNotFound(nil, "INSTANCE-8ls9f", "Errors.Instance.Domain.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-8ls9f", "Errors.Instance.Domain.NotFound") } if domainWriteModel.Generated { - return nil, errors.ThrowPreconditionFailed(nil, "INSTANCE-9hn3n", "Errors.Instance.Domain.GeneratedNotRemovable") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-9hn3n", "Errors.Instance.Domain.GeneratedNotRemovable") } return []eventstore.Command{instance.NewDomainRemovedEvent(ctx, &a.Aggregate, instanceDomain)}, nil }, nil diff --git a/internal/command/instance_domain_test.go b/internal/command/instance_domain_test.go index abeab0f3b..97129ec4e 100644 --- a/internal/command/instance_domain_test.go +++ b/internal/command/instance_domain_test.go @@ -10,10 +10,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddInstanceDomain(t *testing.T) { @@ -47,7 +47,7 @@ func TestCommandSide_AddInstanceDomain(t *testing.T) { domain: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -62,7 +62,7 @@ func TestCommandSide_AddInstanceDomain(t *testing.T) { domain: "hodor's-org.localhost", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -77,7 +77,7 @@ func TestCommandSide_AddInstanceDomain(t *testing.T) { domain: "bücher.ch", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -92,7 +92,7 @@ func TestCommandSide_AddInstanceDomain(t *testing.T) { domain: "🦒.ch", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -116,7 +116,7 @@ func TestCommandSide_AddInstanceDomain(t *testing.T) { domain: "domain.ch", }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -239,7 +239,7 @@ func TestCommandSide_SetPrimaryInstanceDomain(t *testing.T) { domain: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -255,7 +255,7 @@ func TestCommandSide_SetPrimaryInstanceDomain(t *testing.T) { domain: "domain.ch", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -341,7 +341,7 @@ func TestCommandSide_RemoveInstanceDomain(t *testing.T) { domain: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -357,7 +357,7 @@ func TestCommandSide_RemoveInstanceDomain(t *testing.T) { domain: "domain.ch", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -414,7 +414,7 @@ func TestCommandSide_RemoveInstanceDomain(t *testing.T) { domain: "domain.ch", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, } diff --git a/internal/command/instance_feature.go b/internal/command/instance_feature.go index 6aee52c09..4ee36b94c 100644 --- a/internal/command/instance_feature.go +++ b/internal/command/instance_feature.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/repository/feature" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) SetBooleanInstanceFeature(ctx context.Context, f domain.Feature, value bool) (*domain.ObjectDetails, error) { @@ -36,7 +36,7 @@ func (c *Commands) SetBooleanInstanceFeature(ctx context.Context, f domain.Featu func prepareSetFeature[T feature.SetEventType](writeModel *InstanceFeatureWriteModel[T], value T, idGenerator id.Generator) preparation.Validation { return func() (preparation.CreateCommands, error) { if !writeModel.feature.IsAFeature() || writeModel.feature == domain.FeatureUnspecified { - return nil, errors.ThrowPreconditionFailed(nil, "FEAT-JK3td", "Errors.Feature.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "FEAT-JK3td", "Errors.Feature.NotExisting") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) diff --git a/internal/command/instance_feature_model.go b/internal/command/instance_feature_model.go index 1389735ca..5014b1c76 100644 --- a/internal/command/instance_feature_model.go +++ b/internal/command/instance_feature_model.go @@ -4,9 +4,9 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/feature" + "github.com/zitadel/zitadel/internal/zerrors" ) type FeatureWriteModel[T feature.SetEventType] struct { @@ -26,7 +26,7 @@ func NewFeatureWriteModel[T feature.SetEventType](instanceID, resourceOwner stri feature: feature, } if wm.Value.FeatureType() != feature.Type() { - return nil, errors.ThrowPreconditionFailed(nil, "FEAT-AS4k1", "Errors.Feature.InvalidValue") + return nil, zerrors.ThrowPreconditionFailed(nil, "FEAT-AS4k1", "Errors.Feature.InvalidValue") } return wm, nil } @@ -56,7 +56,7 @@ func (wm *FeatureWriteModel[T]) Reduce() error { case *feature.SetEvent[T]: wm.Value = e.Value default: - return errors.ThrowPreconditionFailed(nil, "FEAT-SDfjk", "Errors.Feature.TypeNotSupported") + return zerrors.ThrowPreconditionFailed(nil, "FEAT-SDfjk", "Errors.Feature.TypeNotSupported") } } return wm.WriteModel.Reduce() diff --git a/internal/command/instance_feature_test.go b/internal/command/instance_feature_test.go index 31ccb5888..56933b900 100644 --- a/internal/command/instance_feature_test.go +++ b/internal/command/instance_feature_test.go @@ -8,12 +8,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/feature" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_SetBooleanInstanceFeature(t *testing.T) { @@ -47,7 +47,7 @@ func TestCommands_SetBooleanInstanceFeature(t *testing.T) { value: true, }, res{ - err: errors.ThrowPreconditionFailed(nil, "FEAT-AS4k1", "Errors.Feature.InvalidValue"), + err: zerrors.ThrowPreconditionFailed(nil, "FEAT-AS4k1", "Errors.Feature.InvalidValue"), }, }, { @@ -71,7 +71,7 @@ func TestCommands_SetBooleanInstanceFeature(t *testing.T) { value: true, }, res{ - err: errors.ThrowPreconditionFailed(nil, "FEAT-SDfjk", "Errors.Feature.TypeNotSupported"), + err: zerrors.ThrowPreconditionFailed(nil, "FEAT-SDfjk", "Errors.Feature.TypeNotSupported"), }, }, { diff --git a/internal/command/instance_idp.go b/internal/command/instance_idp.go index 31b284f8c..ed8d458e1 100644 --- a/internal/command/instance_idp.go +++ b/internal/command/instance_idp.go @@ -10,9 +10,9 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddInstanceGenericOAuthProvider(ctx context.Context, provider GenericOAuthProvider) (string, *domain.ObjectDetails, error) { @@ -119,7 +119,7 @@ func (c *Commands) migrateInstanceGenericOIDC(ctx context.Context, id string, pr case GoogleProvider: validation = c.prepareMigrateInstanceOIDCToGoogleProvider(instanceAgg, writeModel, p) default: - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-s9219", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-s9219", "Errors.IDPConfig.NotExisting") } cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, validation) @@ -609,25 +609,25 @@ func ExistsInstanceIDP(ctx context.Context, filter preparation.FilterToQueryRedu func (c *Commands) prepareAddInstanceOAuthProvider(a *instance.Aggregate, writeModel *InstanceOAuthIDPWriteModel, provider GenericOAuthProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-D32ef", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-D32ef", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Dbgzf", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Dbgzf", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-DF4ga", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-DF4ga", "Errors.Invalid.Argument") } if provider.AuthorizationEndpoint = strings.TrimSpace(provider.AuthorizationEndpoint); provider.AuthorizationEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-B23bs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-B23bs", "Errors.Invalid.Argument") } if provider.TokenEndpoint = strings.TrimSpace(provider.TokenEndpoint); provider.TokenEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-D2gj8", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-D2gj8", "Errors.Invalid.Argument") } if provider.UserEndpoint = strings.TrimSpace(provider.UserEndpoint); provider.UserEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Fb8jk", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Fb8jk", "Errors.Invalid.Argument") } if provider.IDAttribute = strings.TrimSpace(provider.IDAttribute); provider.IDAttribute == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-sdf3f", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-sdf3f", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -665,25 +665,25 @@ func (c *Commands) prepareAddInstanceOAuthProvider(a *instance.Aggregate, writeM func (c *Commands) prepareUpdateInstanceOAuthProvider(a *instance.Aggregate, writeModel *InstanceOAuthIDPWriteModel, provider GenericOAuthProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SAffg", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SAffg", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Sf3gh", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Sf3gh", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SHJ3ui", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SHJ3ui", "Errors.Invalid.Argument") } if provider.AuthorizationEndpoint = strings.TrimSpace(provider.AuthorizationEndpoint); provider.AuthorizationEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SVrgh", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SVrgh", "Errors.Invalid.Argument") } if provider.TokenEndpoint = strings.TrimSpace(provider.TokenEndpoint); provider.TokenEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-DJKeio", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-DJKeio", "Errors.Invalid.Argument") } if provider.UserEndpoint = strings.TrimSpace(provider.UserEndpoint); provider.UserEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-ILSJi", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-ILSJi", "Errors.Invalid.Argument") } if provider.IDAttribute = strings.TrimSpace(provider.IDAttribute); provider.IDAttribute == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-JKD3h", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-JKD3h", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -695,7 +695,7 @@ func (c *Commands) prepareUpdateInstanceOAuthProvider(a *instance.Aggregate, wri return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-D3r1s", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-D3r1s", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -723,16 +723,16 @@ func (c *Commands) prepareUpdateInstanceOAuthProvider(a *instance.Aggregate, wri func (c *Commands) prepareAddInstanceOIDCProvider(a *instance.Aggregate, writeModel *InstanceOIDCIDPWriteModel, provider GenericOIDCProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Sgtj5", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Sgtj5", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Hz6zj", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Hz6zj", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-fb5jm", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-fb5jm", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Sfdf4", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Sfdf4", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -768,16 +768,16 @@ func (c *Commands) prepareAddInstanceOIDCProvider(a *instance.Aggregate, writeMo func (c *Commands) prepareUpdateInstanceOIDCProvider(a *instance.Aggregate, writeModel *InstanceOIDCIDPWriteModel, provider GenericOIDCProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SAfd3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SAfd3", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Dvf4f", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Dvf4f", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-BDfr3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-BDfr3", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Db3bs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Db3bs", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -789,7 +789,7 @@ func (c *Commands) prepareUpdateInstanceOIDCProvider(a *instance.Aggregate, writ return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-Dg331", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-Dg331", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -815,13 +815,13 @@ func (c *Commands) prepareUpdateInstanceOIDCProvider(a *instance.Aggregate, writ func (c *Commands) prepareMigrateInstanceOIDCToAzureADProvider(a *instance.Aggregate, writeModel *InstanceOIDCIDPWriteModel, provider AzureADProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-sdf3g", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-sdf3g", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Fhbr2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Fhbr2", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Dzh3g", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Dzh3g", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -833,7 +833,7 @@ func (c *Commands) prepareMigrateInstanceOIDCToAzureADProvider(a *instance.Aggre return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-Dg29201", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-Dg29201", "Errors.IDPConfig.NotExisting") } secret, err := crypto.Encrypt([]byte(provider.ClientSecret), c.idpConfigEncryption) if err != nil { @@ -860,10 +860,10 @@ func (c *Commands) prepareMigrateInstanceOIDCToAzureADProvider(a *instance.Aggre func (c *Commands) prepareMigrateInstanceOIDCToGoogleProvider(a *instance.Aggregate, writeModel *InstanceOIDCIDPWriteModel, provider GoogleProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-D3fvs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-D3fvs", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-W2vqs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-W2vqs", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -875,7 +875,7 @@ func (c *Commands) prepareMigrateInstanceOIDCToGoogleProvider(a *instance.Aggreg return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-Dg29202", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-Dg29202", "Errors.IDPConfig.NotExisting") } secret, err := crypto.Encrypt([]byte(provider.ClientSecret), c.idpConfigEncryption) if err != nil { @@ -900,19 +900,19 @@ func (c *Commands) prepareMigrateInstanceOIDCToGoogleProvider(a *instance.Aggreg func (c *Commands) prepareAddInstanceJWTProvider(a *instance.Aggregate, writeModel *InstanceJWTIDPWriteModel, provider JWTProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-JLKef", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-JLKef", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-WNJK3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-WNJK3", "Errors.Invalid.Argument") } if provider.JWTEndpoint = strings.TrimSpace(provider.JWTEndpoint); provider.JWTEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-NJKSD", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-NJKSD", "Errors.Invalid.Argument") } if provider.KeyEndpoint = strings.TrimSpace(provider.KeyEndpoint); provider.KeyEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-NJKE3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-NJKE3", "Errors.Invalid.Argument") } if provider.HeaderName = strings.TrimSpace(provider.HeaderName); provider.HeaderName == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-2rlks", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-2rlks", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -943,22 +943,22 @@ func (c *Commands) prepareAddInstanceJWTProvider(a *instance.Aggregate, writeMod func (c *Commands) prepareUpdateInstanceJWTProvider(a *instance.Aggregate, writeModel *InstanceJWTIDPWriteModel, provider JWTProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-HUe3q", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-HUe3q", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-JKLS2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-JKLS2", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-JKs3f", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-JKs3f", "Errors.Invalid.Argument") } if provider.JWTEndpoint = strings.TrimSpace(provider.JWTEndpoint); provider.JWTEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-NJKS2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-NJKS2", "Errors.Invalid.Argument") } if provider.KeyEndpoint = strings.TrimSpace(provider.KeyEndpoint); provider.KeyEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SJk2d", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SJk2d", "Errors.Invalid.Argument") } if provider.HeaderName = strings.TrimSpace(provider.HeaderName); provider.HeaderName == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SJK2f", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SJK2f", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -970,7 +970,7 @@ func (c *Commands) prepareUpdateInstanceJWTProvider(a *instance.Aggregate, write return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-Bhju5", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-Bhju5", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -994,13 +994,13 @@ func (c *Commands) prepareUpdateInstanceJWTProvider(a *instance.Aggregate, write func (c *Commands) prepareAddInstanceAzureADProvider(a *instance.Aggregate, writeModel *InstanceAzureADIDPWriteModel, provider AzureADProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-sdf3g", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-sdf3g", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Fhbr2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Fhbr2", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Dzh3g", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Dzh3g", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1036,13 +1036,13 @@ func (c *Commands) prepareAddInstanceAzureADProvider(a *instance.Aggregate, writ func (c *Commands) prepareUpdateInstanceAzureADProvider(a *instance.Aggregate, writeModel *InstanceAzureADIDPWriteModel, provider AzureADProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SAgh2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SAgh2", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-fh3h1", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-fh3h1", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-dmitg", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-dmitg", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1054,7 +1054,7 @@ func (c *Commands) prepareUpdateInstanceAzureADProvider(a *instance.Aggregate, w return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-BHz3q", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-BHz3q", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1080,10 +1080,10 @@ func (c *Commands) prepareUpdateInstanceAzureADProvider(a *instance.Aggregate, w func (c *Commands) prepareAddInstanceGitHubProvider(a *instance.Aggregate, writeModel *InstanceGitHubIDPWriteModel, provider GitHubProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Jdsgf", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Jdsgf", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-dsgz3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-dsgz3", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1117,10 +1117,10 @@ func (c *Commands) prepareAddInstanceGitHubProvider(a *instance.Aggregate, write func (c *Commands) prepareUpdateInstanceGitHubProvider(a *instance.Aggregate, writeModel *InstanceGitHubIDPWriteModel, provider GitHubProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-sdf4h", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-sdf4h", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-fdh5z", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-fdh5z", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1132,7 +1132,7 @@ func (c *Commands) prepareUpdateInstanceGitHubProvider(a *instance.Aggregate, wr return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-Dr1gs", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-Dr1gs", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1156,22 +1156,22 @@ func (c *Commands) prepareUpdateInstanceGitHubProvider(a *instance.Aggregate, wr func (c *Commands) prepareAddInstanceGitHubEnterpriseProvider(a *instance.Aggregate, writeModel *InstanceGitHubEnterpriseIDPWriteModel, provider GitHubEnterpriseProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Dg4td", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Dg4td", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-dgj53", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-dgj53", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Ghjjs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Ghjjs", "Errors.Invalid.Argument") } if provider.AuthorizationEndpoint = strings.TrimSpace(provider.AuthorizationEndpoint); provider.AuthorizationEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-sani2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-sani2", "Errors.Invalid.Argument") } if provider.TokenEndpoint = strings.TrimSpace(provider.TokenEndpoint); provider.TokenEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-agj42", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-agj42", "Errors.Invalid.Argument") } if provider.UserEndpoint = strings.TrimSpace(provider.UserEndpoint); provider.UserEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-sd5hn", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-sd5hn", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1208,22 +1208,22 @@ func (c *Commands) prepareAddInstanceGitHubEnterpriseProvider(a *instance.Aggreg func (c *Commands) prepareUpdateInstanceGitHubEnterpriseProvider(a *instance.Aggregate, writeModel *InstanceGitHubEnterpriseIDPWriteModel, provider GitHubEnterpriseProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-sdfh3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-sdfh3", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-shj42", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-shj42", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-sdh73", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-sdh73", "Errors.Invalid.Argument") } if provider.AuthorizationEndpoint = strings.TrimSpace(provider.AuthorizationEndpoint); provider.AuthorizationEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-acx2w", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-acx2w", "Errors.Invalid.Argument") } if provider.TokenEndpoint = strings.TrimSpace(provider.TokenEndpoint); provider.TokenEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-dgj6q", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-dgj6q", "Errors.Invalid.Argument") } if provider.UserEndpoint = strings.TrimSpace(provider.UserEndpoint); provider.UserEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-ybj62", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-ybj62", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1235,7 +1235,7 @@ func (c *Commands) prepareUpdateInstanceGitHubEnterpriseProvider(a *instance.Agg return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-GBr42", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-GBr42", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1262,10 +1262,10 @@ func (c *Commands) prepareUpdateInstanceGitHubEnterpriseProvider(a *instance.Agg func (c *Commands) prepareAddInstanceGitLabProvider(a *instance.Aggregate, writeModel *InstanceGitLabIDPWriteModel, provider GitLabProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-adsg2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-adsg2", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-GD1j2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-GD1j2", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1299,10 +1299,10 @@ func (c *Commands) prepareAddInstanceGitLabProvider(a *instance.Aggregate, write func (c *Commands) prepareUpdateInstanceGitLabProvider(a *instance.Aggregate, writeModel *InstanceGitLabIDPWriteModel, provider GitLabProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-HJK91", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-HJK91", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-D12t6", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-D12t6", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1314,7 +1314,7 @@ func (c *Commands) prepareUpdateInstanceGitLabProvider(a *instance.Aggregate, wr return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-HBReq", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-HBReq", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1338,16 +1338,16 @@ func (c *Commands) prepareUpdateInstanceGitLabProvider(a *instance.Aggregate, wr func (c *Commands) prepareAddInstanceGitLabSelfHostedProvider(a *instance.Aggregate, writeModel *InstanceGitLabSelfHostedIDPWriteModel, provider GitLabSelfHostedProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-jw4ZT", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-jw4ZT", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-AST4S", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-AST4S", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-DBZHJ", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-DBZHJ", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SDGJ4", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SDGJ4", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1382,16 +1382,16 @@ func (c *Commands) prepareAddInstanceGitLabSelfHostedProvider(a *instance.Aggreg func (c *Commands) prepareUpdateInstanceGitLabSelfHostedProvider(a *instance.Aggregate, writeModel *InstanceGitLabSelfHostedIDPWriteModel, provider GitLabSelfHostedProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SAFG4", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SAFG4", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-DG4H", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-DG4H", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SD4eb", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SD4eb", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-GHWE3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-GHWE3", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1403,7 +1403,7 @@ func (c *Commands) prepareUpdateInstanceGitLabSelfHostedProvider(a *instance.Agg return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-D2tg1", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-D2tg1", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1428,10 +1428,10 @@ func (c *Commands) prepareUpdateInstanceGitLabSelfHostedProvider(a *instance.Agg func (c *Commands) prepareAddInstanceGoogleProvider(a *instance.Aggregate, writeModel *InstanceGoogleIDPWriteModel, provider GoogleProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-D3fvs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-D3fvs", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-W2vqs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-W2vqs", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1465,10 +1465,10 @@ func (c *Commands) prepareAddInstanceGoogleProvider(a *instance.Aggregate, write func (c *Commands) prepareUpdateInstanceGoogleProvider(a *instance.Aggregate, writeModel *InstanceGoogleIDPWriteModel, provider GoogleProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-S32t1", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-S32t1", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-ds432", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-ds432", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1480,7 +1480,7 @@ func (c *Commands) prepareUpdateInstanceGoogleProvider(a *instance.Aggregate, wr return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-D3r1s", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-D3r1s", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1504,28 +1504,28 @@ func (c *Commands) prepareUpdateInstanceGoogleProvider(a *instance.Aggregate, wr func (c *Commands) prepareAddInstanceLDAPProvider(a *instance.Aggregate, writeModel *InstanceLDAPIDPWriteModel, provider LDAPProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SAfdd", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SAfdd", "Errors.Invalid.Argument") } if provider.BaseDN = strings.TrimSpace(provider.BaseDN); provider.BaseDN == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-sv31s", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-sv31s", "Errors.Invalid.Argument") } if provider.BindDN = strings.TrimSpace(provider.BindDN); provider.BindDN == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-sdgf4", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-sdgf4", "Errors.Invalid.Argument") } if provider.BindPassword = strings.TrimSpace(provider.BindPassword); provider.BindPassword == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-AEG2w", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-AEG2w", "Errors.Invalid.Argument") } if provider.UserBase = strings.TrimSpace(provider.UserBase); provider.UserBase == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SAD5n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SAD5n", "Errors.Invalid.Argument") } if len(provider.Servers) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SAx905n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SAx905n", "Errors.Invalid.Argument") } if len(provider.UserObjectClasses) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-S1x905n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-S1x905n", "Errors.Invalid.Argument") } if len(provider.UserFilters) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-aAx905n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-aAx905n", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1566,28 +1566,28 @@ func (c *Commands) prepareAddInstanceLDAPProvider(a *instance.Aggregate, writeMo func (c *Commands) prepareUpdateInstanceLDAPProvider(a *instance.Aggregate, writeModel *InstanceLDAPIDPWriteModel, provider LDAPProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Dgdbs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Dgdbs", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Sffgd", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Sffgd", "Errors.Invalid.Argument") } if provider.BaseDN = strings.TrimSpace(provider.BaseDN); provider.BaseDN == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-vb3ss", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-vb3ss", "Errors.Invalid.Argument") } if provider.BindDN = strings.TrimSpace(provider.BindDN); provider.BindDN == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-hbere", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-hbere", "Errors.Invalid.Argument") } if provider.UserBase = strings.TrimSpace(provider.UserBase); provider.UserBase == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-DG45z", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-DG45z", "Errors.Invalid.Argument") } if len(provider.Servers) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SAx945n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SAx945n", "Errors.Invalid.Argument") } if len(provider.UserObjectClasses) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-S1x605n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-S1x605n", "Errors.Invalid.Argument") } if len(provider.UserFilters) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-aAx901n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-aAx901n", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1599,7 +1599,7 @@ func (c *Commands) prepareUpdateInstanceLDAPProvider(a *instance.Aggregate, writ return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-ASF3F", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-ASF3F", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1630,16 +1630,16 @@ func (c *Commands) prepareUpdateInstanceLDAPProvider(a *instance.Aggregate, writ func (c *Commands) prepareAddInstanceAppleProvider(a *instance.Aggregate, writeModel *InstanceAppleIDPWriteModel, provider AppleProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-jkn3w", "Errors.IDP.ClientIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-jkn3w", "Errors.IDP.ClientIDMissing") } if provider.TeamID = strings.TrimSpace(provider.TeamID); provider.TeamID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Ffg32", "Errors.IDP.TeamIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Ffg32", "Errors.IDP.TeamIDMissing") } if provider.KeyID = strings.TrimSpace(provider.KeyID); provider.KeyID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-GDjm5", "Errors.IDP.KeyIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-GDjm5", "Errors.IDP.KeyIDMissing") } if len(provider.PrivateKey) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-GVD4n", "Errors.IDP.PrivateKeyMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-GVD4n", "Errors.IDP.PrivateKeyMissing") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1675,16 +1675,16 @@ func (c *Commands) prepareAddInstanceAppleProvider(a *instance.Aggregate, writeM func (c *Commands) prepareUpdateInstanceAppleProvider(a *instance.Aggregate, writeModel *InstanceAppleIDPWriteModel, provider AppleProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-FRHBH", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-FRHBH", "Errors.IDMissing") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SFm4l", "Errors.IDP.ClientIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SFm4l", "Errors.IDP.ClientIDMissing") } if provider.TeamID = strings.TrimSpace(provider.TeamID); provider.TeamID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-SG34t", "Errors.IDP.TeamIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-SG34t", "Errors.IDP.TeamIDMissing") } if provider.KeyID = strings.TrimSpace(provider.KeyID); provider.KeyID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-Gh4z2", "Errors.IDP.KeyIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Gh4z2", "Errors.IDP.KeyIDMissing") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1696,7 +1696,7 @@ func (c *Commands) prepareUpdateInstanceAppleProvider(a *instance.Aggregate, wri return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-SG3bh", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-SG3bh", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1722,17 +1722,17 @@ func (c *Commands) prepareUpdateInstanceAppleProvider(a *instance.Aggregate, wri func (c *Commands) prepareAddInstanceSAMLProvider(a *instance.Aggregate, writeModel *InstanceSAMLIDPWriteModel, provider SAMLProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-o07zjotgnd", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-o07zjotgnd", "Errors.Invalid.Argument") } if provider.Metadata == nil && provider.MetadataURL != "" { data, err := xml.ReadMetadataFromURL(c.httpClient, provider.MetadataURL) if err != nil { - return nil, caos_errs.ThrowInvalidArgument(err, "INST-8vam1khq22", "Errors.Project.App.SAMLMetadataMissing") + return nil, zerrors.ThrowInvalidArgument(err, "INST-8vam1khq22", "Errors.Project.App.SAMLMetadataMissing") } provider.Metadata = data } if provider.Metadata == nil { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-3bi3esi16t", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-3bi3esi16t", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1773,18 +1773,18 @@ func (c *Commands) prepareAddInstanceSAMLProvider(a *instance.Aggregate, writeMo func (c *Commands) prepareUpdateInstanceSAMLProvider(a *instance.Aggregate, writeModel *InstanceSAMLIDPWriteModel, provider SAMLProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-7o3rq1owpm", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-7o3rq1owpm", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-q2s9rak7o9", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-q2s9rak7o9", "Errors.Invalid.Argument") } if provider.Metadata == nil && provider.MetadataURL == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-iw1rxnf4sf", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-iw1rxnf4sf", "Errors.Invalid.Argument") } if provider.Metadata == nil && provider.MetadataURL != "" { data, err := xml.ReadMetadataFromURL(c.httpClient, provider.MetadataURL) if err != nil { - return nil, caos_errs.ThrowInvalidArgument(err, "INST-iijz4h01if", "Errors.Project.App.SAMLMetadataMissing") + return nil, zerrors.ThrowInvalidArgument(err, "INST-iijz4h01if", "Errors.Project.App.SAMLMetadataMissing") } provider.Metadata = data } @@ -1798,7 +1798,7 @@ func (c *Commands) prepareUpdateInstanceSAMLProvider(a *instance.Aggregate, writ return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-D3r1s", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-D3r1s", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1824,7 +1824,7 @@ func (c *Commands) prepareUpdateInstanceSAMLProvider(a *instance.Aggregate, writ func (c *Commands) prepareRegenerateInstanceSAMLProviderCertificate(a *instance.Aggregate, writeModel *InstanceSAMLIDPWriteModel) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INST-7de108gqya", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-7de108gqya", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1836,7 +1836,7 @@ func (c *Commands) prepareRegenerateInstanceSAMLProviderCertificate(a *instance. return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-76dbwsv9vm", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-76dbwsv9vm", "Errors.IDPConfig.NotExisting") } key, cert, err := c.samlCertificateAndKeyGenerator(writeModel.ID) @@ -1877,7 +1877,7 @@ func (c *Commands) prepareDeleteInstanceProvider(a *instance.Aggregate, id strin return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-Se3tg", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-Se3tg", "Errors.IDPConfig.NotExisting") } return []eventstore.Command{instance.NewIDPRemovedEvent(ctx, &a.Aggregate, id)}, nil }, nil diff --git a/internal/command/instance_idp_config.go b/internal/command/instance_idp_config.go index 69ee99168..791ac6545 100644 --- a/internal/command/instance_idp_config.go +++ b/internal/command/instance_idp_config.go @@ -6,15 +6,15 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDefaultIDPConfig(ctx context.Context, config *domain.IDPConfig) (*domain.IDPConfig, error) { if config.OIDCConfig == nil && config.JWTConfig == nil { - return nil, errors.ThrowInvalidArgument(nil, "IDP-s8nn3", "Errors.IDPConfig.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "IDP-s8nn3", "Errors.IDPConfig.Invalid") } idpConfigID, err := c.idGenerator.Next() if err != nil { @@ -77,20 +77,20 @@ func (c *Commands) AddDefaultIDPConfig(ctx context.Context, config *domain.IDPCo func (c *Commands) ChangeDefaultIDPConfig(ctx context.Context, config *domain.IDPConfig) (*domain.IDPConfig, error) { if config.IDPConfigID == "" { - return nil, errors.ThrowInvalidArgument(nil, "INSTANCE-4m9gs", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-4m9gs", "Errors.IDMissing") } existingIDP, err := c.instanceIDPConfigWriteModelByID(ctx, config.IDPConfigID) if err != nil { return nil, err } if existingIDP.State == domain.IDPConfigStateRemoved || existingIDP.State == domain.IDPConfigStateUnspecified { - return nil, errors.ThrowNotFound(nil, "INSTANCE-m0e3r", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-m0e3r", "Errors.IDPConfig.NotExisting") } instanceAgg := InstanceAggregateFromWriteModel(&existingIDP.WriteModel) changedEvent, hasChanged := existingIDP.NewChangedEvent(ctx, instanceAgg, config.IDPConfigID, config.Name, config.StylingType, config.AutoRegister) if !hasChanged { - return nil, errors.ThrowPreconditionFailed(nil, "INSTANCE-3k0fs", "Errors.IAM.IDPConfig.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-3k0fs", "Errors.IAM.IDPConfig.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { @@ -109,7 +109,7 @@ func (c *Commands) DeactivateDefaultIDPConfig(ctx context.Context, idpID string) return nil, err } if existingIDP.State != domain.IDPConfigStateActive { - return nil, errors.ThrowPreconditionFailed(nil, "INSTANCE-2n0fs", "Errors.IAM.IDPConfig.NotActive") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-2n0fs", "Errors.IAM.IDPConfig.NotActive") } instanceAgg := InstanceAggregateFromWriteModel(&existingIDP.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewIDPConfigDeactivatedEvent(ctx, instanceAgg, idpID)) @@ -129,7 +129,7 @@ func (c *Commands) ReactivateDefaultIDPConfig(ctx context.Context, idpID string) return nil, err } if existingIDP.State != domain.IDPConfigStateInactive { - return nil, errors.ThrowPreconditionFailed(nil, "INSTANCE-5Mo0d", "Errors.IAM.IDPConfig.NotInactive") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-5Mo0d", "Errors.IAM.IDPConfig.NotInactive") } instanceAgg := InstanceAggregateFromWriteModel(&existingIDP.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewIDPConfigReactivatedEvent(ctx, instanceAgg, idpID)) @@ -149,7 +149,7 @@ func (c *Commands) RemoveDefaultIDPConfig(ctx context.Context, idpID string, idp return nil, err } if existingIDP.State == domain.IDPConfigStateRemoved || existingIDP.State == domain.IDPConfigStateUnspecified { - return nil, errors.ThrowNotFound(nil, "INSTANCE-4M0xy", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-4M0xy", "Errors.IDPConfig.NotExisting") } instanceAgg := InstanceAggregateFromWriteModel(&existingIDP.WriteModel) @@ -184,7 +184,7 @@ func (c *Commands) getInstanceIDPConfigByID(ctx context.Context, idpID string) ( return nil, err } if !config.State.Exists() { - return nil, errors.ThrowNotFound(nil, "INSTANCE-p0pFF", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-p0pFF", "Errors.IDPConfig.NotExisting") } return writeModelToIDPConfig(&config.IDPConfigWriteModel), nil } diff --git a/internal/command/instance_idp_config_test.go b/internal/command/instance_idp_config_test.go index 3c6b829ca..5930db361 100644 --- a/internal/command/instance_idp_config_test.go +++ b/internal/command/instance_idp_config_test.go @@ -10,13 +10,13 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultIDPConfig(t *testing.T) { @@ -51,7 +51,7 @@ func TestCommandSide_AddDefaultIDPConfig(t *testing.T) { config: &domain.IDPConfig{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -228,7 +228,7 @@ func TestCommandSide_ChangeDefaultIDPConfig(t *testing.T) { config: &domain.IDPConfig{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -246,7 +246,7 @@ func TestCommandSide_ChangeDefaultIDPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/instance_idp_jwt_config.go b/internal/command/instance_idp_jwt_config.go index e13d429cb..f2fdc376f 100644 --- a/internal/command/instance_idp_jwt_config.go +++ b/internal/command/instance_idp_jwt_config.go @@ -4,12 +4,12 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ChangeDefaultIDPJWTConfig(ctx context.Context, config *domain.JWTIDPConfig) (*domain.JWTIDPConfig, error) { if config.IDPConfigID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-m9322", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-m9322", "Errors.IDMissing") } existingConfig := NewInstanceIDPJWTConfigWriteModel(ctx, config.IDPConfigID) err := c.eventstore.FilterToQueryReducer(ctx, existingConfig) @@ -18,7 +18,7 @@ func (c *Commands) ChangeDefaultIDPJWTConfig(ctx context.Context, config *domain } if existingConfig.State == domain.IDPConfigStateRemoved || existingConfig.State == domain.IDPConfigStateUnspecified { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-2m00d", "Errors.IAM.IDPConfig.AlreadyExists") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-2m00d", "Errors.IAM.IDPConfig.AlreadyExists") } instanceAgg := InstanceAggregateFromWriteModel(&existingConfig.WriteModel) @@ -34,7 +34,7 @@ func (c *Commands) ChangeDefaultIDPJWTConfig(ctx context.Context, config *domain return nil, err } if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-3n9gg", "Errors.IAM.IDPConfig.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-3n9gg", "Errors.IAM.IDPConfig.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) diff --git a/internal/command/instance_idp_jwt_config_test.go b/internal/command/instance_idp_jwt_config_test.go index 37c32c4d3..da82a6e97 100644 --- a/internal/command/instance_idp_jwt_config_test.go +++ b/internal/command/instance_idp_jwt_config_test.go @@ -9,11 +9,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ChangeDefaultIDPJWTConfig(t *testing.T) { @@ -51,7 +51,7 @@ func TestCommandSide_ChangeDefaultIDPJWTConfig(t *testing.T) { config: &domain.JWTIDPConfig{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -70,7 +70,7 @@ func TestCommandSide_ChangeDefaultIDPJWTConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -117,7 +117,7 @@ func TestCommandSide_ChangeDefaultIDPJWTConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -162,7 +162,7 @@ func TestCommandSide_ChangeDefaultIDPJWTConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/instance_idp_oidc_config.go b/internal/command/instance_idp_oidc_config.go index ae659bc51..b9963c605 100644 --- a/internal/command/instance_idp_oidc_config.go +++ b/internal/command/instance_idp_oidc_config.go @@ -4,12 +4,12 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ChangeDefaultIDPOIDCConfig(ctx context.Context, config *domain.OIDCIDPConfig) (*domain.OIDCIDPConfig, error) { if config.IDPConfigID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-9djf8", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-9djf8", "Errors.IDMissing") } existingConfig := NewInstanceIDPOIDCConfigWriteModel(ctx, config.IDPConfigID) err := c.eventstore.FilterToQueryReducer(ctx, existingConfig) @@ -18,7 +18,7 @@ func (c *Commands) ChangeDefaultIDPOIDCConfig(ctx context.Context, config *domai } if existingConfig.State == domain.IDPConfigStateRemoved || existingConfig.State == domain.IDPConfigStateUnspecified { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-67J9d", "Errors.IAM.IDPConfig.AlreadyExists") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-67J9d", "Errors.IAM.IDPConfig.AlreadyExists") } instanceAgg := InstanceAggregateFromWriteModel(&existingConfig.WriteModel) @@ -39,7 +39,7 @@ func (c *Commands) ChangeDefaultIDPOIDCConfig(ctx context.Context, config *domai return nil, err } if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-d8kwF", "Errors.IAM.IDPConfig.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-d8kwF", "Errors.IAM.IDPConfig.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) diff --git a/internal/command/instance_idp_oidc_config_test.go b/internal/command/instance_idp_oidc_config_test.go index b74842868..410c5d2ac 100644 --- a/internal/command/instance_idp_oidc_config_test.go +++ b/internal/command/instance_idp_oidc_config_test.go @@ -9,11 +9,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ChangeDefaultIDPOIDCConfig(t *testing.T) { @@ -51,7 +51,7 @@ func TestCommandSide_ChangeDefaultIDPOIDCConfig(t *testing.T) { config: &domain.OIDCIDPConfig{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -70,7 +70,7 @@ func TestCommandSide_ChangeDefaultIDPOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -126,7 +126,7 @@ func TestCommandSide_ChangeDefaultIDPOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -183,7 +183,7 @@ func TestCommandSide_ChangeDefaultIDPOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/instance_idp_test.go b/internal/command/instance_idp_test.go index fe46dcd03..3ff14610d 100644 --- a/internal/command/instance_idp_test.go +++ b/internal/command/instance_idp_test.go @@ -13,12 +13,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/idp" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddInstanceGenericOAuthIDP(t *testing.T) { @@ -54,7 +54,7 @@ func TestCommandSide_AddInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-D32ef", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-D32ef", "")) }, }, }, @@ -72,7 +72,7 @@ func TestCommandSide_AddInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Dbgzf", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Dbgzf", "")) }, }, }, @@ -91,7 +91,7 @@ func TestCommandSide_AddInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-DF4ga", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-DF4ga", "")) }, }, }, @@ -111,7 +111,7 @@ func TestCommandSide_AddInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-B23bs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-B23bs", "")) }, }, }, @@ -132,7 +132,7 @@ func TestCommandSide_AddInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-D2gj8", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-D2gj8", "")) }, }, }, @@ -154,7 +154,7 @@ func TestCommandSide_AddInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Fb8jk", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Fb8jk", "")) }, }, }, @@ -177,7 +177,7 @@ func TestCommandSide_AddInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-sdf3f", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-sdf3f", "")) }, }, }, @@ -337,7 +337,7 @@ func TestCommandSide_UpdateInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SAffg", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SAffg", "")) }, }, }, @@ -353,7 +353,7 @@ func TestCommandSide_UpdateInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Sf3gh", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Sf3gh", "")) }, }, }, @@ -371,7 +371,7 @@ func TestCommandSide_UpdateInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SHJ3ui", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SHJ3ui", "")) }, }, }, @@ -390,7 +390,7 @@ func TestCommandSide_UpdateInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SVrgh", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SVrgh", "")) }, }, }, @@ -410,7 +410,7 @@ func TestCommandSide_UpdateInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-DJKeio", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-DJKeio", "")) }, }, }, @@ -431,7 +431,7 @@ func TestCommandSide_UpdateInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-ILSJi", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-ILSJi", "")) }, }, }, @@ -453,7 +453,7 @@ func TestCommandSide_UpdateInstanceGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-JKD3h", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-JKD3h", "")) }, }, }, @@ -477,7 +477,7 @@ func TestCommandSide_UpdateInstanceGenericOAuthIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -657,7 +657,7 @@ func TestCommandSide_AddInstanceGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Sgtj5", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Sgtj5", "")) }, }, }, @@ -675,7 +675,7 @@ func TestCommandSide_AddInstanceGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Hz6zj", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Hz6zj", "")) }, }, }, @@ -694,7 +694,7 @@ func TestCommandSide_AddInstanceGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-fb5jm", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-fb5jm", "")) }, }, }, @@ -714,7 +714,7 @@ func TestCommandSide_AddInstanceGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Sfdf4", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Sfdf4", "")) }, }, }, @@ -865,7 +865,7 @@ func TestCommandSide_UpdateInstanceGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SAfd3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SAfd3", "")) }, }, }, @@ -881,7 +881,7 @@ func TestCommandSide_UpdateInstanceGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Dvf4f", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Dvf4f", "")) }, }, }, @@ -899,7 +899,7 @@ func TestCommandSide_UpdateInstanceGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-BDfr3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-BDfr3", "")) }, }, }, @@ -918,7 +918,7 @@ func TestCommandSide_UpdateInstanceGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Db3bs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Db3bs", "")) }, }, }, @@ -939,7 +939,7 @@ func TestCommandSide_UpdateInstanceGenericOIDCIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1107,7 +1107,7 @@ func TestCommandSide_MigrateInstanceGenericOIDCToAzureADProvider(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-sdf3g", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-sdf3g", "")) }, }, }, @@ -1124,7 +1124,7 @@ func TestCommandSide_MigrateInstanceGenericOIDCToAzureADProvider(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Fhbr2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Fhbr2", "")) }, }, }, @@ -1142,7 +1142,7 @@ func TestCommandSide_MigrateInstanceGenericOIDCToAzureADProvider(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Dzh3g", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Dzh3g", "")) }, }, }, @@ -1163,7 +1163,7 @@ func TestCommandSide_MigrateInstanceGenericOIDCToAzureADProvider(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1348,7 +1348,7 @@ func TestCommandSide_MigrateInstanceOIDCToGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-D3fvs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-D3fvs", "")) }, }, }, @@ -1365,7 +1365,7 @@ func TestCommandSide_MigrateInstanceOIDCToGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-W2vqs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-W2vqs", "")) }, }, }, @@ -1385,7 +1385,7 @@ func TestCommandSide_MigrateInstanceOIDCToGoogleIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1558,7 +1558,7 @@ func TestCommandSide_AddInstanceAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-sdf3g", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-sdf3g", "")) }, }, }, @@ -1576,7 +1576,7 @@ func TestCommandSide_AddInstanceAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Fhbr2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Fhbr2", "")) }, }, }, @@ -1595,7 +1595,7 @@ func TestCommandSide_AddInstanceAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Dzh3g", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Dzh3g", "")) }, }, }, @@ -1745,7 +1745,7 @@ func TestCommandSide_UpdateInstanceAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SAgh2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SAgh2", "")) }, }, }, @@ -1761,7 +1761,7 @@ func TestCommandSide_UpdateInstanceAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-fh3h1", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-fh3h1", "")) }, }, }, @@ -1779,7 +1779,7 @@ func TestCommandSide_UpdateInstanceAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-dmitg", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-dmitg", "")) }, }, }, @@ -1799,7 +1799,7 @@ func TestCommandSide_UpdateInstanceAzureADIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1967,7 +1967,7 @@ func TestCommandSide_AddInstanceGitHubIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Jdsgf", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Jdsgf", "")) }, }, }, @@ -1985,7 +1985,7 @@ func TestCommandSide_AddInstanceGitHubIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-dsgz3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-dsgz3", "")) }, }, }, @@ -2128,7 +2128,7 @@ func TestCommandSide_UpdateInstanceGitHubIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-sdf4h", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-sdf4h", "")) }, }, }, @@ -2144,7 +2144,7 @@ func TestCommandSide_UpdateInstanceGitHubIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-fdh5z", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-fdh5z", "")) }, }, }, @@ -2163,7 +2163,7 @@ func TestCommandSide_UpdateInstanceGitHubIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -2322,7 +2322,7 @@ func TestCommandSide_AddInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Dg4td", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Dg4td", "")) }, }, }, @@ -2340,7 +2340,7 @@ func TestCommandSide_AddInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-dgj53", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-dgj53", "")) }, }, }, @@ -2359,7 +2359,7 @@ func TestCommandSide_AddInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Ghjjs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Ghjjs", "")) }, }, }, @@ -2379,7 +2379,7 @@ func TestCommandSide_AddInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-sani2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-sani2", "")) }, }, }, @@ -2400,7 +2400,7 @@ func TestCommandSide_AddInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-agj42", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-agj42", "")) }, }, }, @@ -2422,7 +2422,7 @@ func TestCommandSide_AddInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-sd5hn", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-sd5hn", "")) }, }, }, @@ -2578,7 +2578,7 @@ func TestCommandSide_UpdateInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-sdfh3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-sdfh3", "")) }, }, }, @@ -2594,7 +2594,7 @@ func TestCommandSide_UpdateInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-shj42", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-shj42", "")) }, }, }, @@ -2612,7 +2612,7 @@ func TestCommandSide_UpdateInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-sdh73", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-sdh73", "")) }, }, }, @@ -2631,7 +2631,7 @@ func TestCommandSide_UpdateInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-acx2w", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-acx2w", "")) }, }, }, @@ -2651,7 +2651,7 @@ func TestCommandSide_UpdateInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-dgj6q", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-dgj6q", "")) }, }, }, @@ -2672,7 +2672,7 @@ func TestCommandSide_UpdateInstanceGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-ybj62", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-ybj62", "")) }, }, }, @@ -2695,7 +2695,7 @@ func TestCommandSide_UpdateInstanceGitHubEnterpriseIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -2870,7 +2870,7 @@ func TestCommandSide_AddInstanceGitLabIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-adsg2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-adsg2", "")) }, }, }, @@ -2888,7 +2888,7 @@ func TestCommandSide_AddInstanceGitLabIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-GD1j2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-GD1j2", "")) }, }, }, @@ -3030,7 +3030,7 @@ func TestCommandSide_UpdateInstanceGitLabIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-HJK91", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-HJK91", "")) }, }, }, @@ -3046,7 +3046,7 @@ func TestCommandSide_UpdateInstanceGitLabIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-D12t6", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-D12t6", "")) }, }, }, @@ -3065,7 +3065,7 @@ func TestCommandSide_UpdateInstanceGitLabIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -3222,7 +3222,7 @@ func TestCommandSide_AddInstanceGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-jw4ZT", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-jw4ZT", "")) }, }, }, @@ -3240,7 +3240,7 @@ func TestCommandSide_AddInstanceGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-AST4S", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-AST4S", "")) }, }, }, @@ -3259,7 +3259,7 @@ func TestCommandSide_AddInstanceGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-DBZHJ", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-DBZHJ", "")) }, }, }, @@ -3279,7 +3279,7 @@ func TestCommandSide_AddInstanceGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SDGJ4", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SDGJ4", "")) }, }, }, @@ -3427,7 +3427,7 @@ func TestCommandSide_UpdateInstanceGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SAFG4", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SAFG4", "")) }, }, }, @@ -3443,7 +3443,7 @@ func TestCommandSide_UpdateInstanceGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-DG4H", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-DG4H", "")) }, }, }, @@ -3461,7 +3461,7 @@ func TestCommandSide_UpdateInstanceGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SD4eb", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SD4eb", "")) }, }, }, @@ -3480,7 +3480,7 @@ func TestCommandSide_UpdateInstanceGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-GHWE3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-GHWE3", "")) }, }, }, @@ -3501,7 +3501,7 @@ func TestCommandSide_UpdateInstanceGitLabSelfHostedIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -3666,7 +3666,7 @@ func TestCommandSide_AddInstanceGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-D3fvs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-D3fvs", "")) }, }, }, @@ -3684,7 +3684,7 @@ func TestCommandSide_AddInstanceGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-W2vqs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-W2vqs", "")) }, }, }, @@ -3826,7 +3826,7 @@ func TestCommandSide_UpdateInstanceGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-S32t1", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-S32t1", "")) }, }, }, @@ -3842,7 +3842,7 @@ func TestCommandSide_UpdateInstanceGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-ds432", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-ds432", "")) }, }, }, @@ -3861,7 +3861,7 @@ func TestCommandSide_UpdateInstanceGoogleIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -4018,7 +4018,7 @@ func TestCommandSide_AddInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SAfdd", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SAfdd", "")) }, }, }, @@ -4036,7 +4036,7 @@ func TestCommandSide_AddInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-sv31s", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-sv31s", "")) }, }, }, @@ -4055,7 +4055,7 @@ func TestCommandSide_AddInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-sdgf4", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-sdgf4", "")) }, }, }, @@ -4075,7 +4075,7 @@ func TestCommandSide_AddInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-AEG2w", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-AEG2w", "")) }, }, }, @@ -4096,7 +4096,7 @@ func TestCommandSide_AddInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SAD5n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SAD5n", "")) }, }, }, @@ -4118,7 +4118,7 @@ func TestCommandSide_AddInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SAx905n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SAx905n", "")) }, }, }, @@ -4141,7 +4141,7 @@ func TestCommandSide_AddInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-S1x905n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-S1x905n", "")) }, }, }, @@ -4165,7 +4165,7 @@ func TestCommandSide_AddInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-aAx905n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-aAx905n", "")) }, }, }, @@ -4365,7 +4365,7 @@ func TestCommandSide_UpdateInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Dgdbs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Dgdbs", "")) }, }, }, @@ -4381,7 +4381,7 @@ func TestCommandSide_UpdateInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Sffgd", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Sffgd", "")) }, }, }, @@ -4399,7 +4399,7 @@ func TestCommandSide_UpdateInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-vb3ss", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-vb3ss", "")) }, }, }, @@ -4418,7 +4418,7 @@ func TestCommandSide_UpdateInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-hbere", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-hbere", "")) }, }, }, @@ -4438,7 +4438,7 @@ func TestCommandSide_UpdateInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-DG45z", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-DG45z", "")) }, }, }, @@ -4459,7 +4459,7 @@ func TestCommandSide_UpdateInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SAx945n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SAx945n", "")) }, }, }, @@ -4481,7 +4481,7 @@ func TestCommandSide_UpdateInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-S1x605n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-S1x605n", "")) }, }, }, @@ -4504,7 +4504,7 @@ func TestCommandSide_UpdateInstanceLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-aAx901n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-aAx901n", "")) }, }, }, @@ -4531,7 +4531,7 @@ func TestCommandSide_UpdateInstanceLDAPIDP(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowNotFound(nil, "INST-ASF3F", "")) + return errors.Is(err, zerrors.ThrowNotFound(nil, "INST-ASF3F", "")) }, }, }, @@ -4755,7 +4755,7 @@ func TestCommandSide_AddInstanceAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-jkn3w", "Errors.IDP.ClientIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-jkn3w", "Errors.IDP.ClientIDMissing")) }, }, }, @@ -4773,7 +4773,7 @@ func TestCommandSide_AddInstanceAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Ffg32", "Errors.IDP.TeamIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Ffg32", "Errors.IDP.TeamIDMissing")) }, }, }, @@ -4792,7 +4792,7 @@ func TestCommandSide_AddInstanceAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-GDjm5", "Errors.IDP.KeyIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-GDjm5", "Errors.IDP.KeyIDMissing")) }, }, }, @@ -4812,7 +4812,7 @@ func TestCommandSide_AddInstanceAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-GVD4n", "Errors.IDP.PrivateKeyMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-GVD4n", "Errors.IDP.PrivateKeyMissing")) }, }, }, @@ -4962,7 +4962,7 @@ func TestCommandSide_UpdateInstanceAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-FRHBH", "Errors.IDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-FRHBH", "Errors.IDMissing")) }, }, }, @@ -4978,7 +4978,7 @@ func TestCommandSide_UpdateInstanceAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SFm4l", "Errors.IDP.ClientIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SFm4l", "Errors.IDP.ClientIDMissing")) }, }, }, @@ -4996,7 +4996,7 @@ func TestCommandSide_UpdateInstanceAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-SG34t", "Errors.IDP.TeamIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-SG34t", "Errors.IDP.TeamIDMissing")) }, }, }, @@ -5015,7 +5015,7 @@ func TestCommandSide_UpdateInstanceAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-Gh4z2", "Errors.IDP.KeyIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-Gh4z2", "Errors.IDP.KeyIDMissing")) }, }, }, @@ -5036,7 +5036,7 @@ func TestCommandSide_UpdateInstanceAppleIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -5204,7 +5204,7 @@ func TestCommandSide_AddInstanceSAMLIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-o07zjotgnd", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-o07zjotgnd", "")) }, }, }, @@ -5222,7 +5222,7 @@ func TestCommandSide_AddInstanceSAMLIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-3bi3esi16t", "Errors.Invalid.Argument")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-3bi3esi16t", "Errors.Invalid.Argument")) }, }, }, @@ -5372,7 +5372,7 @@ func TestCommandSide_UpdateInstanceGenericSAMLIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-7o3rq1owpm", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-7o3rq1owpm", "")) }, }, }, @@ -5388,7 +5388,7 @@ func TestCommandSide_UpdateInstanceGenericSAMLIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-q2s9rak7o9", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-q2s9rak7o9", "")) }, }, }, @@ -5406,7 +5406,7 @@ func TestCommandSide_UpdateInstanceGenericSAMLIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-iw1rxnf4sf", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-iw1rxnf4sf", "")) }, }, }, @@ -5426,7 +5426,7 @@ func TestCommandSide_UpdateInstanceGenericSAMLIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -5582,7 +5582,7 @@ func TestCommandSide_RegenerateInstanceSAMLProviderCertificate(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "INST-7de108gqya", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "INST-7de108gqya", "")) }, }, }, @@ -5598,7 +5598,7 @@ func TestCommandSide_RegenerateInstanceSAMLProviderCertificate(t *testing.T) { id: "id1", }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/instance_member.go b/internal/command/instance_member.go index b7d78a939..ee9bf15f8 100644 --- a/internal/command/instance_member.go +++ b/internal/command/instance_member.go @@ -7,26 +7,26 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddInstanceMemberCommand(a *instance.Aggregate, userID string, roles ...string) preparation.Validation { return func() (preparation.CreateCommands, error) { if userID == "" { - return nil, errors.ThrowInvalidArgument(nil, "INSTA-SDSfs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTA-SDSfs", "Errors.Invalid.Argument") } if len(domain.CheckForInvalidRoles(roles, domain.IAMRolePrefix, c.zitadelRoles)) > 0 { - return nil, errors.ThrowInvalidArgument(nil, "INSTANCE-4m0fS", "Errors.IAM.MemberInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-4m0fS", "Errors.IAM.MemberInvalid") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { if exists, err := ExistsUser(ctx, filter, userID, ""); err != nil || !exists { - return nil, errors.ThrowPreconditionFailed(err, "INSTA-GSXOn", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "INSTA-GSXOn", "Errors.User.NotFound") } if isMember, err := IsInstanceMember(ctx, filter, a.ID, userID); err != nil || isMember { - return nil, errors.ThrowAlreadyExists(err, "INSTA-pFDwe", "Errors.Instance.Member.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(err, "INSTA-pFDwe", "Errors.Instance.Member.AlreadyExists") } return []eventstore.Command{instance.NewMemberAddedEvent(ctx, &a.Aggregate, userID, roles...)}, nil }, @@ -90,10 +90,10 @@ func (c *Commands) AddInstanceMember(ctx context.Context, userID string, roles . // ChangeInstanceMember updates an existing member func (c *Commands) ChangeInstanceMember(ctx context.Context, member *domain.Member) (*domain.Member, error) { if !member.IsIAMValid() { - return nil, errors.ThrowInvalidArgument(nil, "INSTANCE-LiaZi", "Errors.IAM.MemberInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-LiaZi", "Errors.IAM.MemberInvalid") } if len(domain.CheckForInvalidRoles(member.Roles, domain.IAMRolePrefix, c.zitadelRoles)) > 0 { - return nil, errors.ThrowInvalidArgument(nil, "INSTANCE-3m9fs", "Errors.IAM.MemberInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-3m9fs", "Errors.IAM.MemberInvalid") } existingMember, err := c.instanceMemberWriteModelByID(ctx, member.UserID) @@ -102,7 +102,7 @@ func (c *Commands) ChangeInstanceMember(ctx context.Context, member *domain.Memb } if reflect.DeepEqual(existingMember.Roles, member.Roles) { - return nil, errors.ThrowPreconditionFailed(nil, "INSTANCE-LiaZi", "Errors.IAM.Member.RolesNotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-LiaZi", "Errors.IAM.Member.RolesNotChanged") } instanceAgg := InstanceAggregateFromWriteModel(&existingMember.MemberWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewMemberChangedEvent(ctx, instanceAgg, member.UserID, member.Roles...)) @@ -119,13 +119,13 @@ func (c *Commands) ChangeInstanceMember(ctx context.Context, member *domain.Memb func (c *Commands) RemoveInstanceMember(ctx context.Context, userID string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, errors.ThrowInvalidArgument(nil, "INSTANCE-LiaZi", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-LiaZi", "Errors.IDMissing") } memberWriteModel, err := c.instanceMemberWriteModelByID(ctx, userID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return nil, err } - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { // empty response because we have no data that match the request return &domain.ObjectDetails{}, nil } @@ -166,7 +166,7 @@ func (c *Commands) instanceMemberWriteModelByID(ctx context.Context, userID stri } if writeModel.State == domain.MemberStateUnspecified || writeModel.State == domain.MemberStateRemoved { - return nil, errors.ThrowNotFound(nil, "INSTANCE-D8JxR", "Errors.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-D8JxR", "Errors.NotFound") } return writeModel, nil diff --git a/internal/command/instance_member_test.go b/internal/command/instance_member_test.go index 384fdecae..f520bc324 100644 --- a/internal/command/instance_member_test.go +++ b/internal/command/instance_member_test.go @@ -9,11 +9,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddIAMMember(t *testing.T) { @@ -47,7 +47,7 @@ func TestCommandSide_AddIAMMember(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -63,7 +63,7 @@ func TestCommandSide_AddIAMMember(t *testing.T) { roles: []string{"IAM_OWNER"}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -85,7 +85,7 @@ func TestCommandSide_AddIAMMember(t *testing.T) { roles: []string{"IAM_OWNER"}, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -130,7 +130,7 @@ func TestCommandSide_AddIAMMember(t *testing.T) { roles: []string{"IAM_OWNER"}, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -155,7 +155,7 @@ func TestCommandSide_AddIAMMember(t *testing.T) { ), ), expectFilter(), - expectPushFailed(caos_errs.ThrowAlreadyExists(nil, "ERROR", "internal"), + expectPushFailed(zerrors.ThrowAlreadyExists(nil, "ERROR", "internal"), instance.NewMemberAddedEvent(context.Background(), &instance.NewAggregate("INSTANCE").Aggregate, "user1", @@ -175,7 +175,7 @@ func TestCommandSide_AddIAMMember(t *testing.T) { roles: []string{"IAM_OWNER"}, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -285,7 +285,7 @@ func TestCommandSide_ChangeIAMMember(t *testing.T) { member: &domain.Member{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -303,7 +303,7 @@ func TestCommandSide_ChangeIAMMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -327,7 +327,7 @@ func TestCommandSide_ChangeIAMMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -359,7 +359,7 @@ func TestCommandSide_ChangeIAMMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -464,7 +464,7 @@ func TestCommandSide_RemoveIAMMember(t *testing.T) { userID: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/instance_oidc_settings.go b/internal/command/instance_oidc_settings.go index c44fc3b56..009198dfe 100644 --- a/internal/command/instance_oidc_settings.go +++ b/internal/command/instance_oidc_settings.go @@ -7,9 +7,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) prepareAddOIDCSettings(a *instance.Aggregate, accessTokenLifetime, idTokenLifetime, refreshTokenIdleExpiration, refreshTokenExpiration time.Duration) preparation.Validation { @@ -18,7 +18,7 @@ func (c *Commands) prepareAddOIDCSettings(a *instance.Aggregate, accessTokenLife idTokenLifetime == time.Duration(0) || refreshTokenIdleExpiration == time.Duration(0) || refreshTokenExpiration == time.Duration(0) { - return nil, errors.ThrowInvalidArgument(nil, "INST-10s82j", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-10s82j", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { @@ -27,7 +27,7 @@ func (c *Commands) prepareAddOIDCSettings(a *instance.Aggregate, accessTokenLife return nil, err } if writeModel.State == domain.OIDCSettingsStateActive { - return nil, errors.ThrowAlreadyExists(nil, "INST-0aaj1o", "Errors.OIDCSettings.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INST-0aaj1o", "Errors.OIDCSettings.AlreadyExists") } return []eventstore.Command{ instance.NewOIDCSettingsAddedEvent( @@ -49,7 +49,7 @@ func (c *Commands) prepareUpdateOIDCSettings(a *instance.Aggregate, accessTokenL idTokenLifetime == time.Duration(0) || refreshTokenIdleExpiration == time.Duration(0) || refreshTokenExpiration == time.Duration(0) { - return nil, errors.ThrowInvalidArgument(nil, "INST-10sxks", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-10sxks", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { @@ -58,7 +58,7 @@ func (c *Commands) prepareUpdateOIDCSettings(a *instance.Aggregate, accessTokenL return nil, err } if writeModel.State != domain.OIDCSettingsStateActive { - return nil, errors.ThrowNotFound(nil, "INST-90s32oj", "Errors.OIDCSettings.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INST-90s32oj", "Errors.OIDCSettings.NotFound") } changedEvent, hasChanged, err := writeModel.NewChangedEvent( ctx, @@ -72,7 +72,7 @@ func (c *Commands) prepareUpdateOIDCSettings(a *instance.Aggregate, accessTokenL return nil, err } if !hasChanged { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-0pk2nu", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-0pk2nu", "Errors.NoChangesFound") } return []eventstore.Command{ changedEvent, diff --git a/internal/command/instance_oidc_settings_test.go b/internal/command/instance_oidc_settings_test.go index ebd04982e..353efa581 100644 --- a/internal/command/instance_oidc_settings_test.go +++ b/internal/command/instance_oidc_settings_test.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddOIDCConfig(t *testing.T) { @@ -60,7 +60,7 @@ func TestCommandSide_AddOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -113,7 +113,7 @@ func TestCommandSide_AddOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -133,7 +133,7 @@ func TestCommandSide_AddOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -153,7 +153,7 @@ func TestCommandSide_AddOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -173,7 +173,7 @@ func TestCommandSide_AddOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, } @@ -232,7 +232,7 @@ func TestCommandSide_ChangeOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -252,7 +252,7 @@ func TestCommandSide_ChangeOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -272,7 +272,7 @@ func TestCommandSide_ChangeOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -292,7 +292,7 @@ func TestCommandSide_ChangeOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -312,7 +312,7 @@ func TestCommandSide_ChangeOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -344,7 +344,7 @@ func TestCommandSide_ChangeOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/instance_policy_domain.go b/internal/command/instance_policy_domain.go index 13941b692..59c3c0691 100644 --- a/internal/command/instance_policy_domain.go +++ b/internal/command/instance_policy_domain.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDefaultDomainPolicy(ctx context.Context, userLoginMustBeDomain, validateOrgDomains, smtpSenderAddressMatchesInstanceDomain bool) (*domain.ObjectDetails, error) { @@ -49,7 +49,7 @@ func (c *Commands) getDefaultDomainPolicy(ctx context.Context) (*domain.DomainPo return nil, err } if !policyWriteModel.State.Exists() { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-3n8fs", "Errors.IAM.PasswordComplexityPolicy.NotFound") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-3n8fs", "Errors.IAM.PasswordComplexityPolicy.NotFound") } policy := writeModelToDomainPolicy(policyWriteModel) policy.Default = true @@ -81,7 +81,7 @@ func prepareAddDefaultDomainPolicy( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-Lk0dS", "Errors.Instance.DomainPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-Lk0dS", "Errors.Instance.DomainPolicy.AlreadyExists") } return []eventstore.Command{ instance.NewDomainPolicyAddedEvent(ctx, &a.Aggregate, @@ -107,7 +107,7 @@ func prepareChangeDefaultDomainPolicy( return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-0Pl0d", "Errors.Instance.DomainPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-0Pl0d", "Errors.Instance.DomainPolicy.NotFound") } changedEvent, usernameChange, err := writeModel.NewChangedEvent(ctx, &a.Aggregate, userLoginMustBeDomain, diff --git a/internal/command/instance_policy_domain_model.go b/internal/command/instance_policy_domain_model.go index 9ce766528..0ae6015dc 100644 --- a/internal/command/instance_policy_domain_model.go +++ b/internal/command/instance_policy_domain_model.go @@ -4,11 +4,11 @@ import ( "context" "github.com/zitadel/zitadel/internal/api/authz" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) type InstanceDomainPolicyWriteModel struct { @@ -71,7 +71,7 @@ func (wm *InstanceDomainPolicyWriteModel) NewChangedEvent( changes = append(changes, policy.ChangeSMTPSenderAddressMatchesInstanceDomain(smtpSenderAddresssMatchesInstanceDomain)) } if len(changes) == 0 { - return nil, false, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-pl9fN", "Errors.IAM.DomainPolicy.NotChanged") + return nil, false, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-pl9fN", "Errors.IAM.DomainPolicy.NotChanged") } changedEvent, err = instance.NewDomainPolicyChangedEvent(ctx, aggregate, changes) return changedEvent, usernameChange, err diff --git a/internal/command/instance_policy_domain_test.go b/internal/command/instance_policy_domain_test.go index 22bca56ef..e2b5c2ccc 100644 --- a/internal/command/instance_policy_domain_test.go +++ b/internal/command/instance_policy_domain_test.go @@ -9,12 +9,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultDomainPolicy(t *testing.T) { @@ -61,7 +61,7 @@ func TestCommandSide_AddDefaultDomainPolicy(t *testing.T) { smtpSenderAddressMatchesInstanceDomain: true, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -147,7 +147,7 @@ func TestCommandSide_ChangeDefaultDomainPolicy(t *testing.T) { smtpSenderAddressMatchesInstanceDomain: true, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -174,7 +174,7 @@ func TestCommandSide_ChangeDefaultDomainPolicy(t *testing.T) { smtpSenderAddressMatchesInstanceDomain: true, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/instance_policy_label.go b/internal/command/instance_policy_label.go index 4a083fce2..8392a7d56 100644 --- a/internal/command/instance_policy_label.go +++ b/internal/command/instance_policy_label.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDefaultLabelPolicy( @@ -54,7 +54,7 @@ func (c *Commands) ChangeDefaultLabelPolicy(ctx context.Context, policy *domain. } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-0K9dq", "Errors.IAM.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-0K9dq", "Errors.IAM.LabelPolicy.NotFound") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent( @@ -73,7 +73,7 @@ func (c *Commands) ChangeDefaultLabelPolicy(ctx context.Context, policy *domain. policy.DisableWatermark, policy.ThemeMode) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-28fHe", "Errors.IAM.LabelPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-28fHe", "Errors.IAM.LabelPolicy.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -107,11 +107,11 @@ func (c *Commands) AddLogoDefaultLabelPolicy(ctx context.Context, upload *AssetU } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-Qw0pd", "Errors.IAM.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-Qw0pd", "Errors.IAM.LabelPolicy.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(err, "INSTANCE-3m20c", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "INSTANCE-3m20c", "Errors.Assets.Object.PutFailed") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewLabelPolicyLogoAddedEvent(ctx, instanceAgg, asset.Name)) @@ -132,7 +132,7 @@ func (c *Commands) RemoveLogoDefaultLabelPolicy(ctx context.Context) (*domain.Ob } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-Xc8Kf", "Errors.IAM.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-Xc8Kf", "Errors.IAM.LabelPolicy.NotFound") } err = c.removeAsset(ctx, authz.GetInstance(ctx).InstanceID(), existingPolicy.LogoKey) @@ -158,11 +158,11 @@ func (c *Commands) AddIconDefaultLabelPolicy(ctx context.Context, upload *AssetU } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-1yMx0", "Errors.IAM.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-1yMx0", "Errors.IAM.LabelPolicy.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(err, "INSTANCE-yxE4f", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "INSTANCE-yxE4f", "Errors.Assets.Object.PutFailed") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewLabelPolicyIconAddedEvent(ctx, instanceAgg, asset.Name)) @@ -183,7 +183,7 @@ func (c *Commands) RemoveIconDefaultLabelPolicy(ctx context.Context) (*domain.Ob } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-4M0qw", "Errors.IAM.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-4M0qw", "Errors.IAM.LabelPolicy.NotFound") } err = c.removeAsset(ctx, authz.GetInstance(ctx).InstanceID(), existingPolicy.IconKey) if err != nil { @@ -208,11 +208,11 @@ func (c *Commands) AddLogoDarkDefaultLabelPolicy(ctx context.Context, upload *As } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-ZR9fs", "Errors.Instance.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-ZR9fs", "Errors.Instance.LabelPolicy.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(err, "INSTANCE-4fMs9", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "INSTANCE-4fMs9", "Errors.Assets.Object.PutFailed") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewLabelPolicyLogoDarkAddedEvent(ctx, instanceAgg, asset.Name)) @@ -233,7 +233,7 @@ func (c *Commands) RemoveLogoDarkDefaultLabelPolicy(ctx context.Context) (*domai } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-3FGds", "Errors.Instance.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-3FGds", "Errors.Instance.LabelPolicy.NotFound") } err = c.removeAsset(ctx, authz.GetInstance(ctx).InstanceID(), existingPolicy.LogoDarkKey) if err != nil { @@ -258,11 +258,11 @@ func (c *Commands) AddIconDarkDefaultLabelPolicy(ctx context.Context, upload *As } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-vMsf9", "Errors.Instance.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-vMsf9", "Errors.Instance.LabelPolicy.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(err, "INSTANCE-1cxM3", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "INSTANCE-1cxM3", "Errors.Assets.Object.PutFailed") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewLabelPolicyIconDarkAddedEvent(ctx, instanceAgg, asset.Name)) @@ -283,7 +283,7 @@ func (c *Commands) RemoveIconDarkDefaultLabelPolicy(ctx context.Context) (*domai } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-2nc7F", "Errors.Instance.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-2nc7F", "Errors.Instance.LabelPolicy.NotFound") } err = c.removeAsset(ctx, authz.GetInstance(ctx).InstanceID(), existingPolicy.IconDarkKey) if err != nil { @@ -308,11 +308,11 @@ func (c *Commands) AddFontDefaultLabelPolicy(ctx context.Context, upload *AssetU } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-1N8fE", "Errors.Instance.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-1N8fE", "Errors.Instance.LabelPolicy.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(nil, "INSTANCE-1N8fs", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(nil, "INSTANCE-1N8fs", "Errors.Assets.Object.PutFailed") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewLabelPolicyFontAddedEvent(ctx, instanceAgg, asset.Name)) @@ -333,7 +333,7 @@ func (c *Commands) RemoveFontDefaultLabelPolicy(ctx context.Context) (*domain.Ob } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-Tk0gw", "Errors.Instance.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-Tk0gw", "Errors.Instance.LabelPolicy.NotFound") } err = c.removeAsset(ctx, authz.GetInstance(ctx).InstanceID(), existingPolicy.FontKey) if err != nil { @@ -400,7 +400,7 @@ func prepareAddDefaultLabelPolicy( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-2B0ps", "Errors.Instance.LabelPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-2B0ps", "Errors.Instance.LabelPolicy.AlreadyExists") } return []eventstore.Command{ instance.NewLabelPolicyAddedEvent(ctx, &a.Aggregate, @@ -437,7 +437,7 @@ func prepareActivateDefaultLabelPolicy( return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-6M23e", "Errors.Instance.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-6M23e", "Errors.Instance.LabelPolicy.NotFound") } return []eventstore.Command{ instance.NewLabelPolicyActivatedEvent(ctx, &a.Aggregate), diff --git a/internal/command/instance_policy_label_test.go b/internal/command/instance_policy_label_test.go index 35afb8bf8..ca508d414 100644 --- a/internal/command/instance_policy_label_test.go +++ b/internal/command/instance_policy_label_test.go @@ -10,13 +10,13 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" "github.com/zitadel/zitadel/internal/static" "github.com/zitadel/zitadel/internal/static/mock" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultLabelPolicy(t *testing.T) { @@ -90,7 +90,7 @@ func TestCommandSide_AddDefaultLabelPolicy(t *testing.T) { themeMode: domain.LabelPolicyThemeAuto, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -208,7 +208,7 @@ func TestCommandSide_ChangeDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -255,7 +255,7 @@ func TestCommandSide_ChangeDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -388,7 +388,7 @@ func TestCommandSide_ActivateDefaultLabelPolicy(t *testing.T) { ctx: authz.WithInstanceID(context.Background(), "INSTANCE"), }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -490,7 +490,7 @@ func TestCommandSide_AddLogoDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -532,7 +532,7 @@ func TestCommandSide_AddLogoDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -636,7 +636,7 @@ func TestCommandSide_RemoveLogoDefaultLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -676,7 +676,7 @@ func TestCommandSide_RemoveLogoDefaultLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -787,7 +787,7 @@ func TestCommandSide_AddIconDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -829,7 +829,7 @@ func TestCommandSide_AddIconDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -933,7 +933,7 @@ func TestCommandSide_RemoveIconDefaultLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1046,7 +1046,7 @@ func TestCommandSide_AddLogoDarkDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1089,7 +1089,7 @@ func TestCommandSide_AddLogoDarkDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -1193,7 +1193,7 @@ func TestCommandSide_RemoveLogoDarkDefaultLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1233,7 +1233,7 @@ func TestCommandSide_RemoveLogoDarkDefaultLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -1344,7 +1344,7 @@ func TestCommandSide_AddIconDarkDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1386,7 +1386,7 @@ func TestCommandSide_AddIconDarkDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -1490,7 +1490,7 @@ func TestCommandSide_RemoveIconDarkDefaultLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1530,7 +1530,7 @@ func TestCommandSide_RemoveIconDarkDefaultLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -1641,7 +1641,7 @@ func TestCommandSide_AddFontDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1683,7 +1683,7 @@ func TestCommandSide_AddFontDefaultLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -1787,7 +1787,7 @@ func TestCommandSide_RemoveFontDefaultLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1827,7 +1827,7 @@ func TestCommandSide_RemoveFontDefaultLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { diff --git a/internal/command/instance_policy_login.go b/internal/command/instance_policy_login.go index 6e6ce70e6..cf22e4467 100644 --- a/internal/command/instance_policy_login.go +++ b/internal/command/instance_policy_login.go @@ -9,10 +9,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ChangeDefaultLoginPolicy(ctx context.Context, policy *ChangeLoginPolicy) (*domain.ObjectDetails, error) { @@ -30,7 +30,7 @@ func (c *Commands) ChangeDefaultLoginPolicy(ctx context.Context, policy *ChangeL func (c *Commands) AddIDPProviderToDefaultLoginPolicy(ctx context.Context, idpProvider *domain.IDPProvider) (*domain.IDPProvider, error) { if !idpProvider.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-9nf88", "Errors.IAM.LoginPolicy.IDP.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-9nf88", "Errors.IAM.LoginPolicy.IDP.Invalid") } existingPolicy := NewInstanceLoginPolicyWriteModel(ctx) err := c.defaultLoginPolicyWriteModelByID(ctx, existingPolicy) @@ -38,12 +38,12 @@ func (c *Commands) AddIDPProviderToDefaultLoginPolicy(ctx context.Context, idpPr return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-GVDfe", "Errors.IAM.LoginPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-GVDfe", "Errors.IAM.LoginPolicy.NotFound") } exists, err := ExistsInstanceIDP(ctx, c.eventstore.Filter, idpProvider.IDPConfigID) if err != nil || !exists { - return nil, caos_errs.ThrowPreconditionFailed(err, "INSTANCE-m8fsd", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(err, "INSTANCE-m8fsd", "Errors.IDPConfig.NotExisting") } idpModel := NewInstanceIdentityProviderWriteModel(ctx, idpProvider.IDPConfigID) err = c.eventstore.FilterToQueryReducer(ctx, idpModel) @@ -51,7 +51,7 @@ func (c *Commands) AddIDPProviderToDefaultLoginPolicy(ctx context.Context, idpPr return nil, err } if idpModel.State == domain.IdentityProviderStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-2B0ps", "Errors.IAM.LoginPolicy.IDP.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-2B0ps", "Errors.IAM.LoginPolicy.IDP.AlreadyExists") } instanceAgg := InstanceAggregateFromWriteModel(&idpModel.WriteModel) @@ -68,7 +68,7 @@ func (c *Commands) AddIDPProviderToDefaultLoginPolicy(ctx context.Context, idpPr func (c *Commands) RemoveIDPProviderFromDefaultLoginPolicy(ctx context.Context, idpProvider *domain.IDPProvider, cascadeExternalIDPs ...*domain.UserIDPLink) (*domain.ObjectDetails, error) { if !idpProvider.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-66m9s", "Errors.IAM.LoginPolicy.IDP.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-66m9s", "Errors.IAM.LoginPolicy.IDP.Invalid") } existingPolicy := NewInstanceLoginPolicyWriteModel(ctx) err := c.defaultLoginPolicyWriteModelByID(ctx, existingPolicy) @@ -76,7 +76,7 @@ func (c *Commands) RemoveIDPProviderFromDefaultLoginPolicy(ctx context.Context, return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-Dfg4t", "Errors.IAM.LoginPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-Dfg4t", "Errors.IAM.LoginPolicy.NotFound") } idpModel := NewInstanceIdentityProviderWriteModel(ctx, idpProvider.IDPConfigID) @@ -85,7 +85,7 @@ func (c *Commands) RemoveIDPProviderFromDefaultLoginPolicy(ctx context.Context, return nil, err } if idpModel.State == domain.IdentityProviderStateUnspecified || idpModel.State == domain.IdentityProviderStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-39fjs", "Errors.IAM.LoginPolicy.IDP.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-39fjs", "Errors.IAM.LoginPolicy.IDP.NotExisting") } instanceAgg := InstanceAggregateFromWriteModel(&idpModel.IdentityProviderWriteModel.WriteModel) @@ -135,7 +135,7 @@ func (c *Commands) AddSecondFactorToDefaultLoginPolicy(ctx context.Context, seco func (c *Commands) RemoveSecondFactorFromDefaultLoginPolicy(ctx context.Context, secondFactor domain.SecondFactorType) (*domain.ObjectDetails, error) { if !secondFactor.Valid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-55n8s", "Errors.IAM.LoginPolicy.MFA.Unspecified") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-55n8s", "Errors.IAM.LoginPolicy.MFA.Unspecified") } secondFactorModel := NewInstanceSecondFactorWriteModel(ctx, secondFactor) err := c.eventstore.FilterToQueryReducer(ctx, secondFactorModel) @@ -143,7 +143,7 @@ func (c *Commands) RemoveSecondFactorFromDefaultLoginPolicy(ctx context.Context, return nil, err } if secondFactorModel.State == domain.FactorStateUnspecified || secondFactorModel.State == domain.FactorStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-3M9od", "Errors.IAM.LoginPolicy.MFA.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-3M9od", "Errors.IAM.LoginPolicy.MFA.NotExisting") } instanceAgg := InstanceAggregateFromWriteModel(&secondFactorModel.SecondFactorWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewLoginPolicySecondFactorRemovedEvent(ctx, instanceAgg, secondFactor)) @@ -172,7 +172,7 @@ func (c *Commands) AddMultiFactorToDefaultLoginPolicy(ctx context.Context, multi func (c *Commands) RemoveMultiFactorFromDefaultLoginPolicy(ctx context.Context, multiFactor domain.MultiFactorType) (*domain.ObjectDetails, error) { if !multiFactor.Valid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-33m9F", "Errors.IAM.LoginPolicy.MFA.Unspecified") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-33m9F", "Errors.IAM.LoginPolicy.MFA.Unspecified") } multiFactorModel := NewInstanceMultiFactorWriteModel(ctx, multiFactor) err := c.eventstore.FilterToQueryReducer(ctx, multiFactorModel) @@ -180,7 +180,7 @@ func (c *Commands) RemoveMultiFactorFromDefaultLoginPolicy(ctx context.Context, return nil, err } if multiFactorModel.State == domain.FactorStateUnspecified || multiFactorModel.State == domain.FactorStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-3M9df", "Errors.IAM.LoginPolicy.MFA.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-3M9df", "Errors.IAM.LoginPolicy.MFA.NotExisting") } instanceAgg := InstanceAggregateFromWriteModel(&multiFactorModel.MultiFactorWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewLoginPolicyMultiFactorRemovedEvent(ctx, instanceAgg, multiFactor)) @@ -215,7 +215,7 @@ func (c *Commands) getDefaultLoginPolicy(ctx context.Context) (*domain.LoginPoli func prepareChangeDefaultLoginPolicy(a *instance.Aggregate, policy *ChangeLoginPolicy) preparation.Validation { return func() (preparation.CreateCommands, error) { if ok := domain.ValidateDefaultRedirectURI(policy.DefaultRedirectURI); !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "IAM-SFdqd", "Errors.IAM.LoginPolicy.RedirectURIInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "IAM-SFdqd", "Errors.IAM.LoginPolicy.RedirectURIInvalid") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { wm := NewInstanceLoginPolicyWriteModel(ctx) @@ -223,7 +223,7 @@ func prepareChangeDefaultLoginPolicy(a *instance.Aggregate, policy *ChangeLoginP return nil, err } if !wm.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-M0sif", "Errors.IAM.LoginPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-M0sif", "Errors.IAM.LoginPolicy.NotFound") } changedEvent, hasChanged := wm.NewChangedEvent(ctx, &a.Aggregate, policy.AllowUsernamePassword, @@ -244,7 +244,7 @@ func prepareChangeDefaultLoginPolicy(a *instance.Aggregate, policy *ChangeLoginP policy.SecondFactorCheckLifetime, policy.MultiFactorCheckLifetime) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-5M9vdd", "Errors.IAM.LoginPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-5M9vdd", "Errors.IAM.LoginPolicy.NotChanged") } return []eventstore.Command{changedEvent}, nil }, nil @@ -283,7 +283,7 @@ func prepareAddDefaultLoginPolicy( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-2B0ps", "Errors.Instance.LoginPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-2B0ps", "Errors.Instance.LoginPolicy.AlreadyExists") } return []eventstore.Command{ instance.NewLoginPolicyAddedEvent(ctx, &a.Aggregate, @@ -313,7 +313,7 @@ func prepareAddDefaultLoginPolicy( func prepareAddSecondFactorToDefaultLoginPolicy(a *instance.Aggregate, factor domain.SecondFactorType) preparation.Validation { return func() (preparation.CreateCommands, error) { if !factor.Valid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-5m9fs", "Errors.Instance.LoginPolicy.MFA.Unspecified") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-5m9fs", "Errors.Instance.LoginPolicy.MFA.Unspecified") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel := NewInstanceSecondFactorWriteModel(ctx, factor) @@ -326,7 +326,7 @@ func prepareAddSecondFactorToDefaultLoginPolicy(a *instance.Aggregate, factor do return nil, err } if writeModel.State == domain.FactorStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-2B0ps", "Errors.Instance.MFA.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-2B0ps", "Errors.Instance.MFA.AlreadyExists") } return []eventstore.Command{ instance.NewLoginPolicySecondFactorAddedEvent(ctx, &a.Aggregate, factor), @@ -338,7 +338,7 @@ func prepareAddSecondFactorToDefaultLoginPolicy(a *instance.Aggregate, factor do func prepareAddMultiFactorToDefaultLoginPolicy(a *instance.Aggregate, factor domain.MultiFactorType) preparation.Validation { return func() (preparation.CreateCommands, error) { if !factor.Valid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-5m9fs", "Errors.Instance.LoginPolicy.MFA.Unspecified") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-5m9fs", "Errors.Instance.LoginPolicy.MFA.Unspecified") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel := NewInstanceMultiFactorWriteModel(ctx, factor) @@ -351,7 +351,7 @@ func prepareAddMultiFactorToDefaultLoginPolicy(a *instance.Aggregate, factor dom return nil, err } if writeModel.State == domain.FactorStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-3M9od", "Errors.Instance.MFA.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-3M9od", "Errors.Instance.MFA.AlreadyExists") } return []eventstore.Command{ instance.NewLoginPolicyMultiFactorAddedEvent(ctx, &a.Aggregate, factor), diff --git a/internal/command/instance_policy_login_test.go b/internal/command/instance_policy_login_test.go index bd472da15..5069d75d0 100644 --- a/internal/command/instance_policy_login_test.go +++ b/internal/command/instance_policy_login_test.go @@ -9,12 +9,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ChangeDefaultLoginPolicy(t *testing.T) { @@ -51,7 +51,7 @@ func TestCommandSide_ChangeDefaultLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -108,7 +108,7 @@ func TestCommandSide_ChangeDefaultLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -241,7 +241,7 @@ func TestCommandSide_AddIDPProviderDefaultLoginPolicy(t *testing.T) { provider: &domain.IDPProvider{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -259,7 +259,7 @@ func TestCommandSide_AddIDPProviderDefaultLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -301,7 +301,7 @@ func TestCommandSide_AddIDPProviderDefaultLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -362,7 +362,7 @@ func TestCommandSide_AddIDPProviderDefaultLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -484,7 +484,7 @@ func TestCommandSide_RemoveIDPProviderDefaultLoginPolicy(t *testing.T) { provider: &domain.IDPProvider{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -502,7 +502,7 @@ func TestCommandSide_RemoveIDPProviderDefaultLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -544,7 +544,7 @@ func TestCommandSide_RemoveIDPProviderDefaultLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -599,7 +599,7 @@ func TestCommandSide_RemoveIDPProviderDefaultLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -847,7 +847,7 @@ func TestCommandSide_AddSecondFactorDefaultLoginPolicy(t *testing.T) { factor: domain.SecondFactorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -870,7 +870,7 @@ func TestCommandSide_AddSecondFactorDefaultLoginPolicy(t *testing.T) { factor: domain.SecondFactorTypeTOTP, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -1022,7 +1022,7 @@ func TestCommandSide_RemoveSecondFactorDefaultLoginPolicy(t *testing.T) { factor: domain.SecondFactorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1038,7 +1038,7 @@ func TestCommandSide_RemoveSecondFactorDefaultLoginPolicy(t *testing.T) { factor: domain.SecondFactorTypeTOTP, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1067,7 +1067,7 @@ func TestCommandSide_RemoveSecondFactorDefaultLoginPolicy(t *testing.T) { factor: domain.SecondFactorTypeTOTP, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1096,7 +1096,7 @@ func TestCommandSide_RemoveSecondFactorDefaultLoginPolicy(t *testing.T) { factor: domain.SecondFactorTypeOTPEmail, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1125,7 +1125,7 @@ func TestCommandSide_RemoveSecondFactorDefaultLoginPolicy(t *testing.T) { factor: domain.SecondFactorTypeOTPSMS, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1238,7 +1238,7 @@ func TestCommandSide_RemoveSecondFactorDefaultLoginPolicy(t *testing.T) { factor: domain.SecondFactorTypeOTPSMS, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, } @@ -1291,7 +1291,7 @@ func TestCommandSide_AddMultiFactorDefaultLoginPolicy(t *testing.T) { factor: domain.MultiFactorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1314,7 +1314,7 @@ func TestCommandSide_AddMultiFactorDefaultLoginPolicy(t *testing.T) { factor: domain.MultiFactorTypeU2FWithPIN, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -1390,7 +1390,7 @@ func TestCommandSide_RemoveMultiFactorDefaultLoginPolicy(t *testing.T) { factor: domain.MultiFactorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1406,7 +1406,7 @@ func TestCommandSide_RemoveMultiFactorDefaultLoginPolicy(t *testing.T) { factor: domain.MultiFactorTypeU2FWithPIN, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1435,7 +1435,7 @@ func TestCommandSide_RemoveMultiFactorDefaultLoginPolicy(t *testing.T) { factor: domain.MultiFactorTypeU2FWithPIN, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/instance_policy_mail_template.go b/internal/command/instance_policy_mail_template.go index 78ee0ec27..4bef54f93 100644 --- a/internal/command/instance_policy_mail_template.go +++ b/internal/command/instance_policy_mail_template.go @@ -5,10 +5,10 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDefaultMailTemplate(ctx context.Context, policy *domain.MailTemplate) (*domain.MailTemplate, error) { @@ -32,14 +32,14 @@ func (c *Commands) AddDefaultMailTemplate(ctx context.Context, policy *domain.Ma func (c *Commands) addDefaultMailTemplate(ctx context.Context, instanceAgg *eventstore.Aggregate, addedPolicy *InstanceMailTemplateWriteModel, policy *domain.MailTemplate) (eventstore.Command, error) { if !policy.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-fm9sd", "Errors.IAM.MailTemplate.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-fm9sd", "Errors.IAM.MailTemplate.Invalid") } err := c.eventstore.FilterToQueryReducer(ctx, addedPolicy) if err != nil { return nil, err } if addedPolicy.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-5n8fs", "Errors.IAM.MailTemplate.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-5n8fs", "Errors.IAM.MailTemplate.AlreadyExists") } return instance.NewMailTemplateAddedEvent(ctx, instanceAgg, policy.Template), nil @@ -63,7 +63,7 @@ func (c *Commands) ChangeDefaultMailTemplate(ctx context.Context, policy *domain func (c *Commands) changeDefaultMailTemplate(ctx context.Context, policy *domain.MailTemplate) (*InstanceMailTemplateWriteModel, eventstore.Command, error) { if !policy.IsValid() { - return nil, nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-4m9ds", "Errors.IAM.MailTemplate.Invalid") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-4m9ds", "Errors.IAM.MailTemplate.Invalid") } existingPolicy, err := c.defaultMailTemplateWriteModelByID(ctx) if err != nil { @@ -71,13 +71,13 @@ func (c *Commands) changeDefaultMailTemplate(ctx context.Context, policy *domain } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, nil, caos_errs.ThrowNotFound(nil, "INSTANCE-2N8fs", "Errors.IAM.MailTemplate.NotFound") + return nil, nil, zerrors.ThrowNotFound(nil, "INSTANCE-2N8fs", "Errors.IAM.MailTemplate.NotFound") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.MailTemplateWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, instanceAgg, policy.Template) if !hasChanged { - return nil, nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-3nfsG", "Errors.IAM.MailTemplate.NotChanged") + return nil, nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-3nfsG", "Errors.IAM.MailTemplate.NotChanged") } return existingPolicy, changedEvent, nil @@ -101,7 +101,7 @@ func prepareAddDefaultEmailTemplate( ) preparation.Validation { return func() (preparation.CreateCommands, error) { if template == nil { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-fm9sd", "Errors.Instance.MailTemplate.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-fm9sd", "Errors.Instance.MailTemplate.Invalid") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel := NewInstanceMailTemplateWriteModel(ctx) @@ -114,7 +114,7 @@ func prepareAddDefaultEmailTemplate( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-5n8fs", "Errors.Instance.MailTemplate.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-5n8fs", "Errors.Instance.MailTemplate.AlreadyExists") } return []eventstore.Command{ instance.NewMailTemplateAddedEvent(ctx, &a.Aggregate, diff --git a/internal/command/instance_policy_mail_template_test.go b/internal/command/instance_policy_mail_template_test.go index 3f90b1bf5..4a5d9cf9a 100644 --- a/internal/command/instance_policy_mail_template_test.go +++ b/internal/command/instance_policy_mail_template_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultMailTemplatePolicy(t *testing.T) { @@ -44,7 +44,7 @@ func TestCommandSide_AddDefaultMailTemplatePolicy(t *testing.T) { policy: &domain.MailTemplate{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -69,7 +69,7 @@ func TestCommandSide_AddDefaultMailTemplatePolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -154,7 +154,7 @@ func TestCommandSide_ChangeDefaultMailTemplatePolicy(t *testing.T) { policy: &domain.MailTemplate{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -172,7 +172,7 @@ func TestCommandSide_ChangeDefaultMailTemplatePolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -197,7 +197,7 @@ func TestCommandSide_ChangeDefaultMailTemplatePolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/instance_policy_notification.go b/internal/command/instance_policy_notification.go index c3a657435..3d9f27149 100644 --- a/internal/command/instance_policy_notification.go +++ b/internal/command/instance_policy_notification.go @@ -5,9 +5,9 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDefaultNotificationPolicy(ctx context.Context, resourceOwner string, passwordChange bool) (*domain.ObjectDetails, error) { @@ -52,7 +52,7 @@ func prepareAddDefaultNotificationPolicy( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-xpo1bj", "Errors.Instance.NotificationPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-xpo1bj", "Errors.Instance.NotificationPolicy.AlreadyExists") } return []eventstore.Command{ instance.NewNotificationPolicyAddedEvent(ctx, &a.Aggregate, passwordChange), @@ -78,11 +78,11 @@ func prepareChangeDefaultNotificationPolicy( } if writeModel.State == domain.PolicyStateUnspecified || writeModel.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-x891na", "Errors.IAM.NotificationPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-x891na", "Errors.IAM.NotificationPolicy.NotFound") } change, hasChanged := writeModel.NewChangedEvent(ctx, &a.Aggregate, passwordChange) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-29x02n", "Errors.IAM.NotificationPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-29x02n", "Errors.IAM.NotificationPolicy.NotChanged") } return []eventstore.Command{ change, diff --git a/internal/command/instance_policy_notification_test.go b/internal/command/instance_policy_notification_test.go index 339e28fd6..f864e4275 100644 --- a/internal/command/instance_policy_notification_test.go +++ b/internal/command/instance_policy_notification_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultNotificationPolicy(t *testing.T) { @@ -53,7 +53,7 @@ func TestCommandSide_AddDefaultNotificationPolicy(t *testing.T) { passwordChange: true, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -159,7 +159,7 @@ func TestCommandSide_ChangeDefaultNotificationPolicy(t *testing.T) { passwordChange: true, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -183,7 +183,7 @@ func TestCommandSide_ChangeDefaultNotificationPolicy(t *testing.T) { passwordChange: true, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/instance_policy_password_age.go b/internal/command/instance_policy_password_age.go index e1044c269..400d003bb 100644 --- a/internal/command/instance_policy_password_age.go +++ b/internal/command/instance_policy_password_age.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDefaultPasswordAgePolicy(ctx context.Context, expireWarnDays, maxAgeDays uint64) (*domain.ObjectDetails, error) { @@ -31,13 +31,13 @@ func (c *Commands) ChangeDefaultPasswordAgePolicy(ctx context.Context, policy *d return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-0oPew", "Errors.IAM.PasswordAgePolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-0oPew", "Errors.IAM.PasswordAgePolicy.NotFound") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.PasswordAgePolicyWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, instanceAgg, policy.ExpireWarnDays, policy.MaxAgeDays) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-180sf", "Errors.IAM.PasswordAgePolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-180sf", "Errors.IAM.PasswordAgePolicy.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -81,7 +81,7 @@ func prepareAddDefaultPasswordAgePolicy( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-Lk0dS", "Errors.Instance.PasswordAgePolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-Lk0dS", "Errors.Instance.PasswordAgePolicy.AlreadyExists") } return []eventstore.Command{ instance.NewPasswordAgePolicyAddedEvent(ctx, &a.Aggregate, diff --git a/internal/command/instance_policy_password_age_test.go b/internal/command/instance_policy_password_age_test.go index e1850fc35..6380325ed 100644 --- a/internal/command/instance_policy_password_age_test.go +++ b/internal/command/instance_policy_password_age_test.go @@ -8,11 +8,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultPasswordAgePolicy(t *testing.T) { @@ -56,7 +56,7 @@ func TestCommandSide_AddDefaultPasswordAgePolicy(t *testing.T) { expireWarnDays: 10, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -139,7 +139,7 @@ func TestCommandSide_ChangeDefaultPasswordAgePolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -166,7 +166,7 @@ func TestCommandSide_ChangeDefaultPasswordAgePolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/instance_policy_password_complexity.go b/internal/command/instance_policy_password_complexity.go index c2af1064b..cad220eae 100644 --- a/internal/command/instance_policy_password_complexity.go +++ b/internal/command/instance_policy_password_complexity.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDefaultPasswordComplexityPolicy(ctx context.Context, minLength uint64, hasLowercase, hasUppercase, hasNumber, hasSymbol bool) (*domain.ObjectDetails, error) { @@ -35,13 +35,13 @@ func (c *Commands) ChangeDefaultPasswordComplexityPolicy(ctx context.Context, po return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-0oPew", "Errors.IAM.PasswordComplexityPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-0oPew", "Errors.IAM.PasswordComplexityPolicy.NotFound") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.PasswordComplexityPolicyWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, instanceAgg, policy.MinLength, policy.HasLowercase, policy.HasUppercase, policy.HasNumber, policy.HasSymbol) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-9jlsf", "Errors.IAM.PasswordComplexityPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-9jlsf", "Errors.IAM.PasswordComplexityPolicy.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { @@ -64,7 +64,7 @@ func prepareAddDefaultPasswordComplexityPolicy( ) preparation.Validation { return func() (preparation.CreateCommands, error) { if minLength == 0 || minLength > 72 { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-Lsp0e", "Errors.Instance.PasswordComplexityPolicy.MinLengthNotAllowed") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-Lsp0e", "Errors.Instance.PasswordComplexityPolicy.MinLengthNotAllowed") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel := NewInstancePasswordComplexityPolicyWriteModel(ctx) @@ -77,7 +77,7 @@ func prepareAddDefaultPasswordComplexityPolicy( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-Lk0dS", "Errors.Instance.PasswordComplexityPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-Lk0dS", "Errors.Instance.PasswordComplexityPolicy.AlreadyExists") } return []eventstore.Command{ instance.NewPasswordComplexityPolicyAddedEvent(ctx, &a.Aggregate, @@ -99,7 +99,7 @@ func (c *Commands) getDefaultPasswordComplexityPolicy(ctx context.Context) (*dom return nil, err } if !policyWriteModel.State.Exists() { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-M0gsf", "Errors.IAM.PasswordComplexityPolicy.NotFound") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-M0gsf", "Errors.IAM.PasswordComplexityPolicy.NotFound") } policy := writeModelToPasswordComplexityPolicy(&policyWriteModel.PasswordComplexityPolicyWriteModel) policy.Default = true diff --git a/internal/command/instance_policy_password_complexity_test.go b/internal/command/instance_policy_password_complexity_test.go index f696341f2..0c10c0c7f 100644 --- a/internal/command/instance_policy_password_complexity_test.go +++ b/internal/command/instance_policy_password_complexity_test.go @@ -8,11 +8,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultPasswordComplexityPolicy(t *testing.T) { @@ -53,7 +53,7 @@ func TestCommandSide_AddDefaultPasswordComplexityPolicy(t *testing.T) { hasSymbol: true, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -81,7 +81,7 @@ func TestCommandSide_AddDefaultPasswordComplexityPolicy(t *testing.T) { hasSymbol: true, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -169,7 +169,7 @@ func TestCommandSide_ChangeDefaultPasswordComplexityPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -191,7 +191,7 @@ func TestCommandSide_ChangeDefaultPasswordComplexityPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -221,7 +221,7 @@ func TestCommandSide_ChangeDefaultPasswordComplexityPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/instance_policy_password_lockout.go b/internal/command/instance_policy_password_lockout.go index 5b0b95949..2ed88b997 100644 --- a/internal/command/instance_policy_password_lockout.go +++ b/internal/command/instance_policy_password_lockout.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDefaultLockoutPolicy(ctx context.Context, maxAttempts uint64, showLockoutFailure bool) (*domain.ObjectDetails, error) { @@ -31,13 +31,13 @@ func (c *Commands) ChangeDefaultLockoutPolicy(ctx context.Context, policy *domai return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-0oPew", "Errors.IAM.LockoutPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-0oPew", "Errors.IAM.LockoutPolicy.NotFound") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.LockoutPolicyWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, instanceAgg, policy.MaxPasswordAttempts, policy.ShowLockOutFailures) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-0psjF", "Errors.IAM.LockoutPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-0psjF", "Errors.IAM.LockoutPolicy.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -80,7 +80,7 @@ func prepareAddDefaultLockoutPolicy( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-0olDf", "Errors.Instance.LockoutPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-0olDf", "Errors.Instance.LockoutPolicy.AlreadyExists") } return []eventstore.Command{ instance.NewLockoutPolicyAddedEvent(ctx, &a.Aggregate, maxAttempts, showLockoutFailure), diff --git a/internal/command/instance_policy_password_lockout_test.go b/internal/command/instance_policy_password_lockout_test.go index 1eb0a651a..02d5ab488 100644 --- a/internal/command/instance_policy_password_lockout_test.go +++ b/internal/command/instance_policy_password_lockout_test.go @@ -8,11 +8,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultLockoutPolicy(t *testing.T) { @@ -56,7 +56,7 @@ func TestCommandSide_AddDefaultLockoutPolicy(t *testing.T) { showLockOutFailures: true, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -139,7 +139,7 @@ func TestCommandSide_ChangeDefaultLockoutPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -166,7 +166,7 @@ func TestCommandSide_ChangeDefaultLockoutPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/instance_policy_privacy.go b/internal/command/instance_policy_privacy.go index 576810847..f239bad14 100644 --- a/internal/command/instance_policy_privacy.go +++ b/internal/command/instance_policy_privacy.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddDefaultPrivacyPolicy(ctx context.Context, tosLink, privacyLink, helpLink string, supportEmail domain.EmailAddress) (*domain.ObjectDetails, error) { @@ -38,13 +38,13 @@ func (c *Commands) ChangeDefaultPrivacyPolicy(ctx context.Context, policy *domai return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "INSTANCE-0oPew", "Errors.IAM.PrivacyPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INSTANCE-0oPew", "Errors.IAM.PrivacyPolicy.NotFound") } instanceAgg := InstanceAggregateFromWriteModel(&existingPolicy.PrivacyPolicyWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, instanceAgg, policy.TOSLink, policy.PrivacyLink, policy.HelpLink, policy.SupportEmail) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "INSTANCE-9jJfs", "Errors.IAM.PrivacyPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "INSTANCE-9jJfs", "Errors.IAM.PrivacyPolicy.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { @@ -76,7 +76,7 @@ func (c *Commands) getDefaultPrivacyPolicy(ctx context.Context) (*domain.Privacy return nil, err } if !policyWriteModel.State.Exists() { - return nil, caos_errs.ThrowInvalidArgument(nil, "INSTANCE-559os", "Errors.IAM.PrivacyPolicy.NotFound") + return nil, zerrors.ThrowInvalidArgument(nil, "INSTANCE-559os", "Errors.IAM.PrivacyPolicy.NotFound") } policy := writeModelToPrivacyPolicy(&policyWriteModel.PrivacyPolicyWriteModel) policy.Default = true @@ -108,7 +108,7 @@ func prepareAddDefaultPrivacyPolicy( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "INSTANCE-M00rJ", "Errors.Instance.PrivacyPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INSTANCE-M00rJ", "Errors.Instance.PrivacyPolicy.AlreadyExists") } return []eventstore.Command{ instance.NewPrivacyPolicyAddedEvent(ctx, &a.Aggregate, tosLink, privacyLink, helpLink, supportEmail), diff --git a/internal/command/instance_policy_privacy_test.go b/internal/command/instance_policy_privacy_test.go index ad7bbfb15..a5b8932b3 100644 --- a/internal/command/instance_policy_privacy_test.go +++ b/internal/command/instance_policy_privacy_test.go @@ -8,11 +8,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDefaultPrivacyPolicy(t *testing.T) { @@ -62,7 +62,7 @@ func TestCommandSide_AddDefaultPrivacyPolicy(t *testing.T) { supportEmail: "support@example.com", }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -110,7 +110,7 @@ func TestCommandSide_AddDefaultPrivacyPolicy(t *testing.T) { supportEmail: "wrong email", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -199,7 +199,7 @@ func TestCommandSide_ChangeDefaultPrivacyPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -230,7 +230,7 @@ func TestCommandSide_ChangeDefaultPrivacyPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -250,7 +250,7 @@ func TestCommandSide_ChangeDefaultPrivacyPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/instance_settings.go b/internal/command/instance_settings.go index 497bc99e1..93bbdc831 100644 --- a/internal/command/instance_settings.go +++ b/internal/command/instance_settings.go @@ -7,9 +7,9 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddSecretGeneratorConfig(ctx context.Context, typ domain.SecretGeneratorType, config *crypto.GeneratorConfig) (*domain.ObjectDetails, error) { @@ -33,10 +33,10 @@ func (c *Commands) AddSecretGeneratorConfig(ctx context.Context, typ domain.Secr func prepareAddSecretGeneratorConfig(a *instance.Aggregate, typ domain.SecretGeneratorType, config *crypto.GeneratorConfig) preparation.Validation { return func() (preparation.CreateCommands, error) { if !typ.Valid() { - return nil, errors.ThrowInvalidArgument(nil, "V2-FGqVj", "Errors.InvalidArgument") + return nil, zerrors.ThrowInvalidArgument(nil, "V2-FGqVj", "Errors.InvalidArgument") } if config.Length < 1 { - return nil, errors.ThrowInvalidArgument(nil, "V2-jEqCt", "Errors.InvalidArgument") + return nil, zerrors.ThrowInvalidArgument(nil, "V2-jEqCt", "Errors.InvalidArgument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel := NewInstanceSecretGeneratorConfigWriteModel(ctx, typ) @@ -50,7 +50,7 @@ func prepareAddSecretGeneratorConfig(a *instance.Aggregate, typ domain.SecretGen } if writeModel.State == domain.SecretGeneratorStateActive { - return nil, errors.ThrowAlreadyExists(nil, "V2-6CqKo", "Errors.SecretGenerator.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "V2-6CqKo", "Errors.SecretGenerator.AlreadyExists") } return []eventstore.Command{ @@ -72,7 +72,7 @@ func prepareAddSecretGeneratorConfig(a *instance.Aggregate, typ domain.SecretGen func (c *Commands) ChangeSecretGeneratorConfig(ctx context.Context, generatorType domain.SecretGeneratorType, config *crypto.GeneratorConfig) (*domain.ObjectDetails, error) { if generatorType == domain.SecretGeneratorTypeUnspecified { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-33k9f", "Errors.SecretGenerator.TypeMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-33k9f", "Errors.SecretGenerator.TypeMissing") } generatorWriteModel, err := c.getSecretConfig(ctx, generatorType) @@ -114,7 +114,7 @@ func (c *Commands) ChangeSecretGeneratorConfig(ctx context.Context, generatorTyp return nil, err } if !hasChanged { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-m0o3f", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-m0o3f", "Errors.NoChangesFound") } if err = c.pushAppendAndReduce(ctx, generatorWriteModel, changedEvent); err != nil { return nil, err @@ -124,7 +124,7 @@ func (c *Commands) ChangeSecretGeneratorConfig(ctx context.Context, generatorTyp func (c *Commands) RemoveSecretGeneratorConfig(ctx context.Context, generatorType domain.SecretGeneratorType) (*domain.ObjectDetails, error) { if generatorType == domain.SecretGeneratorTypeUnspecified { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-2j9lw", "Errors.SecretGenerator.TypeMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-2j9lw", "Errors.SecretGenerator.TypeMissing") } generatorWriteModel, err := c.getSecretConfig(ctx, generatorType) @@ -132,7 +132,7 @@ func (c *Commands) RemoveSecretGeneratorConfig(ctx context.Context, generatorTyp return nil, err } if generatorWriteModel.State == domain.SecretGeneratorStateUnspecified || generatorWriteModel.State == domain.SecretGeneratorStateRemoved { - return nil, errors.ThrowNotFound(nil, "COMMAND-b8les", "Errors.SecretGenerator.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-b8les", "Errors.SecretGenerator.NotFound") } instanceAgg := InstanceAggregateFromWriteModel(&generatorWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewSecretGeneratorRemovedEvent(ctx, instanceAgg, generatorType)) diff --git a/internal/command/instance_settings_test.go b/internal/command/instance_settings_test.go index 19ca9c5d4..ddb82f709 100644 --- a/internal/command/instance_settings_test.go +++ b/internal/command/instance_settings_test.go @@ -10,9 +10,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddSecretGenerator(t *testing.T) { @@ -47,7 +47,7 @@ func TestCommandSide_AddSecretGenerator(t *testing.T) { generatorType: domain.SecretGeneratorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -84,7 +84,7 @@ func TestCommandSide_AddSecretGenerator(t *testing.T) { generatorType: domain.SecretGeneratorTypeInitCode, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -177,7 +177,7 @@ func TestCommandSide_ChangeSecretGenerator(t *testing.T) { generatorType: domain.SecretGeneratorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -309,7 +309,7 @@ func TestCommandSide_ChangeSecretGenerator(t *testing.T) { generatorType: domain.SecretGeneratorTypeInitCode, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -413,7 +413,7 @@ func TestCommandSide_RemoveSecretGenerator(t *testing.T) { generatorType: domain.SecretGeneratorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -429,7 +429,7 @@ func TestCommandSide_RemoveSecretGenerator(t *testing.T) { generatorType: domain.SecretGeneratorTypeInitCode, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -464,7 +464,7 @@ func TestCommandSide_RemoveSecretGenerator(t *testing.T) { generatorType: domain.SecretGeneratorTypeInitCode, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/instance_test.go b/internal/command/instance_test.go index 18007637d..8f4f5b68e 100644 --- a/internal/command/instance_test.go +++ b/internal/command/instance_test.go @@ -8,9 +8,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_UpdateInstance(t *testing.T) { @@ -43,7 +43,7 @@ func TestCommandSide_UpdateInstance(t *testing.T) { name: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -59,7 +59,7 @@ func TestCommandSide_UpdateInstance(t *testing.T) { name: "INSTANCE_CHANGED", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -90,7 +90,7 @@ func TestCommandSide_UpdateInstance(t *testing.T) { name: "INSTANCE_CHANGED", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -114,7 +114,7 @@ func TestCommandSide_UpdateInstance(t *testing.T) { name: "INSTANCE", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -200,7 +200,7 @@ func TestCommandSide_RemoveInstance(t *testing.T) { instanceID: "INSTANCE", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -231,7 +231,7 @@ func TestCommandSide_RemoveInstance(t *testing.T) { instanceID: "INSTANCE", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/limits.go b/internal/command/limits.go index ca4fb0be4..2bfa90dc8 100644 --- a/internal/command/limits.go +++ b/internal/command/limits.go @@ -7,9 +7,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/limits" + "github.com/zitadel/zitadel/internal/zerrors" ) type SetLimits struct { @@ -62,7 +62,7 @@ func (c *Commands) ResetLimits(ctx context.Context, resourceOwner string) (*doma return nil, err } if wm.AggregateID == "" { - return nil, errors.ThrowNotFound(nil, "COMMAND-9JToT", "Errors.Limits.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-9JToT", "Errors.Limits.NotFound") } aggregate := limits.NewAggregate(wm.AggregateID, instanceId, resourceOwner) events := []eventstore.Command{limits.NewResetEvent(ctx, &aggregate.Aggregate)} @@ -85,7 +85,7 @@ func (c *Commands) getLimitsWriteModel(ctx context.Context, instanceId, resource func (c *Commands) SetLimitsCommand(a *limits.Aggregate, wm *limitsWriteModel, setLimits *SetLimits) preparation.Validation { return func() (preparation.CreateCommands, error) { if setLimits == nil || setLimits.AuditLogRetention == nil { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-4M9vs", "Errors.Limits.NoneSpecified") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-4M9vs", "Errors.Limits.NoneSpecified") } return func(ctx context.Context, _ preparation.FilterToQueryReducer) ([]eventstore.Command, error) { changes := wm.NewChanges(setLimits) diff --git a/internal/command/limits_test.go b/internal/command/limits_test.go index 1b315ca13..56ef181d7 100644 --- a/internal/command/limits_test.go +++ b/internal/command/limits_test.go @@ -11,11 +11,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/limits" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestLimits_SetLimits(t *testing.T) { @@ -217,7 +217,7 @@ func TestLimits_ResetLimits(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowNotFound(nil, "COMMAND-9JToT", "Errors.Limits.NotFound")) + return errors.Is(err, zerrors.ThrowNotFound(nil, "COMMAND-9JToT", "Errors.Limits.NotFound")) }, }, }, @@ -251,7 +251,7 @@ func TestLimits_ResetLimits(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowNotFound(nil, "COMMAND-9JToT", "Errors.Limits.NotFound")) + return errors.Is(err, zerrors.ThrowNotFound(nil, "COMMAND-9JToT", "Errors.Limits.NotFound")) }, }, }, diff --git a/internal/command/main_test.go b/internal/command/main_test.go index a7c447b2f..23c1e54a1 100644 --- a/internal/command/main_test.go +++ b/internal/command/main_test.go @@ -14,7 +14,6 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/repository" "github.com/zitadel/zitadel/internal/eventstore/repository/mock" @@ -33,6 +32,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/session" usr_repo "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/zerrors" ) type expect func(mockRepository *mock.MockRepository) @@ -245,7 +245,7 @@ func newMockPermissionCheckAllowed() domain.PermissionCheck { func newMockPermissionCheckNotAllowed() domain.PermissionCheck { return func(ctx context.Context, permission, orgID, resourceID string) (err error) { - return errors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied") + return zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied") } } @@ -256,7 +256,7 @@ func newMockTokenVerifierValid() func(ctx context.Context, sessionToken, session } func newMockTokenVerifierInvalid() func(ctx context.Context, sessionToken, sessionID, tokenID string) (err error) { return func(ctx context.Context, sessionToken, sessionID, tokenID string) (err error) { - return errors.ThrowPermissionDenied(nil, "COMMAND-sGr42", "Errors.Session.Token.Invalid") + return zerrors.ThrowPermissionDenied(nil, "COMMAND-sGr42", "Errors.Session.Token.Invalid") } } diff --git a/internal/command/oidc_session.go b/internal/command/oidc_session.go index 585442311..afc4c5b5a 100644 --- a/internal/command/oidc_session.go +++ b/internal/command/oidc_session.go @@ -11,12 +11,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/repository/authrequest" "github.com/zitadel/zitadel/internal/repository/oidcsession" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -88,7 +88,7 @@ func (c *Commands) OIDCSessionByRefreshToken(ctx context.Context, refreshToken s writeModel := NewOIDCSessionWriteModel(oidcSessionID, "") err = c.eventstore.FilterToQueryReducer(ctx, writeModel) if err != nil { - return nil, caos_errs.ThrowPreconditionFailed(err, "OIDCS-SAF31", "Errors.OIDCSession.RefreshTokenInvalid") + return nil, zerrors.ThrowPreconditionFailed(err, "OIDCS-SAF31", "Errors.OIDCSession.RefreshTokenInvalid") } if err = writeModel.CheckRefreshToken(refreshTokenID); err != nil { return nil, err @@ -99,7 +99,7 @@ func (c *Commands) OIDCSessionByRefreshToken(ctx context.Context, refreshToken s func oidcSessionTokenIDsFromToken(token string) (oidcSessionID, refreshTokenID, accessTokenID string, err error) { split := strings.Split(token, TokenDelimiter) if len(split) != 2 { - return "", "", "", caos_errs.ThrowPreconditionFailed(nil, "OIDCS-S87kl", "Errors.OIDCSession.Token.Invalid") + return "", "", "", zerrors.ThrowPreconditionFailed(nil, "OIDCS-S87kl", "Errors.OIDCSession.Token.Invalid") } if strings.HasPrefix(split[1], RefreshTokenPrefix) { return split[0], split[1], "", nil @@ -107,7 +107,7 @@ func oidcSessionTokenIDsFromToken(token string) (oidcSessionID, refreshTokenID, if strings.HasPrefix(split[1], AccessTokenPrefix) { return split[0], "", split[1], nil } - return "", "", "", caos_errs.ThrowPreconditionFailed(nil, "OIDCS-S87kl", "Errors.OIDCSession.Token.Invalid") + return "", "", "", zerrors.ThrowPreconditionFailed(nil, "OIDCS-S87kl", "Errors.OIDCSession.Token.Invalid") } // RevokeOIDCSessionToken revokes an access_token or refresh_token @@ -124,7 +124,7 @@ func (c *Commands) RevokeOIDCSessionToken(ctx context.Context, token, clientID s writeModel := NewOIDCSessionWriteModel(oidcSessionID, "") err = c.eventstore.FilterToQueryReducer(ctx, writeModel) if err != nil { - return caos_errs.ThrowInternal(err, "OIDCS-NB3t2", "Errors.Internal") + return zerrors.ThrowInternal(err, "OIDCS-NB3t2", "Errors.Internal") } if err = writeModel.CheckClient(clientID); err != nil { return err @@ -198,7 +198,7 @@ func (c *Commands) getResourceOwnerOfSessionUser(ctx context.Context, userID, in AggregateIDs(userID). Builder()) if err != nil || len(events) != 1 { - return "", caos_errs.ThrowInternal(err, "OIDCS-sferh", "Errors.Internal") + return "", zerrors.ThrowInternal(err, "OIDCS-sferh", "Errors.Internal") } return events[0].Aggregate().ResourceOwner, nil } @@ -219,7 +219,7 @@ func (c *Commands) decryptRefreshToken(refreshToken string) (refreshTokenID stri func parseRefreshToken(refreshToken string) (oidcSessionID, refreshTokenID string, err error) { split := strings.Split(refreshToken, TokenDelimiter) if len(split) < 2 || !strings.HasPrefix(split[1], RefreshTokenPrefix) { - return "", "", caos_errs.ThrowPreconditionFailed(nil, "OIDCS-JOI23", "Errors.OIDCSession.RefreshTokenInvalid") + return "", "", zerrors.ThrowPreconditionFailed(nil, "OIDCS-JOI23", "Errors.OIDCSession.RefreshTokenInvalid") } // the oidc library requires that every token has the format of : // the V2 tokens don't use the userID anymore, so let's just remove it diff --git a/internal/command/oidc_session_model.go b/internal/command/oidc_session_model.go index 94725d933..64f9d5490 100644 --- a/internal/command/oidc_session_model.go +++ b/internal/command/oidc_session_model.go @@ -4,9 +4,9 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/oidcsession" + "github.com/zitadel/zitadel/internal/zerrors" ) type OIDCSessionWriteModel struct { @@ -128,27 +128,27 @@ func (wm *OIDCSessionWriteModel) reduceRefreshTokenRevoked(e *oidcsession.Refres func (wm *OIDCSessionWriteModel) CheckRefreshToken(refreshTokenID string) error { if wm.State != domain.OIDCSessionStateActive { - return caos_errs.ThrowPreconditionFailed(nil, "OIDCS-s3hjk", "Errors.OIDCSession.RefreshTokenInvalid") + return zerrors.ThrowPreconditionFailed(nil, "OIDCS-s3hjk", "Errors.OIDCSession.RefreshTokenInvalid") } if wm.RefreshTokenID != refreshTokenID { - return caos_errs.ThrowPreconditionFailed(nil, "OIDCS-28ubl", "Errors.OIDCSession.RefreshTokenInvalid") + return zerrors.ThrowPreconditionFailed(nil, "OIDCS-28ubl", "Errors.OIDCSession.RefreshTokenInvalid") } now := time.Now() if wm.RefreshTokenExpiration.Before(now) || wm.RefreshTokenIdleExpiration.Before(now) { - return caos_errs.ThrowPreconditionFailed(nil, "OIDCS-3jt2w", "Errors.OIDCSession.RefreshTokenInvalid") + return zerrors.ThrowPreconditionFailed(nil, "OIDCS-3jt2w", "Errors.OIDCSession.RefreshTokenInvalid") } return nil } func (wm *OIDCSessionWriteModel) CheckAccessToken(accessTokenID string) error { if wm.State != domain.OIDCSessionStateActive { - return caos_errs.ThrowPreconditionFailed(nil, "OIDCS-KL2pk", "Errors.OIDCSession.Token.Invalid") + return zerrors.ThrowPreconditionFailed(nil, "OIDCS-KL2pk", "Errors.OIDCSession.Token.Invalid") } if wm.AccessTokenID != accessTokenID { - return caos_errs.ThrowPreconditionFailed(nil, "OIDCS-JLKW2", "Errors.OIDCSession.Token.Invalid") + return zerrors.ThrowPreconditionFailed(nil, "OIDCS-JLKW2", "Errors.OIDCSession.Token.Invalid") } if wm.AccessTokenExpiration.Before(time.Now()) { - return caos_errs.ThrowPreconditionFailed(nil, "OIDCS-3j3md", "Errors.OIDCSession.Token.Invalid") + return zerrors.ThrowPreconditionFailed(nil, "OIDCS-3j3md", "Errors.OIDCSession.Token.Invalid") } return nil } @@ -159,7 +159,7 @@ func (wm *OIDCSessionWriteModel) CheckClient(clientID string) error { return nil } } - return caos_errs.ThrowPreconditionFailed(nil, "OIDCS-SKjl3", "Errors.OIDCSession.InvalidClient") + return zerrors.ThrowPreconditionFailed(nil, "OIDCS-SKjl3", "Errors.OIDCSession.InvalidClient") } func (wm *OIDCSessionWriteModel) OIDCRefreshTokenID(refreshTokenID string) string { diff --git a/internal/command/oidc_session_test.go b/internal/command/oidc_session_test.go index 68d97dbdf..d43aab0d8 100644 --- a/internal/command/oidc_session_test.go +++ b/internal/command/oidc_session_test.go @@ -16,7 +16,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/id/mock" @@ -24,6 +23,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/oidcsession" "github.com/zitadel/zitadel/internal/repository/session" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -67,7 +67,7 @@ func TestCommands_AddOIDCSessionAccessToken(t *testing.T) { authRequestID: "V2_authRequestID", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "AUTHR-SF2r2", "Errors.AuthRequest.NotAuthenticated"), + err: zerrors.ThrowPreconditionFailed(nil, "AUTHR-SF2r2", "Errors.AuthRequest.NotAuthenticated"), }, }, { @@ -119,7 +119,7 @@ func TestCommands_AddOIDCSessionAccessToken(t *testing.T) { authRequestID: "V2_authRequestID", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Flk38", "Errors.Session.NotExisting"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Flk38", "Errors.Session.NotExisting"), }, }, { @@ -268,7 +268,7 @@ func TestCommands_AddOIDCSessionRefreshAndAccessToken(t *testing.T) { authRequestID: "V2_authRequestID", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "AUTHR-SF2r2", "Errors.AuthRequest.NotAuthenticated"), + err: zerrors.ThrowPreconditionFailed(nil, "AUTHR-SF2r2", "Errors.AuthRequest.NotAuthenticated"), }, }, { @@ -320,7 +320,7 @@ func TestCommands_AddOIDCSessionRefreshAndAccessToken(t *testing.T) { authRequestID: "V2_authRequestID", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Flk38", "Errors.Session.NotExisting"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Flk38", "Errors.Session.NotExisting"), }, }, { @@ -478,7 +478,7 @@ func TestCommands_ExchangeOIDCSessionRefreshAndAccessToken(t *testing.T) { refreshToken: "aW52YWxpZA", // invalid }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "OIDCS-JOI23", "Errors.OIDCSession.RefreshTokenInvalid"), + err: zerrors.ThrowPreconditionFailed(nil, "OIDCS-JOI23", "Errors.OIDCSession.RefreshTokenInvalid"), }, }, { @@ -495,7 +495,7 @@ func TestCommands_ExchangeOIDCSessionRefreshAndAccessToken(t *testing.T) { refreshToken: "VjJfb2lkY1Nlc3Npb25JRC1ydF9yZWZyZXNoVG9rZW5JRDp1c2VySUQ", //V2_oidcSessionID:rt_refreshTokenID:userID }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "OIDCS-s3hjk", "Errors.OIDCSession.RefreshTokenInvalid"), + err: zerrors.ThrowPreconditionFailed(nil, "OIDCS-s3hjk", "Errors.OIDCSession.RefreshTokenInvalid"), }, }, { @@ -521,7 +521,7 @@ func TestCommands_ExchangeOIDCSessionRefreshAndAccessToken(t *testing.T) { refreshToken: "VjJfb2lkY1Nlc3Npb25JRC1ydF9yZWZyZXNoVG9rZW5JRDp1c2VySUQ", //V2_oidcSessionID:rt_refreshTokenID:userID }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "OIDCS-28ubl", "Errors.OIDCSession.RefreshTokenInvalid"), + err: zerrors.ThrowPreconditionFailed(nil, "OIDCS-28ubl", "Errors.OIDCSession.RefreshTokenInvalid"), }, }, { @@ -551,7 +551,7 @@ func TestCommands_ExchangeOIDCSessionRefreshAndAccessToken(t *testing.T) { refreshToken: "VjJfb2lkY1Nlc3Npb25JRC1ydF9yZWZyZXNoVG9rZW5JRDp1c2VySUQ", //V2_oidcSessionID:rt_refreshTokenID:userID }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "OIDCS-3jt2w", "Errors.OIDCSession.RefreshTokenInvalid"), + err: zerrors.ThrowPreconditionFailed(nil, "OIDCS-3jt2w", "Errors.OIDCSession.RefreshTokenInvalid"), }, }, { @@ -652,7 +652,7 @@ func TestCommands_OIDCSessionByRefreshToken(t *testing.T) { refreshToken: "invalid", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "OIDCS-JOI23", "Errors.OIDCSession.RefreshTokenInvalid"), + err: zerrors.ThrowPreconditionFailed(nil, "OIDCS-JOI23", "Errors.OIDCSession.RefreshTokenInvalid"), }, }, { @@ -668,7 +668,7 @@ func TestCommands_OIDCSessionByRefreshToken(t *testing.T) { refreshToken: "V2_oidcSessionID-rt_refreshTokenID:userID", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "OIDCS-s3hjk", "Errors.OIDCSession.RefreshTokenInvalid"), + err: zerrors.ThrowPreconditionFailed(nil, "OIDCS-s3hjk", "Errors.OIDCSession.RefreshTokenInvalid"), }, }, { @@ -693,7 +693,7 @@ func TestCommands_OIDCSessionByRefreshToken(t *testing.T) { refreshToken: "V2_oidcSessionID-rt_refreshTokenID:userID", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "OIDCS-28ubl", "Errors.OIDCSession.RefreshTokenInvalid"), + err: zerrors.ThrowPreconditionFailed(nil, "OIDCS-28ubl", "Errors.OIDCSession.RefreshTokenInvalid"), }, }, { @@ -722,7 +722,7 @@ func TestCommands_OIDCSessionByRefreshToken(t *testing.T) { refreshToken: "V2_oidcSessionID-rt_refreshTokenID:userID", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "OIDCS-3jt2w", "Errors.OIDCSession.RefreshTokenInvalid"), + err: zerrors.ThrowPreconditionFailed(nil, "OIDCS-3jt2w", "Errors.OIDCSession.RefreshTokenInvalid"), }, }, { @@ -878,7 +878,7 @@ func TestCommands_RevokeOIDCSessionToken(t *testing.T) { clientID: "clientID", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "OIDCS-SKjl3", "Errors.OIDCSession.InvalidClient"), + err: zerrors.ThrowPreconditionFailed(nil, "OIDCS-SKjl3", "Errors.OIDCSession.InvalidClient"), }, }, { @@ -955,7 +955,7 @@ func TestCommands_RevokeOIDCSessionToken(t *testing.T) { clientID: "clientID", }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "OIDCS-SKjl3", "Errors.OIDCSession.InvalidClient"), + err: zerrors.ThrowPreconditionFailed(nil, "OIDCS-SKjl3", "Errors.OIDCSession.InvalidClient"), }, }, { diff --git a/internal/command/org.go b/internal/command/org.go index 137b1a65c..f6c9e1164 100644 --- a/internal/command/org.go +++ b/internal/command/org.go @@ -7,11 +7,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) // InstanceOrgSetup is used for the first organisation in the instance setup. @@ -236,7 +236,7 @@ func (c *Commands) SetUpOrg(ctx context.Context, o *OrgSetup, allowInitialMail b func AddOrgCommand(ctx context.Context, a *org.Aggregate, name string, userIDs ...string) preparation.Validation { return func() (preparation.CreateCommands, error) { if name = strings.TrimSpace(name); name == "" { - return nil, errors.ThrowInvalidArgument(nil, "ORG-mruNY", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-mruNY", "Errors.Invalid.Argument") } defaultDomain, err := domain.NewIAMDomainName(name, authz.GetInstance(ctx).RequestedDomain()) if err != nil { @@ -259,7 +259,7 @@ func (c *Commands) getOrg(ctx context.Context, orgID string) (*domain.Org, error return nil, err } if !isOrgStateExists(writeModel.State) { - return nil, errors.ThrowInternal(err, "COMMAND-4M9sf", "Errors.Org.NotFound") + return nil, zerrors.ThrowInternal(err, "COMMAND-4M9sf", "Errors.Org.NotFound") } return orgWriteModelToOrg(writeModel), nil } @@ -270,7 +270,7 @@ func (c *Commands) checkOrgExists(ctx context.Context, orgID string) error { return err } if !isOrgStateExists(orgWriteModel.State) { - return errors.ThrowPreconditionFailed(nil, "COMMAND-QXPGs", "Errors.Org.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-QXPGs", "Errors.Org.NotFound") } return nil } @@ -281,7 +281,7 @@ func (c *Commands) AddOrgWithID(ctx context.Context, name, userID, resourceOwner return nil, err } if existingOrg.State != domain.OrgStateUnspecified { - return nil, errors.ThrowNotFound(nil, "ORG-lapo2m", "Errors.Org.AlreadyExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-lapo2m", "Errors.Org.AlreadyExisting") } return c.addOrgWithIDAndMember(ctx, name, userID, resourceOwner, orgID, claimedUserIDs) @@ -289,12 +289,12 @@ func (c *Commands) AddOrgWithID(ctx context.Context, name, userID, resourceOwner func (c *Commands) AddOrg(ctx context.Context, name, userID, resourceOwner string, claimedUserIDs []string) (*domain.Org, error) { if name = strings.TrimSpace(name); name == "" { - return nil, errors.ThrowInvalidArgument(nil, "EVENT-Mf9sd", "Errors.Org.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "EVENT-Mf9sd", "Errors.Org.Invalid") } orgID, err := c.idGenerator.Next() if err != nil { - return nil, errors.ThrowInternal(err, "COMMA-OwciI", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "COMMA-OwciI", "Errors.Internal") } return c.addOrgWithIDAndMember(ctx, name, userID, resourceOwner, orgID, claimedUserIDs) @@ -329,7 +329,7 @@ func (c *Commands) addOrgWithIDAndMember(ctx context.Context, name, userID, reso func (c *Commands) ChangeOrg(ctx context.Context, orgID, name string) (*domain.ObjectDetails, error) { name = strings.TrimSpace(name) if orgID == "" || name == "" { - return nil, errors.ThrowInvalidArgument(nil, "EVENT-Mf9sd", "Errors.Org.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "EVENT-Mf9sd", "Errors.Org.Invalid") } orgWriteModel, err := c.getOrgWriteModelByID(ctx, orgID) @@ -337,10 +337,10 @@ func (c *Commands) ChangeOrg(ctx context.Context, orgID, name string) (*domain.O return nil, err } if !isOrgStateExists(orgWriteModel.State) { - return nil, errors.ThrowNotFound(nil, "ORG-1MRds", "Errors.Org.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-1MRds", "Errors.Org.NotFound") } if orgWriteModel.Name == name { - return nil, errors.ThrowPreconditionFailed(nil, "ORG-4VSdf", "Errors.Org.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "ORG-4VSdf", "Errors.Org.NotChanged") } orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel) events := make([]eventstore.Command, 0) @@ -369,10 +369,10 @@ func (c *Commands) DeactivateOrg(ctx context.Context, orgID string) (*domain.Obj return nil, err } if !isOrgStateExists(orgWriteModel.State) { - return nil, errors.ThrowNotFound(nil, "ORG-oL9nT", "Errors.Org.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-oL9nT", "Errors.Org.NotFound") } if orgWriteModel.State == domain.OrgStateInactive { - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-Dbs2g", "Errors.Org.AlreadyDeactivated") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-Dbs2g", "Errors.Org.AlreadyDeactivated") } orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewOrgDeactivatedEvent(ctx, orgAgg)) @@ -392,10 +392,10 @@ func (c *Commands) ReactivateOrg(ctx context.Context, orgID string) (*domain.Obj return nil, err } if !isOrgStateExists(orgWriteModel.State) { - return nil, errors.ThrowNotFound(nil, "ORG-Dgf3g", "Errors.Org.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-Dgf3g", "Errors.Org.NotFound") } if orgWriteModel.State == domain.OrgStateActive { - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-bfnrh", "Errors.Org.AlreadyActive") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-bfnrh", "Errors.Org.AlreadyActive") } orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewOrgReactivatedEvent(ctx, orgAgg)) @@ -434,23 +434,23 @@ func (c *Commands) prepareRemoveOrg(a *org.Aggregate) preparation.Validation { return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { instance := authz.GetInstance(ctx) if a.ID == instance.DefaultOrganisationID() { - return nil, errors.ThrowPreconditionFailed(nil, "COMMA-wG9p1", "Errors.Org.DefaultOrgNotDeletable") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMA-wG9p1", "Errors.Org.DefaultOrgNotDeletable") } err := c.checkProjectExists(ctx, instance.ProjectID(), a.ID) // if there is no error, the ZITADEL project was found on the org to be deleted if err == nil { - return nil, errors.ThrowPreconditionFailed(err, "COMMA-AF3JW", "Errors.Org.ZitadelOrgNotDeletable") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMA-AF3JW", "Errors.Org.ZitadelOrgNotDeletable") } // "precondition failed" error means the project does not exist, return other errors - if !errors.IsPreconditionFailed(err) { + if !zerrors.IsPreconditionFailed(err) { return nil, err } writeModel, err := c.getOrgWriteModelByID(ctx, a.ID) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "COMMA-wG9p1", "Errors.Org.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMA-wG9p1", "Errors.Org.NotFound") } if !isOrgStateExists(writeModel.State) { - return nil, errors.ThrowNotFound(nil, "COMMA-aps2n", "Errors.Org.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMA-aps2n", "Errors.Org.NotFound") } domainPolicy, err := c.getOrgDomainPolicy(ctx, a.ID) @@ -696,7 +696,7 @@ func ExistsOrg(ctx context.Context, filter preparation.FilterToQueryReducer, id func (c *Commands) addOrgWithID(ctx context.Context, organisation *domain.Org, orgID string, claimedUserIDs []string) (_ *eventstore.Aggregate, _ *OrgWriteModel, _ []eventstore.Command, err error) { if !organisation.IsValid() { - return nil, nil, nil, errors.ThrowInvalidArgument(nil, "COMM-deLSk", "Errors.Org.Invalid") + return nil, nil, nil, zerrors.ThrowInvalidArgument(nil, "COMM-deLSk", "Errors.Org.Invalid") } organisation.AggregateID = orgID diff --git a/internal/command/org_action.go b/internal/command/org_action.go index 45cf13acf..945fd929d 100644 --- a/internal/command/org_action.go +++ b/internal/command/org_action.go @@ -5,10 +5,10 @@ import ( "sort" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/action" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddActionWithID(ctx context.Context, addAction *domain.Action, resourceOwner, actionID string) (_ string, _ *domain.ObjectDetails, err error) { @@ -17,7 +17,7 @@ func (c *Commands) AddActionWithID(ctx context.Context, addAction *domain.Action return "", nil, err } if existingAction.State != domain.ActionStateUnspecified { - return "", nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-nau2k", "Errors.Action.AlreadyExisting") + return "", nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-nau2k", "Errors.Action.AlreadyExisting") } return c.addActionWithID(ctx, addAction, resourceOwner, actionID) @@ -25,7 +25,7 @@ func (c *Commands) AddActionWithID(ctx context.Context, addAction *domain.Action func (c *Commands) AddAction(ctx context.Context, addAction *domain.Action, resourceOwner string) (_ string, _ *domain.ObjectDetails, err error) { if !addAction.IsValid() { - return "", nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-eg2gf", "Errors.Action.Invalid") + return "", nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-eg2gf", "Errors.Action.Invalid") } actionID, err := c.idGenerator.Next() @@ -61,7 +61,7 @@ func (c *Commands) addActionWithID(ctx context.Context, addAction *domain.Action func (c *Commands) ChangeAction(ctx context.Context, actionChange *domain.Action, resourceOwner string) (*domain.ObjectDetails, error) { if !actionChange.IsValid() || actionChange.AggregateID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-Df2f3", "Errors.Action.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Df2f3", "Errors.Action.Invalid") } existingAction, err := c.getActionWriteModelByID(ctx, actionChange.AggregateID, resourceOwner) @@ -69,7 +69,7 @@ func (c *Commands) ChangeAction(ctx context.Context, actionChange *domain.Action return nil, err } if !existingAction.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Sfg2t", "Errors.Action.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-Sfg2t", "Errors.Action.NotFound") } actionAgg := ActionAggregateFromWriteModel(&existingAction.WriteModel) @@ -96,7 +96,7 @@ func (c *Commands) ChangeAction(ctx context.Context, actionChange *domain.Action func (c *Commands) DeactivateAction(ctx context.Context, actionID string, resourceOwner string) (*domain.ObjectDetails, error) { if actionID == "" || resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-DAhk5", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-DAhk5", "Errors.IDMissing") } existingAction, err := c.getActionWriteModelByID(ctx, actionID, resourceOwner) @@ -104,10 +104,10 @@ func (c *Commands) DeactivateAction(ctx context.Context, actionID string, resour return nil, err } if !existingAction.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-NRmhu", "Errors.Action.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-NRmhu", "Errors.Action.NotFound") } if existingAction.State != domain.ActionStateActive { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Dgj92", "Errors.Action.NotActive") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Dgj92", "Errors.Action.NotActive") } actionAgg := ActionAggregateFromWriteModel(&existingAction.WriteModel) events := []eventstore.Command{ @@ -126,7 +126,7 @@ func (c *Commands) DeactivateAction(ctx context.Context, actionID string, resour func (c *Commands) ReactivateAction(ctx context.Context, actionID string, resourceOwner string) (*domain.ObjectDetails, error) { if actionID == "" || resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-BNm56", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-BNm56", "Errors.IDMissing") } existingAction, err := c.getActionWriteModelByID(ctx, actionID, resourceOwner) @@ -134,10 +134,10 @@ func (c *Commands) ReactivateAction(ctx context.Context, actionID string, resour return nil, err } if !existingAction.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Aa22g", "Errors.Action.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-Aa22g", "Errors.Action.NotFound") } if existingAction.State != domain.ActionStateInactive { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-J53zh", "Errors.Action.NotInactive") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-J53zh", "Errors.Action.NotInactive") } actionAgg := ActionAggregateFromWriteModel(&existingAction.WriteModel) @@ -157,7 +157,7 @@ func (c *Commands) ReactivateAction(ctx context.Context, actionID string, resour func (c *Commands) DeleteAction(ctx context.Context, actionID, resourceOwner string, flowTypes ...domain.FlowType) (*domain.ObjectDetails, error) { if actionID == "" || resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-Gfg3g", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Gfg3g", "Errors.IDMissing") } existingAction, err := c.getActionWriteModelByID(ctx, actionID, resourceOwner) @@ -165,7 +165,7 @@ func (c *Commands) DeleteAction(ctx context.Context, actionID, resourceOwner str return nil, err } if !existingAction.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Dgh4h", "Errors.Action.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-Dgh4h", "Errors.Action.NotFound") } actionAgg := ActionAggregateFromWriteModel(&existingAction.WriteModel) events := []eventstore.Command{ diff --git a/internal/command/org_action_test.go b/internal/command/org_action_test.go index 58d5d1bf6..e3f1a8afc 100644 --- a/internal/command/org_action_test.go +++ b/internal/command/org_action_test.go @@ -7,13 +7,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/action" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_AddAction(t *testing.T) { @@ -50,7 +50,7 @@ func TestCommands_AddAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -58,7 +58,7 @@ func TestCommands_AddAction(t *testing.T) { fields{ eventstore: eventstoreExpect(t, expectPushFailed( - errors.ThrowPreconditionFailed(nil, "id", "name already exists"), + zerrors.ThrowPreconditionFailed(nil, "id", "name already exists"), action.NewAddedEvent(context.Background(), &action.NewAggregate("id1", "org1").Aggregate, "name", @@ -79,7 +79,7 @@ func TestCommands_AddAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -168,7 +168,7 @@ func TestCommands_ChangeAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -190,7 +190,7 @@ func TestCommands_ChangeAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -222,7 +222,7 @@ func TestCommands_ChangeAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -241,7 +241,7 @@ func TestCommands_ChangeAction(t *testing.T) { ), ), expectPushFailed( - errors.ThrowPreconditionFailed(nil, "id", "name already exists"), + zerrors.ThrowPreconditionFailed(nil, "id", "name already exists"), func() *action.ChangedEvent { event, _ := action.NewChangedEvent(context.Background(), &action.NewAggregate("id1", "org1").Aggregate, @@ -267,7 +267,7 @@ func TestCommands_ChangeAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -366,7 +366,7 @@ func TestCommands_DeactivateAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -382,7 +382,7 @@ func TestCommands_DeactivateAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -413,7 +413,7 @@ func TestCommands_DeactivateAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -499,7 +499,7 @@ func TestCommands_ReactivateAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -515,7 +515,7 @@ func TestCommands_ReactivateAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -541,7 +541,7 @@ func TestCommands_ReactivateAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -633,7 +633,7 @@ func TestCommands_DeleteAction(t *testing.T) { resourceOwner: "", }, res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -649,7 +649,7 @@ func TestCommands_DeleteAction(t *testing.T) { resourceOwner: "org1", }, res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_custom_login_text.go b/internal/command/org_custom_login_text.go index 9c2a70956..b3d52c669 100644 --- a/internal/command/org_custom_login_text.go +++ b/internal/command/org_custom_login_text.go @@ -6,17 +6,17 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) // SetOrgLoginText only validates if the language is supported, not if it is allowed. // This enables setting texts before allowing a language func (c *Commands) SetOrgLoginText(ctx context.Context, resourceOwner string, loginText *domain.CustomLoginText) (*domain.ObjectDetails, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-m29rF", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-m29rF", "Errors.ResourceOwnerMissing") } iamAgg := org.NewAggregate(resourceOwner) events, existingLoginText, err := c.setOrgLoginText(ctx, &iamAgg.Aggregate, loginText) @@ -48,17 +48,17 @@ func (c *Commands) setOrgLoginText(ctx context.Context, orgAgg *eventstore.Aggre func (c *Commands) RemoveOrgLoginTexts(ctx context.Context, resourceOwner string, lang language.Tag) (*domain.ObjectDetails, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-1B8dw", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-1B8dw", "Errors.ResourceOwnerMissing") } if lang == language.Und { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-5ZZmo", "Errors.CustomText.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-5ZZmo", "Errors.CustomText.Invalid") } customText, err := c.orgCustomLoginTextWriteModelByID(ctx, resourceOwner, lang) if err != nil { return nil, err } if customText.State == domain.PolicyStateUnspecified || customText.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-9ru44", "Errors.CustomText.NotFound") + return nil, zerrors.ThrowNotFound(nil, "Org-9ru44", "Errors.CustomText.NotFound") } orgAgg := OrgAggregateFromWriteModel(&customText.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewCustomTextTemplateRemovedEvent(ctx, orgAgg, domain.LoginCustomText, lang)) diff --git a/internal/command/org_custom_login_text_test.go b/internal/command/org_custom_login_text_test.go index 419ee724d..ede20ef5c 100644 --- a/internal/command/org_custom_login_text_test.go +++ b/internal/command/org_custom_login_text_test.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_SetCustomOrgLoginText(t *testing.T) { @@ -47,7 +47,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -83,7 +83,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) { config: &domain.CustomLoginText{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -99,7 +99,7 @@ func TestCommandSide_SetCustomOrgLoginText(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/org_custom_message_text.go b/internal/command/org_custom_message_text.go index 8676fefad..cd9fc2da9 100644 --- a/internal/command/org_custom_message_text.go +++ b/internal/command/org_custom_message_text.go @@ -6,17 +6,17 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) // SetOrgMessageText only validates if the language is supported, not if it is allowed. // This enables setting texts before allowing a language func (c *Commands) SetOrgMessageText(ctx context.Context, resourceOwner string, messageText *domain.CustomMessageText) (*domain.ObjectDetails, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-2biiR", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-2biiR", "Errors.ResourceOwnerMissing") } orgAgg := org.NewAggregate(resourceOwner) events, existingMessageText, err := c.setOrgMessageText(ctx, &orgAgg.Aggregate, messageText) @@ -97,17 +97,17 @@ func (c *Commands) setOrgMessageText(ctx context.Context, orgAgg *eventstore.Agg func (c *Commands) RemoveOrgMessageTexts(ctx context.Context, resourceOwner, messageTextType string, lang language.Tag) (*domain.ObjectDetails, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-3mfsf", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-3mfsf", "Errors.ResourceOwnerMissing") } if messageTextType == "" || lang == language.Und { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-j59f", "Errors.CustomMessageText.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-j59f", "Errors.CustomMessageText.Invalid") } customText, err := c.orgCustomMessageTextWriteModelByID(ctx, resourceOwner, messageTextType, lang) if err != nil { return nil, err } if customText.State == domain.PolicyStateUnspecified || customText.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-3b8Jf", "Errors.CustomMessageText.NotFound") + return nil, zerrors.ThrowNotFound(nil, "Org-3b8Jf", "Errors.CustomMessageText.NotFound") } orgAgg := OrgAggregateFromWriteModel(&customText.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewCustomTextTemplateRemovedEvent(ctx, orgAgg, messageTextType, lang)) diff --git a/internal/command/org_custom_message_text_test.go b/internal/command/org_custom_message_text_test.go index 8b24ff5c5..424a88779 100644 --- a/internal/command/org_custom_message_text_test.go +++ b/internal/command/org_custom_message_text_test.go @@ -8,9 +8,9 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - zitadel_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_SetCustomMessageText(t *testing.T) { @@ -42,7 +42,7 @@ func TestCommandSide_SetCustomMessageText(t *testing.T) { config: &domain.CustomMessageText{}, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -58,7 +58,7 @@ func TestCommandSide_SetCustomMessageText(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -95,7 +95,7 @@ func TestCommandSide_SetCustomMessageText(t *testing.T) { config: &domain.CustomMessageText{}, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -111,7 +111,7 @@ func TestCommandSide_SetCustomMessageText(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -396,7 +396,7 @@ func TestCommandSide_RemoveCustomMessageText(t *testing.T) { lang: language.English, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -412,7 +412,7 @@ func TestCommandSide_RemoveCustomMessageText(t *testing.T) { lang: language.English, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -428,7 +428,7 @@ func TestCommandSide_RemoveCustomMessageText(t *testing.T) { mailTextType: "Template", }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/org_domain.go b/internal/command/org_domain.go index 6ae30baeb..98519bfc5 100644 --- a/internal/command/org_domain.go +++ b/internal/command/org_domain.go @@ -2,7 +2,7 @@ package command import ( "context" - errs "errors" + "errors" "strings" "github.com/zitadel/logging" @@ -12,23 +12,23 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) prepareAddOrgDomain(a *org.Aggregate, addDomain string, userIDs []string) preparation.Validation { return func() (preparation.CreateCommands, error) { if addDomain = strings.TrimSpace(addDomain); addDomain == "" { - return nil, errors.ThrowInvalidArgument(nil, "ORG-r3h4J", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-r3h4J", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { existing, err := orgDomain(ctx, filter, a.ID, addDomain) - if err != nil && !errs.Is(err, errors.ThrowNotFound(nil, "", "")) { + if err != nil && !errors.Is(err, zerrors.ThrowNotFound(nil, "", "")) { return nil, err } if existing != nil && existing.State == domain.OrgDomainStateActive { - return nil, errors.ThrowAlreadyExists(nil, "V2-e1wse", "Errors.Already.Exists") + return nil, zerrors.ThrowAlreadyExists(nil, "V2-e1wse", "Errors.Already.Exists") } domainPolicy, err := domainPolicyWriteModel(ctx, filter, a.ID) if err != nil { @@ -54,7 +54,7 @@ func (c *Commands) prepareAddOrgDomain(a *org.Aggregate, addDomain string, userI func verifyOrgDomain(a *org.Aggregate, domain string) preparation.Validation { return func() (preparation.CreateCommands, error) { if domain = strings.TrimSpace(domain); domain == "" { - return nil, errors.ThrowInvalidArgument(nil, "ORG-yqlVQ", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-yqlVQ", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { // no checks required because unique constraints handle it @@ -66,18 +66,18 @@ func verifyOrgDomain(a *org.Aggregate, domain string) preparation.Validation { func setPrimaryOrgDomain(a *org.Aggregate, domain string) preparation.Validation { return func() (preparation.CreateCommands, error) { if domain = strings.TrimSpace(domain); domain == "" { - return nil, errors.ThrowInvalidArgument(nil, "ORG-gmNqY", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-gmNqY", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { existing, err := orgDomain(ctx, filter, a.ID, domain) if err != nil { - return nil, errors.ThrowAlreadyExists(err, "V2-d0Gyw", "Errors.Already.Exists") + return nil, zerrors.ThrowAlreadyExists(err, "V2-d0Gyw", "Errors.Already.Exists") } if existing.Primary { - return nil, errors.ThrowPreconditionFailed(nil, "COMMA-FfoZO", "Errors.Org.DomainAlreadyPrimary") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMA-FfoZO", "Errors.Org.DomainAlreadyPrimary") } if !existing.Verified { - return nil, errors.ThrowPreconditionFailed(nil, "COMMA-yKA80", "Errors.Org.DomainNotVerified") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMA-yKA80", "Errors.Org.DomainNotVerified") } return []eventstore.Command{org.NewDomainPrimarySetEvent(ctx, &a.Aggregate, domain)}, nil }, nil @@ -91,7 +91,7 @@ func orgDomain(ctx context.Context, filter preparation.FilterToQueryReducer, org return nil, err } if len(events) == 0 { - return nil, errors.ThrowNotFound(nil, "COMMA-kFHpQ", "Errors.Org.DomainNotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMA-kFHpQ", "Errors.Org.DomainNotFound") } wm.AppendEvents(events...) if err = wm.Reduce(); err != nil { @@ -129,21 +129,21 @@ func (c *Commands) AddOrgDomain(ctx context.Context, orgID, domain string, claim func (c *Commands) GenerateOrgDomainValidation(ctx context.Context, orgDomain *domain.OrgDomain) (token, url string, err error) { if orgDomain == nil || !orgDomain.IsValid() || orgDomain.AggregateID == "" { - return "", "", errors.ThrowInvalidArgument(nil, "ORG-R24hb", "Errors.Org.InvalidDomain") + return "", "", zerrors.ThrowInvalidArgument(nil, "ORG-R24hb", "Errors.Org.InvalidDomain") } checkType, ok := orgDomain.ValidationType.CheckType() if !ok { - return "", "", errors.ThrowInvalidArgument(nil, "ORG-Gsw31", "Errors.Org.DomainVerificationTypeInvalid") + return "", "", zerrors.ThrowInvalidArgument(nil, "ORG-Gsw31", "Errors.Org.DomainVerificationTypeInvalid") } domainWriteModel, err := c.getOrgDomainWriteModel(ctx, orgDomain.AggregateID, orgDomain.Domain) if err != nil { return "", "", err } if domainWriteModel.State != domain.OrgDomainStateActive { - return "", "", errors.ThrowNotFound(nil, "ORG-AGD31", "Errors.Org.DomainNotOnOrg") + return "", "", zerrors.ThrowNotFound(nil, "ORG-AGD31", "Errors.Org.DomainNotOnOrg") } if domainWriteModel.Verified { - return "", "", errors.ThrowPreconditionFailed(nil, "ORG-HGw21", "Errors.Org.DomainAlreadyVerified") + return "", "", zerrors.ThrowPreconditionFailed(nil, "ORG-HGw21", "Errors.Org.DomainAlreadyVerified") } token, err = orgDomain.GenerateVerificationCode(c.domainVerificationGenerator) if err != nil { @@ -151,7 +151,7 @@ func (c *Commands) GenerateOrgDomainValidation(ctx context.Context, orgDomain *d } url, err = http_utils.TokenUrl(orgDomain.Domain, token, checkType) if err != nil { - return "", "", errors.ThrowPreconditionFailed(err, "ORG-Bae21", "Errors.Org.DomainVerificationTypeInvalid") + return "", "", zerrors.ThrowPreconditionFailed(err, "ORG-Bae21", "Errors.Org.DomainVerificationTypeInvalid") } orgAgg := OrgAggregateFromWriteModel(&domainWriteModel.WriteModel) @@ -167,20 +167,20 @@ func (c *Commands) GenerateOrgDomainValidation(ctx context.Context, orgDomain *d func (c *Commands) ValidateOrgDomain(ctx context.Context, orgDomain *domain.OrgDomain, claimedUserIDs []string) (*domain.ObjectDetails, error) { if orgDomain == nil || !orgDomain.IsValid() || orgDomain.AggregateID == "" { - return nil, errors.ThrowInvalidArgument(nil, "ORG-R24hb", "Errors.Org.InvalidDomain") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-R24hb", "Errors.Org.InvalidDomain") } domainWriteModel, err := c.getOrgDomainWriteModel(ctx, orgDomain.AggregateID, orgDomain.Domain) if err != nil { return nil, err } if domainWriteModel.State != domain.OrgDomainStateActive { - return nil, errors.ThrowNotFound(nil, "ORG-Sjdi3", "Errors.Org.DomainNotOnOrg") + return nil, zerrors.ThrowNotFound(nil, "ORG-Sjdi3", "Errors.Org.DomainNotOnOrg") } if domainWriteModel.Verified { - return nil, errors.ThrowPreconditionFailed(nil, "ORG-HGw21", "Errors.Org.DomainAlreadyVerified") + return nil, zerrors.ThrowPreconditionFailed(nil, "ORG-HGw21", "Errors.Org.DomainAlreadyVerified") } if domainWriteModel.ValidationCode == nil || domainWriteModel.ValidationType == domain.OrgDomainValidationTypeUnspecified { - return nil, errors.ThrowPreconditionFailed(nil, "ORG-SFBB3", "Errors.Org.DomainVerificationMissing") + return nil, zerrors.ThrowPreconditionFailed(nil, "ORG-SFBB3", "Errors.Org.DomainVerificationMissing") } validationCode, err := crypto.DecryptString(domainWriteModel.ValidationCode, c.domainVerificationAlg) @@ -222,17 +222,17 @@ func (c *Commands) ValidateOrgDomain(ctx context.Context, orgDomain *domain.OrgD func (c *Commands) SetPrimaryOrgDomain(ctx context.Context, orgDomain *domain.OrgDomain) (*domain.ObjectDetails, error) { if orgDomain == nil || !orgDomain.IsValid() || orgDomain.AggregateID == "" { - return nil, errors.ThrowInvalidArgument(nil, "ORG-SsDG2", "Errors.Org.InvalidDomain") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SsDG2", "Errors.Org.InvalidDomain") } domainWriteModel, err := c.getOrgDomainWriteModel(ctx, orgDomain.AggregateID, orgDomain.Domain) if err != nil { return nil, err } if domainWriteModel.State != domain.OrgDomainStateActive { - return nil, errors.ThrowNotFound(nil, "ORG-GDfA3", "Errors.Org.DomainNotOnOrg") + return nil, zerrors.ThrowNotFound(nil, "ORG-GDfA3", "Errors.Org.DomainNotOnOrg") } if !domainWriteModel.Verified { - return nil, errors.ThrowPreconditionFailed(nil, "ORG-Ggd32", "Errors.Org.DomainNotVerified") + return nil, zerrors.ThrowPreconditionFailed(nil, "ORG-Ggd32", "Errors.Org.DomainNotVerified") } orgAgg := OrgAggregateFromWriteModel(&domainWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewDomainPrimarySetEvent(ctx, orgAgg, orgDomain.Domain)) @@ -248,17 +248,17 @@ func (c *Commands) SetPrimaryOrgDomain(ctx context.Context, orgDomain *domain.Or func (c *Commands) RemoveOrgDomain(ctx context.Context, orgDomain *domain.OrgDomain) (*domain.ObjectDetails, error) { if orgDomain == nil || !orgDomain.IsValid() || orgDomain.AggregateID == "" { - return nil, errors.ThrowInvalidArgument(nil, "ORG-SJsK3", "Errors.Org.InvalidDomain") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SJsK3", "Errors.Org.InvalidDomain") } domainWriteModel, err := c.getOrgDomainWriteModel(ctx, orgDomain.AggregateID, orgDomain.Domain) if err != nil { return nil, err } if domainWriteModel.State != domain.OrgDomainStateActive { - return nil, errors.ThrowNotFound(nil, "ORG-GDfA3", "Errors.Org.DomainNotOnOrg") + return nil, zerrors.ThrowNotFound(nil, "ORG-GDfA3", "Errors.Org.DomainNotOnOrg") } if domainWriteModel.Primary { - return nil, errors.ThrowPreconditionFailed(nil, "ORG-Sjdi3", "Errors.Org.PrimaryDomainNotDeletable") + return nil, zerrors.ThrowPreconditionFailed(nil, "ORG-Sjdi3", "Errors.Org.PrimaryDomainNotDeletable") } orgAgg := OrgAggregateFromWriteModel(&domainWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewDomainRemovedEvent(ctx, orgAgg, orgDomain.Domain, domainWriteModel.Verified)) @@ -278,7 +278,7 @@ func (c *Commands) addOrgDomain(ctx context.Context, orgAgg *eventstore.Aggregat return nil, err } if addedDomain.State == domain.OrgDomainStateActive { - return nil, errors.ThrowAlreadyExists(nil, "COMMA-Bd2jj", "Errors.Org.Domain.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "COMMA-Bd2jj", "Errors.Org.Domain.AlreadyExists") } events := []eventstore.Command{ diff --git a/internal/command/org_domain_test.go b/internal/command/org_domain_test.go index acbb35d64..8af38098c 100644 --- a/internal/command/org_domain_test.go +++ b/internal/command/org_domain_test.go @@ -13,13 +13,13 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestAddDomain(t *testing.T) { @@ -45,7 +45,7 @@ func TestAddDomain(t *testing.T) { domain: "", }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "ORG-r3h4J", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "ORG-r3h4J", "Errors.Invalid.Argument"), }, }, { @@ -124,7 +124,7 @@ func TestAddDomain(t *testing.T) { }, }, want: Want{ - CreateErr: errors.ThrowAlreadyExists(nil, "", ""), + CreateErr: zerrors.ThrowAlreadyExists(nil, "", ""), }, }, } @@ -159,7 +159,7 @@ func TestVerifyDomain(t *testing.T) { domain: "", }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "ORG-yqlVQ", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "ORG-yqlVQ", "Errors.Invalid.Argument"), }, }, { @@ -203,7 +203,7 @@ func TestSetDomainPrimary(t *testing.T) { domain: "", }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "ORG-gmNqY", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "ORG-gmNqY", "Errors.Invalid.Argument"), }, }, { @@ -216,7 +216,7 @@ func TestSetDomainPrimary(t *testing.T) { }, }, want: Want{ - CreateErr: errors.ThrowNotFound(nil, "", ""), + CreateErr: zerrors.ThrowNotFound(nil, "", ""), }, }, { @@ -229,7 +229,7 @@ func TestSetDomainPrimary(t *testing.T) { }, }, want: Want{ - CreateErr: errors.ThrowPreconditionFailed(nil, "", ""), + CreateErr: zerrors.ThrowPreconditionFailed(nil, "", ""), }, }, { @@ -247,7 +247,7 @@ func TestSetDomainPrimary(t *testing.T) { }, }, want: Want{ - CreateErr: errors.ThrowPreconditionFailed(nil, "", ""), + CreateErr: zerrors.ThrowPreconditionFailed(nil, "", ""), }, }, { @@ -308,7 +308,7 @@ func TestCommandSide_AddOrgDomain(t *testing.T) { ctx: context.Background(), }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -338,7 +338,7 @@ func TestCommandSide_AddOrgDomain(t *testing.T) { domain: "domain.ch", }, res: res{ - err: errors.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -439,7 +439,7 @@ func TestCommandSide_GenerateOrgDomainValidation(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -456,7 +456,7 @@ func TestCommandSide_GenerateOrgDomainValidation(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -476,7 +476,7 @@ func TestCommandSide_GenerateOrgDomainValidation(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -505,7 +505,7 @@ func TestCommandSide_GenerateOrgDomainValidation(t *testing.T) { }, }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -546,7 +546,7 @@ func TestCommandSide_GenerateOrgDomainValidation(t *testing.T) { }, }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -710,7 +710,7 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -727,7 +727,7 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -756,7 +756,7 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) { }, }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -797,7 +797,7 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) { }, }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -832,7 +832,7 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) { }, }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -888,7 +888,7 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1154,7 +1154,7 @@ func TestCommandSide_SetPrimaryDomain(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1171,7 +1171,7 @@ func TestCommandSide_SetPrimaryDomain(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1200,7 +1200,7 @@ func TestCommandSide_SetPrimaryDomain(t *testing.T) { }, }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1234,7 +1234,7 @@ func TestCommandSide_SetPrimaryDomain(t *testing.T) { }, }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1339,7 +1339,7 @@ func TestCommandSide_RemoveOrgDomain(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1356,7 +1356,7 @@ func TestCommandSide_RemoveOrgDomain(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1385,7 +1385,7 @@ func TestCommandSide_RemoveOrgDomain(t *testing.T) { }, }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1431,7 +1431,7 @@ func TestCommandSide_RemoveOrgDomain(t *testing.T) { }, }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1545,7 +1545,7 @@ func TestCommandSide_RemoveOrgDomain(t *testing.T) { } func invalidDomainVerification(domain, token, verifier string, checkType http.CheckType) error { - return errors.ThrowInvalidArgument(nil, "HTTP-GH422", "Errors.Internal") + return zerrors.ThrowInvalidArgument(nil, "HTTP-GH422", "Errors.Internal") } func validDomainVerification(domain, token, verifier string, checkType http.CheckType) error { diff --git a/internal/command/org_flow.go b/internal/command/org_flow.go index e127517ca..9a9d47c96 100644 --- a/internal/command/org_flow.go +++ b/internal/command/org_flow.go @@ -5,20 +5,20 @@ import ( "reflect" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ClearFlow(ctx context.Context, flowType domain.FlowType, resourceOwner string) (*domain.ObjectDetails, error) { if !flowType.Valid() || resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-Dfw2h", "Errors.Flow.FlowTypeMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Dfw2h", "Errors.Flow.FlowTypeMissing") } existingFlow, err := c.getOrgFlowWriteModelByType(ctx, flowType, resourceOwner) if err != nil { return nil, err } if len(existingFlow.Triggers) == 0 { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-DgGh3", "Errors.Flow.Empty") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-DgGh3", "Errors.Flow.Empty") } orgAgg := OrgAggregateFromWriteModel(&existingFlow.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewFlowClearedEvent(ctx, orgAgg, flowType)) @@ -34,17 +34,17 @@ func (c *Commands) ClearFlow(ctx context.Context, flowType domain.FlowType, reso func (c *Commands) SetTriggerActions(ctx context.Context, flowType domain.FlowType, triggerType domain.TriggerType, actionIDs []string, resourceOwner string) (*domain.ObjectDetails, error) { if !flowType.Valid() || !triggerType.Valid() || resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-Dfhj5", "Errors.Flow.FlowTypeMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Dfhj5", "Errors.Flow.FlowTypeMissing") } if !flowType.HasTrigger(triggerType) { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-Dfgh6", "Errors.Flow.WrongTriggerType") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Dfgh6", "Errors.Flow.WrongTriggerType") } existingFlow, err := c.getOrgFlowWriteModelByType(ctx, flowType, resourceOwner) if err != nil { return nil, err } if reflect.DeepEqual(existingFlow.Triggers[triggerType], actionIDs) { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Nfh52", "Errors.Flow.NoChanges") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Nfh52", "Errors.Flow.NoChanges") } if len(actionIDs) > 0 { exists, err := c.actionsIDsExist(ctx, actionIDs, resourceOwner) @@ -52,7 +52,7 @@ func (c *Commands) SetTriggerActions(ctx context.Context, flowType domain.FlowTy return nil, err } if !exists { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-dg422", "Errors.Flow.ActionIDsNotExist") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-dg422", "Errors.Flow.ActionIDsNotExist") } } orgAgg := OrgAggregateFromWriteModel(&existingFlow.WriteModel) diff --git a/internal/command/org_flow_test.go b/internal/command/org_flow_test.go index 178cfd44a..36961bc6e 100644 --- a/internal/command/org_flow_test.go +++ b/internal/command/org_flow_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/action" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_ClearFlow(t *testing.T) { @@ -44,7 +44,7 @@ func TestCommands_ClearFlow(t *testing.T) { }, res{ details: nil, - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -61,7 +61,7 @@ func TestCommands_ClearFlow(t *testing.T) { }, res{ details: nil, - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -153,7 +153,7 @@ func TestCommands_SetTriggerActions(t *testing.T) { }, res{ details: nil, - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, //TODO: combination not possible at the moment, add when more flow types available @@ -199,7 +199,7 @@ func TestCommands_SetTriggerActions(t *testing.T) { }, res{ details: nil, - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -219,7 +219,7 @@ func TestCommands_SetTriggerActions(t *testing.T) { }, res{ details: nil, - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/org_idp.go b/internal/command/org_idp.go index 22479465c..f9d83ff9c 100644 --- a/internal/command/org_idp.go +++ b/internal/command/org_idp.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddOrgGenericOAuthProvider(ctx context.Context, resourceOwner string, provider GenericOAuthProvider) (string, *domain.ObjectDetails, error) { @@ -113,7 +113,7 @@ func (c *Commands) migrateOrgGenericOIDC(ctx context.Context, resourceOwner, id case GoogleProvider: validation = c.prepareMigrateOrgOIDCToGoogleProvider(orgAgg, writeModel, p) default: - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-s9s2919", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-s9s2919", "Errors.IDPConfig.NotExisting") } cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, validation) @@ -581,25 +581,25 @@ func ExistsOrgIDP(ctx context.Context, filter preparation.FilterToQueryReducer, func (c *Commands) prepareAddOrgOAuthProvider(a *org.Aggregate, writeModel *OrgOAuthIDPWriteModel, provider GenericOAuthProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-D32ef", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-D32ef", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Dbgzf", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Dbgzf", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-DF4ga", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-DF4ga", "Errors.Invalid.Argument") } if provider.AuthorizationEndpoint = strings.TrimSpace(provider.AuthorizationEndpoint); provider.AuthorizationEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-B23bs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-B23bs", "Errors.Invalid.Argument") } if provider.TokenEndpoint = strings.TrimSpace(provider.TokenEndpoint); provider.TokenEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-D2gj8", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-D2gj8", "Errors.Invalid.Argument") } if provider.UserEndpoint = strings.TrimSpace(provider.UserEndpoint); provider.UserEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Fb8jk", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Fb8jk", "Errors.Invalid.Argument") } if provider.IDAttribute = strings.TrimSpace(provider.IDAttribute); provider.IDAttribute == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-sadf3d", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-sadf3d", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -637,25 +637,25 @@ func (c *Commands) prepareAddOrgOAuthProvider(a *org.Aggregate, writeModel *OrgO func (c *Commands) prepareUpdateOrgOAuthProvider(a *org.Aggregate, writeModel *OrgOAuthIDPWriteModel, provider GenericOAuthProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-asfsa", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-asfsa", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-D32ef", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-D32ef", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Dbgzf", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Dbgzf", "Errors.Invalid.Argument") } if provider.AuthorizationEndpoint = strings.TrimSpace(provider.AuthorizationEndpoint); provider.AuthorizationEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-B23bs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-B23bs", "Errors.Invalid.Argument") } if provider.TokenEndpoint = strings.TrimSpace(provider.TokenEndpoint); provider.TokenEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-D2gj8", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-D2gj8", "Errors.Invalid.Argument") } if provider.UserEndpoint = strings.TrimSpace(provider.UserEndpoint); provider.UserEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Fb8jk", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Fb8jk", "Errors.Invalid.Argument") } if provider.IDAttribute = strings.TrimSpace(provider.IDAttribute); provider.IDAttribute == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SAe4gh", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SAe4gh", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -667,7 +667,7 @@ func (c *Commands) prepareUpdateOrgOAuthProvider(a *org.Aggregate, writeModel *O return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-JNsd3", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-JNsd3", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -695,16 +695,16 @@ func (c *Commands) prepareUpdateOrgOAuthProvider(a *org.Aggregate, writeModel *O func (c *Commands) prepareAddOrgOIDCProvider(a *org.Aggregate, writeModel *OrgOIDCIDPWriteModel, provider GenericOIDCProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Sgtj5", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Sgtj5", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Hz6zj", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Hz6zj", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-fb5jm", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-fb5jm", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Sfdf4", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Sfdf4", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -740,16 +740,16 @@ func (c *Commands) prepareAddOrgOIDCProvider(a *org.Aggregate, writeModel *OrgOI func (c *Commands) prepareUpdateOrgOIDCProvider(a *org.Aggregate, writeModel *OrgOIDCIDPWriteModel, provider GenericOIDCProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SAfd3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SAfd3", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Dvf4f", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Dvf4f", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-BDfr3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-BDfr3", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Db3bs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Db3bs", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -761,7 +761,7 @@ func (c *Commands) prepareUpdateOrgOIDCProvider(a *org.Aggregate, writeModel *Or return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-Dg331", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-Dg331", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -787,13 +787,13 @@ func (c *Commands) prepareUpdateOrgOIDCProvider(a *org.Aggregate, writeModel *Or func (c *Commands) prepareMigrateOrgOIDCToAzureADProvider(a *org.Aggregate, writeModel *OrgOIDCIDPWriteModel, provider AzureADProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-sdf3g", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-sdf3g", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Fhbr2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Fhbr2", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Dzh3g", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Dzh3g", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -805,7 +805,7 @@ func (c *Commands) prepareMigrateOrgOIDCToAzureADProvider(a *org.Aggregate, writ return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-Dg239201", "Errors.Instance.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-Dg239201", "Errors.Instance.IDPConfig.NotExisting") } secret, err := crypto.Encrypt([]byte(provider.ClientSecret), c.idpConfigEncryption) if err != nil { @@ -832,10 +832,10 @@ func (c *Commands) prepareMigrateOrgOIDCToAzureADProvider(a *org.Aggregate, writ func (c *Commands) prepareMigrateOrgOIDCToGoogleProvider(a *org.Aggregate, writeModel *OrgOIDCIDPWriteModel, provider GoogleProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-D3fvs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-D3fvs", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-W2vqs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-W2vqs", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -847,7 +847,7 @@ func (c *Commands) prepareMigrateOrgOIDCToGoogleProvider(a *org.Aggregate, write return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "INST-x09981", "Errors.Instance.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "INST-x09981", "Errors.Instance.IDPConfig.NotExisting") } secret, err := crypto.Encrypt([]byte(provider.ClientSecret), c.idpConfigEncryption) if err != nil { @@ -872,19 +872,19 @@ func (c *Commands) prepareMigrateOrgOIDCToGoogleProvider(a *org.Aggregate, write func (c *Commands) prepareAddOrgJWTProvider(a *org.Aggregate, writeModel *OrgJWTIDPWriteModel, provider JWTProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-JLKef", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-JLKef", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-WNJK3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-WNJK3", "Errors.Invalid.Argument") } if provider.JWTEndpoint = strings.TrimSpace(provider.JWTEndpoint); provider.JWTEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-NJKSD", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-NJKSD", "Errors.Invalid.Argument") } if provider.KeyEndpoint = strings.TrimSpace(provider.KeyEndpoint); provider.KeyEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-NJKE3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-NJKE3", "Errors.Invalid.Argument") } if provider.HeaderName = strings.TrimSpace(provider.HeaderName); provider.HeaderName == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-2rlks", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-2rlks", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -915,22 +915,22 @@ func (c *Commands) prepareAddOrgJWTProvider(a *org.Aggregate, writeModel *OrgJWT func (c *Commands) prepareUpdateOrgJWTProvider(a *org.Aggregate, writeModel *OrgJWTIDPWriteModel, provider JWTProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-HUe3q", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-HUe3q", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-JKLS2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-JKLS2", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-JKs3f", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-JKs3f", "Errors.Invalid.Argument") } if provider.JWTEndpoint = strings.TrimSpace(provider.JWTEndpoint); provider.JWTEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-NJKS2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-NJKS2", "Errors.Invalid.Argument") } if provider.KeyEndpoint = strings.TrimSpace(provider.KeyEndpoint); provider.KeyEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SJk2d", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SJk2d", "Errors.Invalid.Argument") } if provider.HeaderName = strings.TrimSpace(provider.HeaderName); provider.HeaderName == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SJK2f", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SJK2f", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -942,7 +942,7 @@ func (c *Commands) prepareUpdateOrgJWTProvider(a *org.Aggregate, writeModel *Org return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-Bhju5", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-Bhju5", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -966,13 +966,13 @@ func (c *Commands) prepareUpdateOrgJWTProvider(a *org.Aggregate, writeModel *Org func (c *Commands) prepareAddOrgAzureADProvider(a *org.Aggregate, writeModel *OrgAzureADIDPWriteModel, provider AzureADProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-sdf3g", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-sdf3g", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Fhbr2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Fhbr2", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Dzh3g", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Dzh3g", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1008,13 +1008,13 @@ func (c *Commands) prepareAddOrgAzureADProvider(a *org.Aggregate, writeModel *Or func (c *Commands) prepareUpdateOrgAzureADProvider(a *org.Aggregate, writeModel *OrgAzureADIDPWriteModel, provider AzureADProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SAgh2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SAgh2", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-fh3h1", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-fh3h1", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-dmitg", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-dmitg", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1026,7 +1026,7 @@ func (c *Commands) prepareUpdateOrgAzureADProvider(a *org.Aggregate, writeModel return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-BHz3q", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-BHz3q", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1052,10 +1052,10 @@ func (c *Commands) prepareUpdateOrgAzureADProvider(a *org.Aggregate, writeModel func (c *Commands) prepareAddOrgGitHubProvider(a *org.Aggregate, writeModel *OrgGitHubIDPWriteModel, provider GitHubProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Jdsgf", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Jdsgf", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-dsgz3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-dsgz3", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1089,10 +1089,10 @@ func (c *Commands) prepareAddOrgGitHubProvider(a *org.Aggregate, writeModel *Org func (c *Commands) prepareUpdateOrgGitHubProvider(a *org.Aggregate, writeModel *OrgGitHubIDPWriteModel, provider GitHubProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-sdf4h", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-sdf4h", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-fdh5z", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-fdh5z", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1104,7 +1104,7 @@ func (c *Commands) prepareUpdateOrgGitHubProvider(a *org.Aggregate, writeModel * return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-Dr1gs", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-Dr1gs", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1131,22 +1131,22 @@ func (c *Commands) prepareUpdateOrgGitHubProvider(a *org.Aggregate, writeModel * func (c *Commands) prepareAddOrgGitHubEnterpriseProvider(a *org.Aggregate, writeModel *OrgGitHubEnterpriseIDPWriteModel, provider GitHubEnterpriseProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Dg4td", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Dg4td", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-dgj53", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-dgj53", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Ghjjs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Ghjjs", "Errors.Invalid.Argument") } if provider.AuthorizationEndpoint = strings.TrimSpace(provider.AuthorizationEndpoint); provider.AuthorizationEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-sani2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-sani2", "Errors.Invalid.Argument") } if provider.TokenEndpoint = strings.TrimSpace(provider.TokenEndpoint); provider.TokenEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-agj42", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-agj42", "Errors.Invalid.Argument") } if provider.UserEndpoint = strings.TrimSpace(provider.UserEndpoint); provider.UserEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-sd5hn", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-sd5hn", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1183,22 +1183,22 @@ func (c *Commands) prepareAddOrgGitHubEnterpriseProvider(a *org.Aggregate, write func (c *Commands) prepareUpdateOrgGitHubEnterpriseProvider(a *org.Aggregate, writeModel *OrgGitHubEnterpriseIDPWriteModel, provider GitHubEnterpriseProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-sdfh3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-sdfh3", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-shj42", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-shj42", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-sdh73", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-sdh73", "Errors.Invalid.Argument") } if provider.AuthorizationEndpoint = strings.TrimSpace(provider.AuthorizationEndpoint); provider.AuthorizationEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-acx2w", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-acx2w", "Errors.Invalid.Argument") } if provider.TokenEndpoint = strings.TrimSpace(provider.TokenEndpoint); provider.TokenEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-dgj6q", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-dgj6q", "Errors.Invalid.Argument") } if provider.UserEndpoint = strings.TrimSpace(provider.UserEndpoint); provider.UserEndpoint == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-ybj62", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-ybj62", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1210,7 +1210,7 @@ func (c *Commands) prepareUpdateOrgGitHubEnterpriseProvider(a *org.Aggregate, wr return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-GBr42", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-GBr42", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1240,10 +1240,10 @@ func (c *Commands) prepareUpdateOrgGitHubEnterpriseProvider(a *org.Aggregate, wr func (c *Commands) prepareAddOrgGitLabProvider(a *org.Aggregate, writeModel *OrgGitLabIDPWriteModel, provider GitLabProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-adsg2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-adsg2", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-GD1j2", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-GD1j2", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1277,10 +1277,10 @@ func (c *Commands) prepareAddOrgGitLabProvider(a *org.Aggregate, writeModel *Org func (c *Commands) prepareUpdateOrgGitLabProvider(a *org.Aggregate, writeModel *OrgGitLabIDPWriteModel, provider GitLabProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-HJK91", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-HJK91", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-D12t6", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-D12t6", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1292,7 +1292,7 @@ func (c *Commands) prepareUpdateOrgGitLabProvider(a *org.Aggregate, writeModel * return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-HBReq", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-HBReq", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1319,16 +1319,16 @@ func (c *Commands) prepareUpdateOrgGitLabProvider(a *org.Aggregate, writeModel * func (c *Commands) prepareAddOrgGitLabSelfHostedProvider(a *org.Aggregate, writeModel *OrgGitLabSelfHostedIDPWriteModel, provider GitLabSelfHostedProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-jw4ZT", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-jw4ZT", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-AST4S", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-AST4S", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-DBZHJ", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-DBZHJ", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SDGJ4", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SDGJ4", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1363,16 +1363,16 @@ func (c *Commands) prepareAddOrgGitLabSelfHostedProvider(a *org.Aggregate, write func (c *Commands) prepareUpdateOrgGitLabSelfHostedProvider(a *org.Aggregate, writeModel *OrgGitLabSelfHostedIDPWriteModel, provider GitLabSelfHostedProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SAFG4", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SAFG4", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-DG4H", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-DG4H", "Errors.Invalid.Argument") } if provider.Issuer = strings.TrimSpace(provider.Issuer); provider.Issuer == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SD4eb", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SD4eb", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-GHWE3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-GHWE3", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1384,7 +1384,7 @@ func (c *Commands) prepareUpdateOrgGitLabSelfHostedProvider(a *org.Aggregate, wr return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-D2tg1", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-D2tg1", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1412,10 +1412,10 @@ func (c *Commands) prepareUpdateOrgGitLabSelfHostedProvider(a *org.Aggregate, wr func (c *Commands) prepareAddOrgGoogleProvider(a *org.Aggregate, writeModel *OrgGoogleIDPWriteModel, provider GoogleProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-D3fvs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-D3fvs", "Errors.Invalid.Argument") } if provider.ClientSecret = strings.TrimSpace(provider.ClientSecret); provider.ClientSecret == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-W2vqs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-W2vqs", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1449,10 +1449,10 @@ func (c *Commands) prepareAddOrgGoogleProvider(a *org.Aggregate, writeModel *Org func (c *Commands) prepareUpdateOrgGoogleProvider(a *org.Aggregate, writeModel *OrgGoogleIDPWriteModel, provider GoogleProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-S32t1", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-S32t1", "Errors.Invalid.Argument") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-ds432", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-ds432", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1464,7 +1464,7 @@ func (c *Commands) prepareUpdateOrgGoogleProvider(a *org.Aggregate, writeModel * return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-Dqrg1", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-Dqrg1", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1488,28 +1488,28 @@ func (c *Commands) prepareUpdateOrgGoogleProvider(a *org.Aggregate, writeModel * func (c *Commands) prepareAddOrgLDAPProvider(a *org.Aggregate, writeModel *OrgLDAPIDPWriteModel, provider LDAPProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SAfdd", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SAfdd", "Errors.Invalid.Argument") } if provider.BaseDN = strings.TrimSpace(provider.BaseDN); provider.BaseDN == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-sv31s", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-sv31s", "Errors.Invalid.Argument") } if provider.BindDN = strings.TrimSpace(provider.BindDN); provider.BindDN == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-sdgf4", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-sdgf4", "Errors.Invalid.Argument") } if provider.BindPassword = strings.TrimSpace(provider.BindPassword); provider.BindPassword == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-AEG2w", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-AEG2w", "Errors.Invalid.Argument") } if provider.UserBase = strings.TrimSpace(provider.UserBase); provider.UserBase == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SAD5n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SAD5n", "Errors.Invalid.Argument") } if len(provider.Servers) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SAy945n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SAy945n", "Errors.Invalid.Argument") } if len(provider.UserObjectClasses) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-S1x705n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-S1x705n", "Errors.Invalid.Argument") } if len(provider.UserFilters) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-aAx9x1n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-aAx9x1n", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1550,28 +1550,28 @@ func (c *Commands) prepareAddOrgLDAPProvider(a *org.Aggregate, writeModel *OrgLD func (c *Commands) prepareUpdateOrgLDAPProvider(a *org.Aggregate, writeModel *OrgLDAPIDPWriteModel, provider LDAPProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Dgdbs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Dgdbs", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Sffgd", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Sffgd", "Errors.Invalid.Argument") } if provider.BaseDN = strings.TrimSpace(provider.BaseDN); provider.BaseDN == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-vb3ss", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-vb3ss", "Errors.Invalid.Argument") } if provider.BindDN = strings.TrimSpace(provider.BindDN); provider.BindDN == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-hbere", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-hbere", "Errors.Invalid.Argument") } if provider.UserBase = strings.TrimSpace(provider.UserBase); provider.UserBase == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-DG45z", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-DG45z", "Errors.Invalid.Argument") } if len(provider.Servers) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Sxx945n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Sxx945n", "Errors.Invalid.Argument") } if len(provider.UserObjectClasses) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-S1p605n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-S1p605n", "Errors.Invalid.Argument") } if len(provider.UserFilters) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-aBx901n", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-aBx901n", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1583,7 +1583,7 @@ func (c *Commands) prepareUpdateOrgLDAPProvider(a *org.Aggregate, writeModel *Or return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-ASF3F", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-ASF3F", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1614,16 +1614,16 @@ func (c *Commands) prepareUpdateOrgLDAPProvider(a *org.Aggregate, writeModel *Or func (c *Commands) prepareAddOrgAppleProvider(a *org.Aggregate, writeModel *OrgAppleIDPWriteModel, provider AppleProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-jkn3w", "Errors.IDP.ClientIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-jkn3w", "Errors.IDP.ClientIDMissing") } if provider.TeamID = strings.TrimSpace(provider.TeamID); provider.TeamID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Ffg32", "Errors.IDP.TeamIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Ffg32", "Errors.IDP.TeamIDMissing") } if provider.KeyID = strings.TrimSpace(provider.KeyID); provider.KeyID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-GDjm5", "Errors.IDP.KeyIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-GDjm5", "Errors.IDP.KeyIDMissing") } if len(provider.PrivateKey) == 0 { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-GVD4n", "Errors.IDP.PrivateKeyMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-GVD4n", "Errors.IDP.PrivateKeyMissing") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1659,16 +1659,16 @@ func (c *Commands) prepareAddOrgAppleProvider(a *org.Aggregate, writeModel *OrgA func (c *Commands) prepareUpdateOrgAppleProvider(a *org.Aggregate, writeModel *OrgAppleIDPWriteModel, provider AppleProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-FRHBH", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-FRHBH", "Errors.IDMissing") } if provider.ClientID = strings.TrimSpace(provider.ClientID); provider.ClientID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SFm4l", "Errors.IDP.ClientIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SFm4l", "Errors.IDP.ClientIDMissing") } if provider.TeamID = strings.TrimSpace(provider.TeamID); provider.TeamID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-SG34t", "Errors.IDP.TeamIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-SG34t", "Errors.IDP.TeamIDMissing") } if provider.KeyID = strings.TrimSpace(provider.KeyID); provider.KeyID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-Gh4z2", "Errors.IDP.KeyIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Gh4z2", "Errors.IDP.KeyIDMissing") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1680,7 +1680,7 @@ func (c *Commands) prepareUpdateOrgAppleProvider(a *org.Aggregate, writeModel *O return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-SG3bh", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-SG3bh", "Errors.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1706,15 +1706,15 @@ func (c *Commands) prepareUpdateOrgAppleProvider(a *org.Aggregate, writeModel *O func (c *Commands) prepareAddOrgSAMLProvider(a *org.Aggregate, writeModel *OrgSAMLIDPWriteModel, provider SAMLProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-957lr0f8u3", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-957lr0f8u3", "Errors.Invalid.Argument") } if provider.Metadata == nil && provider.MetadataURL == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-78isv6m53a", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-78isv6m53a", "Errors.Invalid.Argument") } if provider.Metadata == nil && provider.MetadataURL != "" { data, err := xml.ReadMetadataFromURL(c.httpClient, provider.MetadataURL) if err != nil { - return nil, caos_errs.ThrowInvalidArgument(err, "ORG-ipzxvf3cv2", "Errors.Project.App.SAMLMetadataMissing") + return nil, zerrors.ThrowInvalidArgument(err, "ORG-ipzxvf3cv2", "Errors.Project.App.SAMLMetadataMissing") } provider.Metadata = data } @@ -1756,20 +1756,20 @@ func (c *Commands) prepareAddOrgSAMLProvider(a *org.Aggregate, writeModel *OrgSA func (c *Commands) prepareUpdateOrgSAMLProvider(a *org.Aggregate, writeModel *OrgSAMLIDPWriteModel, provider SAMLProvider) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-wwdwdlaya0", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-wwdwdlaya0", "Errors.Invalid.Argument") } if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-egixaofgyl", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-egixaofgyl", "Errors.Invalid.Argument") } if provider.Metadata == nil && provider.MetadataURL != "" { data, err := xml.ReadMetadataFromURL(c.httpClient, provider.MetadataURL) if err != nil { - return nil, caos_errs.ThrowInvalidArgument(err, "ORG-bkaiyd3rfo", "Errors.Project.App.SAMLMetadataMissing") + return nil, zerrors.ThrowInvalidArgument(err, "ORG-bkaiyd3rfo", "Errors.Project.App.SAMLMetadataMissing") } provider.Metadata = data } if provider.Metadata == nil { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-j6spncd74m", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-j6spncd74m", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1781,7 +1781,7 @@ func (c *Commands) prepareUpdateOrgSAMLProvider(a *org.Aggregate, writeModel *Or return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-z82dddndql", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-z82dddndql", "Errors.Org.IDPConfig.NotExisting") } event, err := writeModel.NewChangedEvent( ctx, @@ -1807,7 +1807,7 @@ func (c *Commands) prepareUpdateOrgSAMLProvider(a *org.Aggregate, writeModel *Or func (c *Commands) prepareRegenerateOrgSAMLProviderCertificate(a *org.Aggregate, writeModel *OrgSAMLIDPWriteModel) preparation.Validation { return func() (preparation.CreateCommands, error) { if writeModel.ID = strings.TrimSpace(writeModel.ID); writeModel.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "ORG-arv4vdrb6c", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-arv4vdrb6c", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { events, err := filter(ctx, writeModel.Query()) @@ -1819,7 +1819,7 @@ func (c *Commands) prepareRegenerateOrgSAMLProviderCertificate(a *org.Aggregate, return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-4dw21ch9o9", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-4dw21ch9o9", "Errors.Org.IDPConfig.NotExisting") } key, cert, err := c.samlCertificateAndKeyGenerator(writeModel.ID) @@ -1860,7 +1860,7 @@ func (c *Commands) prepareDeleteOrgProvider(a *org.Aggregate, resourceOwner, id return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-Se3tg", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-Se3tg", "Errors.Org.IDPConfig.NotExisting") } return []eventstore.Command{org.NewIDPRemovedEvent(ctx, &a.Aggregate, id)}, nil }, nil diff --git a/internal/command/org_idp_config.go b/internal/command/org_idp_config.go index f135a4109..8b4954c01 100644 --- a/internal/command/org_idp_config.go +++ b/internal/command/org_idp_config.go @@ -5,10 +5,10 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" org_repo "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ImportIDPConfig(ctx context.Context, config *domain.IDPConfig, idpConfigID, resourceOwner string) (*domain.IDPConfig, error) { @@ -17,17 +17,17 @@ func (c *Commands) ImportIDPConfig(ctx context.Context, config *domain.IDPConfig return nil, err } if existingIDP.State != domain.IDPConfigStateRemoved && existingIDP.State != domain.IDPConfigStateUnspecified { - return nil, errors.ThrowNotFound(nil, "Org-1J8fs", "Errors.Org.IDPConfig.AlreadyExisting") + return nil, zerrors.ThrowNotFound(nil, "Org-1J8fs", "Errors.Org.IDPConfig.AlreadyExisting") } return c.addIDPConfig(ctx, config, idpConfigID, resourceOwner) } func (c *Commands) AddIDPConfig(ctx context.Context, config *domain.IDPConfig, resourceOwner string) (*domain.IDPConfig, error) { if resourceOwner == "" { - return nil, errors.ThrowInvalidArgument(nil, "Org-0j8gs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-0j8gs", "Errors.ResourceOwnerMissing") } if config.OIDCConfig == nil && config.JWTConfig == nil { - return nil, errors.ThrowInvalidArgument(nil, "Org-eUpQU", "Errors.idp.config.notset") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-eUpQU", "Errors.idp.config.notset") } idpConfigID, err := c.idGenerator.Next() if err != nil { @@ -94,14 +94,14 @@ func (c *Commands) addIDPConfig(ctx context.Context, config *domain.IDPConfig, i func (c *Commands) ChangeIDPConfig(ctx context.Context, config *domain.IDPConfig, resourceOwner string) (*domain.IDPConfig, error) { if resourceOwner == "" { - return nil, errors.ThrowInvalidArgument(nil, "Org-Gh8ds", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-Gh8ds", "Errors.ResourceOwnerMissing") } existingIDP, err := c.orgIDPConfigWriteModelByID(ctx, config.IDPConfigID, resourceOwner) if err != nil { return nil, err } if existingIDP.State == domain.IDPConfigStateRemoved || existingIDP.State == domain.IDPConfigStateUnspecified { - return nil, errors.ThrowNotFound(nil, "Org-1J9fs", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "Org-1J9fs", "Errors.Org.IDPConfig.NotExisting") } orgAgg := OrgAggregateFromWriteModel(&existingIDP.WriteModel) @@ -114,7 +114,7 @@ func (c *Commands) ChangeIDPConfig(ctx context.Context, config *domain.IDPConfig config.AutoRegister) if !hasChanged { - return nil, errors.ThrowPreconditionFailed(nil, "Org-jf9w", "Errors.Org.IDPConfig.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-jf9w", "Errors.Org.IDPConfig.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { @@ -133,7 +133,7 @@ func (c *Commands) DeactivateIDPConfig(ctx context.Context, idpID, orgID string) return nil, err } if existingIDP.State != domain.IDPConfigStateActive { - return nil, errors.ThrowPreconditionFailed(nil, "Org-BBmd0", "Errors.Org.IDPConfig.NotActive") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-BBmd0", "Errors.Org.IDPConfig.NotActive") } orgAgg := OrgAggregateFromWriteModel(&existingIDP.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org_repo.NewIDPConfigDeactivatedEvent(ctx, orgAgg, idpID)) @@ -153,7 +153,7 @@ func (c *Commands) ReactivateIDPConfig(ctx context.Context, idpID, orgID string) return nil, err } if existingIDP.State != domain.IDPConfigStateInactive { - return nil, errors.ThrowPreconditionFailed(nil, "Org-5Mo0d", "Errors.Org.IDPConfig.NotInactive") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-5Mo0d", "Errors.Org.IDPConfig.NotInactive") } orgAgg := OrgAggregateFromWriteModel(&existingIDP.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org_repo.NewIDPConfigReactivatedEvent(ctx, orgAgg, idpID)) @@ -189,7 +189,7 @@ func (c *Commands) RemoveIDPConfig(ctx context.Context, idpID, orgID string, cas func (c *Commands) removeIDPConfig(ctx context.Context, existingIDP *OrgIDPConfigWriteModel, cascadeRemoveProvider bool, cascadeExternalIDPs ...*domain.UserIDPLink) ([]eventstore.Command, error) { if existingIDP.State == domain.IDPConfigStateRemoved || existingIDP.State == domain.IDPConfigStateUnspecified { - return nil, errors.ThrowNotFound(nil, "Org-Yx9vd", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "Org-Yx9vd", "Errors.Org.IDPConfig.NotExisting") } orgAgg := OrgAggregateFromWriteModel(&existingIDP.WriteModel) @@ -210,7 +210,7 @@ func (c *Commands) getOrgIDPConfigByID(ctx context.Context, idpID, orgID string) return nil, err } if !config.State.Exists() { - return nil, errors.ThrowNotFound(nil, "ORG-2m90f", "Errors.Org.IDPConfig.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "ORG-2m90f", "Errors.Org.IDPConfig.NotExisting") } return writeModelToIDPConfig(&config.IDPConfigWriteModel), nil } diff --git a/internal/command/org_idp_config_test.go b/internal/command/org_idp_config_test.go index 3da55353a..289799769 100644 --- a/internal/command/org_idp_config_test.go +++ b/internal/command/org_idp_config_test.go @@ -10,7 +10,6 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" @@ -18,6 +17,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddIDPConfig(t *testing.T) { @@ -65,7 +65,7 @@ func TestCommandSide_AddIDPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -81,7 +81,7 @@ func TestCommandSide_AddIDPConfig(t *testing.T) { config: &domain.IDPConfig{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -261,7 +261,7 @@ func TestCommandSide_ChangeIDPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -276,7 +276,7 @@ func TestCommandSide_ChangeIDPConfig(t *testing.T) { config: &domain.IDPConfig{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -295,7 +295,7 @@ func TestCommandSide_ChangeIDPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -433,7 +433,7 @@ func TestCommands_RemoveIDPConfig(t *testing.T) { }, res{ nil, - caos_errs.IsNotFound, + zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_idp_jwt_config.go b/internal/command/org_idp_jwt_config.go index 94626420e..c12ad8ec5 100644 --- a/internal/command/org_idp_jwt_config.go +++ b/internal/command/org_idp_jwt_config.go @@ -4,15 +4,15 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ChangeIDPJWTConfig(ctx context.Context, config *domain.JWTIDPConfig, resourceOwner string) (*domain.JWTIDPConfig, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-ff8NF", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-ff8NF", "Errors.ResourceOwnerMissing") } if config.IDPConfigID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-2n99f", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-2n99f", "Errors.IDMissing") } existingConfig := NewOrgIDPJWTConfigWriteModel(config.IDPConfigID, resourceOwner) err := c.eventstore.FilterToQueryReducer(ctx, existingConfig) @@ -21,7 +21,7 @@ func (c *Commands) ChangeIDPJWTConfig(ctx context.Context, config *domain.JWTIDP } if existingConfig.State == domain.IDPConfigStateRemoved || existingConfig.State == domain.IDPConfigStateUnspecified { - return nil, caos_errs.ThrowNotFound(nil, "Org-67J9d", "Errors.Org.IDPConfig.AlreadyExists") + return nil, zerrors.ThrowNotFound(nil, "Org-67J9d", "Errors.Org.IDPConfig.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&existingConfig.WriteModel) @@ -37,7 +37,7 @@ func (c *Commands) ChangeIDPJWTConfig(ctx context.Context, config *domain.JWTIDP return nil, err } if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-2k9fs", "Errors.Org.IDPConfig.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-2k9fs", "Errors.Org.IDPConfig.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) diff --git a/internal/command/org_idp_jwt_config_test.go b/internal/command/org_idp_jwt_config_test.go index 4000f4210..9368cf989 100644 --- a/internal/command/org_idp_jwt_config_test.go +++ b/internal/command/org_idp_jwt_config_test.go @@ -9,11 +9,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ChangeIDPJWTConfig(t *testing.T) { @@ -52,7 +52,7 @@ func TestCommandSide_ChangeIDPJWTConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -68,7 +68,7 @@ func TestCommandSide_ChangeIDPJWTConfig(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -87,7 +87,7 @@ func TestCommandSide_ChangeIDPJWTConfig(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -134,7 +134,7 @@ func TestCommandSide_ChangeIDPJWTConfig(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -179,7 +179,7 @@ func TestCommandSide_ChangeIDPJWTConfig(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/org_idp_oidc_config.go b/internal/command/org_idp_oidc_config.go index b712fa9a1..ed0add4ea 100644 --- a/internal/command/org_idp_oidc_config.go +++ b/internal/command/org_idp_oidc_config.go @@ -4,15 +4,15 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ChangeIDPOIDCConfig(ctx context.Context, config *domain.OIDCIDPConfig, resourceOwner string) (*domain.OIDCIDPConfig, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-4n8f2", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-4n8f2", "Errors.ResourceOwnerMissing") } if config.IDPConfigID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-66Qwj", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-66Qwj", "Errors.IDMissing") } existingConfig := NewOrgIDPOIDCConfigWriteModel(config.IDPConfigID, resourceOwner) err := c.eventstore.FilterToQueryReducer(ctx, existingConfig) @@ -21,7 +21,7 @@ func (c *Commands) ChangeIDPOIDCConfig(ctx context.Context, config *domain.OIDCI } if existingConfig.State == domain.IDPConfigStateRemoved || existingConfig.State == domain.IDPConfigStateUnspecified { - return nil, caos_errs.ThrowNotFound(nil, "Org-67J9d", "Errors.Org.IDPConfig.AlreadyExists") + return nil, zerrors.ThrowNotFound(nil, "Org-67J9d", "Errors.Org.IDPConfig.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&existingConfig.WriteModel) @@ -42,7 +42,7 @@ func (c *Commands) ChangeIDPOIDCConfig(ctx context.Context, config *domain.OIDCI return nil, err } if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-10ods", "Errors.Org.IDPConfig.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-10ods", "Errors.Org.IDPConfig.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) diff --git a/internal/command/org_idp_oidc_config_test.go b/internal/command/org_idp_oidc_config_test.go index fb68f7fac..b448fb36b 100644 --- a/internal/command/org_idp_oidc_config_test.go +++ b/internal/command/org_idp_oidc_config_test.go @@ -9,11 +9,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ChangeIDPOIDCConfig(t *testing.T) { @@ -52,7 +52,7 @@ func TestCommandSide_ChangeIDPOIDCConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -68,7 +68,7 @@ func TestCommandSide_ChangeIDPOIDCConfig(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -87,7 +87,7 @@ func TestCommandSide_ChangeIDPOIDCConfig(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -143,7 +143,7 @@ func TestCommandSide_ChangeIDPOIDCConfig(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -200,7 +200,7 @@ func TestCommandSide_ChangeIDPOIDCConfig(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/org_idp_test.go b/internal/command/org_idp_test.go index a740aa54a..ebb868212 100644 --- a/internal/command/org_idp_test.go +++ b/internal/command/org_idp_test.go @@ -12,12 +12,12 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/idp" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddOrgGenericOAuthIDP(t *testing.T) { @@ -55,7 +55,7 @@ func TestCommandSide_AddOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-D32ef", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-D32ef", "")) }, }, }, @@ -74,7 +74,7 @@ func TestCommandSide_AddOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Dbgzf", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Dbgzf", "")) }, }, }, @@ -94,7 +94,7 @@ func TestCommandSide_AddOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-DF4ga", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-DF4ga", "")) }, }, }, @@ -115,7 +115,7 @@ func TestCommandSide_AddOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-B23bs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-B23bs", "")) }, }, }, @@ -137,7 +137,7 @@ func TestCommandSide_AddOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-D2gj8", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-D2gj8", "")) }, }, }, @@ -160,7 +160,7 @@ func TestCommandSide_AddOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Fb8jk", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Fb8jk", "")) }, }, }, @@ -184,7 +184,7 @@ func TestCommandSide_AddOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-sadf3d", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-sadf3d", "")) }, }, }, @@ -348,7 +348,7 @@ func TestCommandSide_UpdateOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-asfsa", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-asfsa", "")) }, }, }, @@ -365,7 +365,7 @@ func TestCommandSide_UpdateOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-D32ef", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-D32ef", "")) }, }, }, @@ -384,7 +384,7 @@ func TestCommandSide_UpdateOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Dbgzf", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Dbgzf", "")) }, }, }, @@ -404,7 +404,7 @@ func TestCommandSide_UpdateOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-B23bs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-B23bs", "")) }, }, }, @@ -425,7 +425,7 @@ func TestCommandSide_UpdateOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-D2gj8", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-D2gj8", "")) }, }, }, @@ -447,7 +447,7 @@ func TestCommandSide_UpdateOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Fb8jk", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Fb8jk", "")) }, }, }, @@ -470,7 +470,7 @@ func TestCommandSide_UpdateOrgGenericOAuthIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SAe4gh", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SAe4gh", "")) }, }, }, @@ -495,7 +495,7 @@ func TestCommandSide_UpdateOrgGenericOAuthIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -679,7 +679,7 @@ func TestCommandSide_AddOrgGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Sgtj5", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Sgtj5", "")) }, }, }, @@ -698,7 +698,7 @@ func TestCommandSide_AddOrgGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Hz6zj", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Hz6zj", "")) }, }, }, @@ -718,7 +718,7 @@ func TestCommandSide_AddOrgGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-fb5jm", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-fb5jm", "")) }, }, }, @@ -739,7 +739,7 @@ func TestCommandSide_AddOrgGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Sfdf4", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Sfdf4", "")) }, }, }, @@ -894,7 +894,7 @@ func TestCommandSide_UpdateOrgGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SAfd3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SAfd3", "")) }, }, }, @@ -911,7 +911,7 @@ func TestCommandSide_UpdateOrgGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Dvf4f", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Dvf4f", "")) }, }, }, @@ -930,7 +930,7 @@ func TestCommandSide_UpdateOrgGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-BDfr3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-BDfr3", "")) }, }, }, @@ -950,7 +950,7 @@ func TestCommandSide_UpdateOrgGenericOIDCIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Db3bs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Db3bs", "")) }, }, }, @@ -972,7 +972,7 @@ func TestCommandSide_UpdateOrgGenericOIDCIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1143,7 +1143,7 @@ func TestCommandSide_MigrateOrgGenericOIDCToAzureADProvider(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-sdf3g", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-sdf3g", "")) }, }, }, @@ -1161,7 +1161,7 @@ func TestCommandSide_MigrateOrgGenericOIDCToAzureADProvider(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Fhbr2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Fhbr2", "")) }, }, }, @@ -1180,7 +1180,7 @@ func TestCommandSide_MigrateOrgGenericOIDCToAzureADProvider(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Dzh3g", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Dzh3g", "")) }, }, }, @@ -1202,7 +1202,7 @@ func TestCommandSide_MigrateOrgGenericOIDCToAzureADProvider(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1389,7 +1389,7 @@ func TestCommandSide_MigrateOrgOIDCToGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-D3fvs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-D3fvs", "")) }, }, }, @@ -1408,7 +1408,7 @@ func TestCommandSide_MigrateOrgOIDCToGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-W2vqs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-W2vqs", "")) }, }, }, @@ -1429,7 +1429,7 @@ func TestCommandSide_MigrateOrgOIDCToGoogleIDP(t *testing.T) { }, }, res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1606,7 +1606,7 @@ func TestCommandSide_AddOrgAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-sdf3g", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-sdf3g", "")) }, }, }, @@ -1625,7 +1625,7 @@ func TestCommandSide_AddOrgAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Fhbr2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Fhbr2", "")) }, }, }, @@ -1645,7 +1645,7 @@ func TestCommandSide_AddOrgAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Dzh3g", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Dzh3g", "")) }, }, }, @@ -1799,7 +1799,7 @@ func TestCommandSide_UpdateOrgAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SAgh2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SAgh2", "")) }, }, }, @@ -1816,7 +1816,7 @@ func TestCommandSide_UpdateOrgAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-fh3h1", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-fh3h1", "")) }, }, }, @@ -1835,7 +1835,7 @@ func TestCommandSide_UpdateOrgAzureADIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-dmitg", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-dmitg", "")) }, }, }, @@ -1856,7 +1856,7 @@ func TestCommandSide_UpdateOrgAzureADIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -2028,7 +2028,7 @@ func TestCommandSide_AddOrgGitHubIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Jdsgf", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Jdsgf", "")) }, }, }, @@ -2047,7 +2047,7 @@ func TestCommandSide_AddOrgGitHubIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-dsgz3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-dsgz3", "")) }, }, }, @@ -2194,7 +2194,7 @@ func TestCommandSide_UpdateOrgGitHubIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-sdf4h", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-sdf4h", "")) }, }, }, @@ -2211,7 +2211,7 @@ func TestCommandSide_UpdateOrgGitHubIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-fdh5z", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-fdh5z", "")) }, }, }, @@ -2231,7 +2231,7 @@ func TestCommandSide_UpdateOrgGitHubIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -2394,7 +2394,7 @@ func TestCommandSide_AddOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Dg4td", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Dg4td", "")) }, }, }, @@ -2413,7 +2413,7 @@ func TestCommandSide_AddOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-dgj53", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-dgj53", "")) }, }, }, @@ -2433,7 +2433,7 @@ func TestCommandSide_AddOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Ghjjs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Ghjjs", "")) }, }, }, @@ -2454,7 +2454,7 @@ func TestCommandSide_AddOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-sani2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-sani2", "")) }, }, }, @@ -2476,7 +2476,7 @@ func TestCommandSide_AddOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-agj42", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-agj42", "")) }, }, }, @@ -2499,7 +2499,7 @@ func TestCommandSide_AddOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-sd5hn", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-sd5hn", "")) }, }, }, @@ -2659,7 +2659,7 @@ func TestCommandSide_UpdateOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-sdfh3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-sdfh3", "")) }, }, }, @@ -2676,7 +2676,7 @@ func TestCommandSide_UpdateOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-shj42", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-shj42", "")) }, }, }, @@ -2695,7 +2695,7 @@ func TestCommandSide_UpdateOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-sdh73", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-sdh73", "")) }, }, }, @@ -2715,7 +2715,7 @@ func TestCommandSide_UpdateOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-acx2w", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-acx2w", "")) }, }, }, @@ -2736,7 +2736,7 @@ func TestCommandSide_UpdateOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-dgj6q", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-dgj6q", "")) }, }, }, @@ -2758,7 +2758,7 @@ func TestCommandSide_UpdateOrgGitHubEnterpriseIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-ybj62", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-ybj62", "")) }, }, }, @@ -2782,7 +2782,7 @@ func TestCommandSide_UpdateOrgGitHubEnterpriseIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -2961,7 +2961,7 @@ func TestCommandSide_AddOrgGitLabIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-adsg2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-adsg2", "")) }, }, }, @@ -2980,7 +2980,7 @@ func TestCommandSide_AddOrgGitLabIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-GD1j2", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-GD1j2", "")) }, }, }, @@ -3126,7 +3126,7 @@ func TestCommandSide_UpdateOrgGitLabIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-HJK91", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-HJK91", "")) }, }, }, @@ -3143,7 +3143,7 @@ func TestCommandSide_UpdateOrgGitLabIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-D12t6", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-D12t6", "")) }, }, }, @@ -3163,7 +3163,7 @@ func TestCommandSide_UpdateOrgGitLabIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -3324,7 +3324,7 @@ func TestCommandSide_AddOrgGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-jw4ZT", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-jw4ZT", "")) }, }, }, @@ -3343,7 +3343,7 @@ func TestCommandSide_AddOrgGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-AST4S", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-AST4S", "")) }, }, }, @@ -3363,7 +3363,7 @@ func TestCommandSide_AddOrgGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-DBZHJ", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-DBZHJ", "")) }, }, }, @@ -3384,7 +3384,7 @@ func TestCommandSide_AddOrgGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SDGJ4", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SDGJ4", "")) }, }, }, @@ -3536,7 +3536,7 @@ func TestCommandSide_UpdateOrgGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SAFG4", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SAFG4", "")) }, }, }, @@ -3553,7 +3553,7 @@ func TestCommandSide_UpdateOrgGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-DG4H", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-DG4H", "")) }, }, }, @@ -3572,7 +3572,7 @@ func TestCommandSide_UpdateOrgGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SD4eb", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SD4eb", "")) }, }, }, @@ -3592,7 +3592,7 @@ func TestCommandSide_UpdateOrgGitLabSelfHostedIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-GHWE3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-GHWE3", "")) }, }, }, @@ -3614,7 +3614,7 @@ func TestCommandSide_UpdateOrgGitLabSelfHostedIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -3783,7 +3783,7 @@ func TestCommandSide_AddOrgGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-D3fvs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-D3fvs", "")) }, }, }, @@ -3802,7 +3802,7 @@ func TestCommandSide_AddOrgGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-W2vqs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-W2vqs", "")) }, }, }, @@ -3948,7 +3948,7 @@ func TestCommandSide_UpdateOrgGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-S32t1", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-S32t1", "")) }, }, }, @@ -3965,7 +3965,7 @@ func TestCommandSide_UpdateOrgGoogleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-ds432", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-ds432", "")) }, }, }, @@ -3985,7 +3985,7 @@ func TestCommandSide_UpdateOrgGoogleIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -4146,7 +4146,7 @@ func TestCommandSide_AddOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SAfdd", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SAfdd", "")) }, }, }, @@ -4165,7 +4165,7 @@ func TestCommandSide_AddOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-sv31s", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-sv31s", "")) }, }, }, @@ -4185,7 +4185,7 @@ func TestCommandSide_AddOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-sdgf4", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-sdgf4", "")) }, }, }, @@ -4206,7 +4206,7 @@ func TestCommandSide_AddOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-AEG2w", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-AEG2w", "")) }, }, }, @@ -4228,7 +4228,7 @@ func TestCommandSide_AddOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SAD5n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SAD5n", "")) }, }, }, @@ -4251,7 +4251,7 @@ func TestCommandSide_AddOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SAy945n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SAy945n", "")) }, }, }, @@ -4275,7 +4275,7 @@ func TestCommandSide_AddOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-S1x705n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-S1x705n", "")) }, }, }, @@ -4300,7 +4300,7 @@ func TestCommandSide_AddOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-aAx9x1n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-aAx9x1n", "")) }, }, }, @@ -4504,7 +4504,7 @@ func TestCommandSide_UpdateOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Dgdbs", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Dgdbs", "")) }, }, }, @@ -4521,7 +4521,7 @@ func TestCommandSide_UpdateOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Sffgd", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Sffgd", "")) }, }, }, @@ -4540,7 +4540,7 @@ func TestCommandSide_UpdateOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-vb3ss", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-vb3ss", "")) }, }, }, @@ -4560,7 +4560,7 @@ func TestCommandSide_UpdateOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-hbere", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-hbere", "")) }, }, }, @@ -4581,7 +4581,7 @@ func TestCommandSide_UpdateOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-DG45z", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-DG45z", "")) }, }, }, @@ -4603,7 +4603,7 @@ func TestCommandSide_UpdateOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Sxx945n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Sxx945n", "")) }, }, }, @@ -4626,7 +4626,7 @@ func TestCommandSide_UpdateOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-S1p605n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-S1p605n", "")) }, }, }, @@ -4650,7 +4650,7 @@ func TestCommandSide_UpdateOrgLDAPIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-aBx901n", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-aBx901n", "")) }, }, }, @@ -4678,7 +4678,7 @@ func TestCommandSide_UpdateOrgLDAPIDP(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowNotFound(nil, "ORG-ASF3F", "")) + return errors.Is(err, zerrors.ThrowNotFound(nil, "ORG-ASF3F", "")) }, }, }, @@ -4905,7 +4905,7 @@ func TestCommandSide_AddOrgAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-jkn3w", "Errors.IDP.ClientIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-jkn3w", "Errors.IDP.ClientIDMissing")) }, }, }, @@ -4924,7 +4924,7 @@ func TestCommandSide_AddOrgAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Ffg32", "Errors.IDP.TeamIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Ffg32", "Errors.IDP.TeamIDMissing")) }, }, }, @@ -4944,7 +4944,7 @@ func TestCommandSide_AddOrgAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-GDjm5", "Errors.IDP.KeyIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-GDjm5", "Errors.IDP.KeyIDMissing")) }, }, }, @@ -4965,7 +4965,7 @@ func TestCommandSide_AddOrgAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-GVD4n", "Errors.IDP.PrivateKeyMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-GVD4n", "Errors.IDP.PrivateKeyMissing")) }, }, }, @@ -5119,7 +5119,7 @@ func TestCommandSide_UpdateOrgAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-FRHBH", "Errors.IDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-FRHBH", "Errors.IDMissing")) }, }, }, @@ -5136,7 +5136,7 @@ func TestCommandSide_UpdateOrgAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SFm4l", "Errors.IDP.ClientIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SFm4l", "Errors.IDP.ClientIDMissing")) }, }, }, @@ -5155,7 +5155,7 @@ func TestCommandSide_UpdateOrgAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-SG34t", "Errors.IDP.TeamIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-SG34t", "Errors.IDP.TeamIDMissing")) }, }, }, @@ -5175,7 +5175,7 @@ func TestCommandSide_UpdateOrgAppleIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-Gh4z2", "Errors.IDP.KeyIDMissing")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-Gh4z2", "Errors.IDP.KeyIDMissing")) }, }, }, @@ -5197,7 +5197,7 @@ func TestCommandSide_UpdateOrgAppleIDP(t *testing.T) { }, }, res: res{ - err: caos_errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -5373,7 +5373,7 @@ func TestCommandSide_AddOrgSAMLIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-957lr0f8u3", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-957lr0f8u3", "")) }, }, }, @@ -5392,7 +5392,7 @@ func TestCommandSide_AddOrgSAMLIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-78isv6m53a", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-78isv6m53a", "")) }, }, }, @@ -5545,7 +5545,7 @@ func TestCommandSide_UpdateOrgSAMLIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-wwdwdlaya0", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-wwdwdlaya0", "")) }, }, }, @@ -5562,7 +5562,7 @@ func TestCommandSide_UpdateOrgSAMLIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-egixaofgyl", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-egixaofgyl", "")) }, }, }, @@ -5581,7 +5581,7 @@ func TestCommandSide_UpdateOrgSAMLIDP(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-j6spncd74m", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-j6spncd74m", "")) }, }, }, @@ -5603,7 +5603,7 @@ func TestCommandSide_UpdateOrgSAMLIDP(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowNotFound(nil, "ORG-z82dddndql", "")) + return errors.Is(err, zerrors.ThrowNotFound(nil, "ORG-z82dddndql", "")) }, }, }, @@ -5764,7 +5764,7 @@ func TestCommandSide_RegenerateOrgSAMLProviderCertificate(t *testing.T) { }, res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "ORG-arv4vdrb6c", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "ORG-arv4vdrb6c", "")) }, }, }, @@ -5782,7 +5782,7 @@ func TestCommandSide_RegenerateOrgSAMLProviderCertificate(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowNotFound(nil, "ORG-4dw21ch9o9", "")) + return errors.Is(err, zerrors.ThrowNotFound(nil, "ORG-4dw21ch9o9", "")) }, }, }, diff --git a/internal/command/org_member.go b/internal/command/org_member.go index 3ead7a068..9ba7ecbff 100644 --- a/internal/command/org_member.go +++ b/internal/command/org_member.go @@ -6,30 +6,30 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddOrgMemberCommand(a *org.Aggregate, userID string, roles ...string) preparation.Validation { return func() (preparation.CreateCommands, error) { if userID == "" { - return nil, errors.ThrowInvalidArgument(nil, "ORG-4Mlfs", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "ORG-4Mlfs", "Errors.Invalid.Argument") } if len(roles) == 0 { - return nil, errors.ThrowInvalidArgument(nil, "V2-PfYhb", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "V2-PfYhb", "Errors.Invalid.Argument") } if len(domain.CheckForInvalidRoles(roles, domain.OrgRolePrefix, c.zitadelRoles)) > 0 && len(domain.CheckForInvalidRoles(roles, domain.RoleSelfManagementGlobal, c.zitadelRoles)) > 0 { - return nil, errors.ThrowInvalidArgument(nil, "Org-4N8es", "Errors.Org.MemberInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-4N8es", "Errors.Org.MemberInvalid") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { if exists, err := ExistsUser(ctx, filter, userID, ""); err != nil || !exists { - return nil, errors.ThrowPreconditionFailed(err, "ORG-GoXOn", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "ORG-GoXOn", "Errors.User.NotFound") } if isMember, err := IsOrgMember(ctx, filter, a.ID, userID); err != nil || isMember { - return nil, errors.ThrowAlreadyExists(err, "ORG-poWwe", "Errors.Org.Member.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(err, "ORG-poWwe", "Errors.Org.Member.AlreadyExists") } return []eventstore.Command{org.NewMemberAddedEvent(ctx, &a.Aggregate, userID, roles...)}, nil }, @@ -93,17 +93,17 @@ func (c *Commands) AddOrgMember(ctx context.Context, orgID, userID string, roles func (c *Commands) addOrgMember(ctx context.Context, orgAgg *eventstore.Aggregate, addedMember *OrgMemberWriteModel, member *domain.Member) (eventstore.Command, error) { if !member.IsValid() { - return nil, errors.ThrowInvalidArgument(nil, "Org-W8m4l", "Errors.Org.MemberInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-W8m4l", "Errors.Org.MemberInvalid") } if len(domain.CheckForInvalidRoles(member.Roles, domain.OrgRolePrefix, c.zitadelRoles)) > 0 && len(domain.CheckForInvalidRoles(member.Roles, domain.RoleSelfManagementGlobal, c.zitadelRoles)) > 0 { - return nil, errors.ThrowInvalidArgument(nil, "Org-4N8es", "Errors.Org.MemberInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-4N8es", "Errors.Org.MemberInvalid") } err := c.eventstore.FilterToQueryReducer(ctx, addedMember) if err != nil { return nil, err } if addedMember.State == domain.MemberStateActive { - return nil, errors.ThrowAlreadyExists(nil, "Org-PtXi1", "Errors.Org.Member.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "Org-PtXi1", "Errors.Org.Member.AlreadyExists") } return org.NewMemberAddedEvent(ctx, orgAgg, member.UserID, member.Roles...), nil @@ -112,10 +112,10 @@ func (c *Commands) addOrgMember(ctx context.Context, orgAgg *eventstore.Aggregat // ChangeOrgMember updates an existing member func (c *Commands) ChangeOrgMember(ctx context.Context, member *domain.Member) (*domain.Member, error) { if !member.IsValid() { - return nil, errors.ThrowInvalidArgument(nil, "Org-LiaZi", "Errors.Org.MemberInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-LiaZi", "Errors.Org.MemberInvalid") } if len(domain.CheckForInvalidRoles(member.Roles, domain.OrgRolePrefix, c.zitadelRoles)) > 0 { - return nil, errors.ThrowInvalidArgument(nil, "IAM-m9fG8", "Errors.Org.MemberInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "IAM-m9fG8", "Errors.Org.MemberInvalid") } existingMember, err := c.orgMemberWriteModelByID(ctx, member.AggregateID, member.UserID) @@ -124,7 +124,7 @@ func (c *Commands) ChangeOrgMember(ctx context.Context, member *domain.Member) ( } if reflect.DeepEqual(existingMember.Roles, member.Roles) { - return nil, errors.ThrowPreconditionFailed(nil, "Org-LiaZi", "Errors.Org.Member.RolesNotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-LiaZi", "Errors.Org.Member.RolesNotChanged") } orgAgg := OrgAggregateFromWriteModel(&existingMember.MemberWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewMemberChangedEvent(ctx, orgAgg, member.UserID, member.Roles...)) @@ -141,10 +141,10 @@ func (c *Commands) ChangeOrgMember(ctx context.Context, member *domain.Member) ( func (c *Commands) RemoveOrgMember(ctx context.Context, orgID, userID string) (*domain.ObjectDetails, error) { m, err := c.orgMemberWriteModelByID(ctx, orgID, userID) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return nil, err } - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { // empty response because we have no data that match the request return &domain.ObjectDetails{}, nil } @@ -184,7 +184,7 @@ func (c *Commands) orgMemberWriteModelByID(ctx context.Context, orgID, userID st } if writeModel.State == domain.MemberStateUnspecified || writeModel.State == domain.MemberStateRemoved { - return nil, errors.ThrowNotFound(nil, "Org-D8JxR", "Errors.NotFound") + return nil, zerrors.ThrowNotFound(nil, "Org-D8JxR", "Errors.NotFound") } return writeModel, nil diff --git a/internal/command/org_member_test.go b/internal/command/org_member_test.go index db2b9038a..2c49f3bd7 100644 --- a/internal/command/org_member_test.go +++ b/internal/command/org_member_test.go @@ -10,12 +10,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestAddMember(t *testing.T) { @@ -42,7 +42,7 @@ func TestAddMember(t *testing.T) { userID: "", }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "ORG-4Mlfs", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "ORG-4Mlfs", "Errors.Invalid.Argument"), }, }, { @@ -52,7 +52,7 @@ func TestAddMember(t *testing.T) { userID: "12342", }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "V2-PfYhb", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "V2-PfYhb", "Errors.Invalid.Argument"), }, }, { @@ -63,7 +63,7 @@ func TestAddMember(t *testing.T) { roles: []string{"ORG_OWNER"}, }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "Org-4N8es", ""), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "Org-4N8es", ""), }, }, { @@ -83,7 +83,7 @@ func TestAddMember(t *testing.T) { }).Filter(), }, want: Want{ - CreateErr: errors.ThrowPreconditionFailed(nil, "ORG-GoXOn", "Errors.User.NotFound"), + CreateErr: zerrors.ThrowPreconditionFailed(nil, "ORG-GoXOn", "Errors.User.NotFound"), }, }, { @@ -123,7 +123,7 @@ func TestAddMember(t *testing.T) { Filter(), }, want: Want{ - CreateErr: errors.ThrowAlreadyExists(nil, "ORG-poWwe", "Errors.Org.Member.AlreadyExists"), + CreateErr: zerrors.ThrowAlreadyExists(nil, "ORG-poWwe", "Errors.Org.Member.AlreadyExists"), }, }, { @@ -262,7 +262,7 @@ func TestIsMember(t *testing.T) { name: "error durring filter", args: args{ filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "PROJE-Op26p", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "PROJE-Op26p", "Errors.Internal") }, orgID: "orgID", userID: "userID", @@ -318,7 +318,7 @@ func TestCommandSide_AddOrgMember(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -335,7 +335,7 @@ func TestCommandSide_AddOrgMember(t *testing.T) { roles: []string{"ORG_OWNER"}, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -358,7 +358,7 @@ func TestCommandSide_AddOrgMember(t *testing.T) { roles: []string{domain.RoleOrgOwner}, }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -404,7 +404,7 @@ func TestCommandSide_AddOrgMember(t *testing.T) { roles: []string{"ORG_OWNER"}, }, res: res{ - err: errors.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -429,7 +429,7 @@ func TestCommandSide_AddOrgMember(t *testing.T) { ), ), expectFilter(), - expectPushFailed(errors.ThrowAlreadyExists(nil, "ERROR", "internal"), + expectPushFailed(zerrors.ThrowAlreadyExists(nil, "ERROR", "internal"), org.NewMemberAddedEvent(context.Background(), &org.NewAggregate("org1").Aggregate, "user1", @@ -450,7 +450,7 @@ func TestCommandSide_AddOrgMember(t *testing.T) { roles: []string{"ORG_OWNER"}, }, res: res{ - err: errors.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -562,7 +562,7 @@ func TestCommandSide_ChangeOrgMember(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -583,7 +583,7 @@ func TestCommandSide_ChangeOrgMember(t *testing.T) { }, }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -610,7 +610,7 @@ func TestCommandSide_ChangeOrgMember(t *testing.T) { }, }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -645,7 +645,7 @@ func TestCommandSide_ChangeOrgMember(t *testing.T) { }, }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -755,7 +755,7 @@ func TestCommandSide_RemoveOrgMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -772,7 +772,7 @@ func TestCommandSide_RemoveOrgMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/org_metadata.go b/internal/command/org_metadata.go index c1a378447..e564bb264 100644 --- a/internal/command/org_metadata.go +++ b/internal/command/org_metadata.go @@ -4,9 +4,9 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) SetOrgMetadata(ctx context.Context, orgID string, metadata *domain.Metadata) (_ *domain.Metadata, err error) { @@ -34,7 +34,7 @@ func (c *Commands) SetOrgMetadata(ctx context.Context, orgID string, metadata *d func (c *Commands) BulkSetOrgMetadata(ctx context.Context, orgID string, metadatas ...*domain.Metadata) (_ *domain.ObjectDetails, err error) { if len(metadatas) == 0 { - return nil, caos_errs.ThrowPreconditionFailed(nil, "META-9mm2d", "Errors.Metadata.NoData") + return nil, zerrors.ThrowPreconditionFailed(nil, "META-9mm2d", "Errors.Metadata.NoData") } err = c.checkOrgExists(ctx, orgID) if err != nil { @@ -66,7 +66,7 @@ func (c *Commands) BulkSetOrgMetadata(ctx context.Context, orgID string, metadat func (c *Commands) setOrgMetadata(ctx context.Context, orgAgg *eventstore.Aggregate, metadata *domain.Metadata) (command eventstore.Command, err error) { if !metadata.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "META-2ml0f", "Errors.Metadata.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "META-2ml0f", "Errors.Metadata.Invalid") } return org.NewMetadataSetEvent( ctx, @@ -78,7 +78,7 @@ func (c *Commands) setOrgMetadata(ctx context.Context, orgAgg *eventstore.Aggreg func (c *Commands) RemoveOrgMetadata(ctx context.Context, orgID, metadataKey string) (_ *domain.ObjectDetails, err error) { if metadataKey == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "META-2n0f1", "Errors.Metadata.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "META-2n0f1", "Errors.Metadata.Invalid") } err = c.checkOrgExists(ctx, orgID) if err != nil { @@ -89,7 +89,7 @@ func (c *Commands) RemoveOrgMetadata(ctx context.Context, orgID, metadataKey str return nil, err } if !removeMetadata.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "META-mcnw3", "Errors.Metadata.NotFound") + return nil, zerrors.ThrowNotFound(nil, "META-mcnw3", "Errors.Metadata.NotFound") } orgAgg := OrgAggregateFromWriteModel(&removeMetadata.WriteModel) event, err := c.removeOrgMetadata(ctx, orgAgg, metadataKey) @@ -110,7 +110,7 @@ func (c *Commands) RemoveOrgMetadata(ctx context.Context, orgID, metadataKey str func (c *Commands) BulkRemoveOrgMetadata(ctx context.Context, orgID string, metadataKeys ...string) (_ *domain.ObjectDetails, err error) { if len(metadataKeys) == 0 { - return nil, caos_errs.ThrowPreconditionFailed(nil, "META-9mw2d", "Errors.Metadata.NoData") + return nil, zerrors.ThrowPreconditionFailed(nil, "META-9mw2d", "Errors.Metadata.NoData") } err = c.checkOrgExists(ctx, orgID) if err != nil { @@ -125,10 +125,10 @@ func (c *Commands) BulkRemoveOrgMetadata(ctx context.Context, orgID string, meta orgAgg := OrgAggregateFromWriteModel(&removeMetadata.WriteModel) for i, key := range metadataKeys { if key == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-m19ds", "Errors.Metadata.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-m19ds", "Errors.Metadata.Invalid") } if _, found := removeMetadata.metadataList[key]; !found { - return nil, caos_errs.ThrowNotFound(nil, "META-2npds", "Errors.Metadata.KeyNotExisting") + return nil, zerrors.ThrowNotFound(nil, "META-2npds", "Errors.Metadata.KeyNotExisting") } event, err := c.removeOrgMetadata(ctx, orgAgg, key) if err != nil { diff --git a/internal/command/org_metadata_test.go b/internal/command/org_metadata_test.go index 2f20d12c6..e52f2480b 100644 --- a/internal/command/org_metadata_test.go +++ b/internal/command/org_metadata_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_SetOrgMetadata(t *testing.T) { @@ -51,7 +51,7 @@ func TestCommandSide_SetOrgMetadata(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -77,7 +77,7 @@ func TestCommandSide_SetOrgMetadata(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -175,7 +175,7 @@ func TestCommandSide_BulkSetOrgMetadata(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -195,7 +195,7 @@ func TestCommandSide_BulkSetOrgMetadata(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -222,7 +222,7 @@ func TestCommandSide_BulkSetOrgMetadata(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -321,7 +321,7 @@ func TestCommandSide_OrgRemoveMetadata(t *testing.T) { metadataKey: "key", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -337,7 +337,7 @@ func TestCommandSide_OrgRemoveMetadata(t *testing.T) { metadataKey: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -362,7 +362,7 @@ func TestCommandSide_OrgRemoveMetadata(t *testing.T) { metadataKey: "key", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -459,7 +459,7 @@ func TestCommandSide_BulkRemoveOrgMetadata(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -476,7 +476,7 @@ func TestCommandSide_BulkRemoveOrgMetadata(t *testing.T) { metadataList: []string{"key", "key1"}, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -509,7 +509,7 @@ func TestCommandSide_BulkRemoveOrgMetadata(t *testing.T) { metadataList: []string{"key", "key1"}, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -549,7 +549,7 @@ func TestCommandSide_BulkRemoveOrgMetadata(t *testing.T) { metadataList: []string{""}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/org_policy_domain.go b/internal/command/org_policy_domain.go index 167b51af6..32cbd7389 100644 --- a/internal/command/org_policy_domain.go +++ b/internal/command/org_policy_domain.go @@ -5,15 +5,15 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddOrgDomainPolicy(ctx context.Context, resourceOwner string, userLoginMustBeDomain, validateOrgDomains, smtpSenderAddressMatchesInstanceDomain bool) (*domain.ObjectDetails, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-4Jfsf", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-4Jfsf", "Errors.ResourceOwnerMissing") } orgAgg := org.NewAggregate(resourceOwner) cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, prepareAddOrgDomainPolicy(orgAgg, userLoginMustBeDomain, validateOrgDomains, smtpSenderAddressMatchesInstanceDomain)) @@ -29,7 +29,7 @@ func (c *Commands) AddOrgDomainPolicy(ctx context.Context, resourceOwner string, func (c *Commands) ChangeOrgDomainPolicy(ctx context.Context, resourceOwner string, userLoginMustBeDomain, validateOrgDomains, smtpSenderAddressMatchesInstanceDomain bool) (*domain.ObjectDetails, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-5H8fs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-5H8fs", "Errors.ResourceOwnerMissing") } orgAgg := org.NewAggregate(resourceOwner) cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, prepareChangeOrgDomainPolicy(orgAgg, userLoginMustBeDomain, validateOrgDomains, smtpSenderAddressMatchesInstanceDomain)) @@ -45,7 +45,7 @@ func (c *Commands) ChangeOrgDomainPolicy(ctx context.Context, resourceOwner stri func (c *Commands) RemoveOrgDomainPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-3H8fs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-3H8fs", "Errors.ResourceOwnerMissing") } orgAgg := org.NewAggregate(orgID) cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, prepareRemoveOrgDomainPolicy(orgAgg)) @@ -95,7 +95,7 @@ func prepareAddOrgDomainPolicy( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "ORG-1M8ds", "Errors.Org.DomainPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "ORG-1M8ds", "Errors.Org.DomainPolicy.AlreadyExists") } cmds := []eventstore.Command{ org.NewDomainPolicyAddedEvent(ctx, &a.Aggregate, @@ -138,7 +138,7 @@ func prepareChangeOrgDomainPolicy( return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-2N9sd", "Errors.Org.DomainPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-2N9sd", "Errors.Org.DomainPolicy.NotFound") } changedEvent, usernameChange, err := writeModel.NewChangedEvent(ctx, &a.Aggregate, userLoginMustBeDomain, @@ -174,7 +174,7 @@ func prepareRemoveOrgDomainPolicy( return nil, err } if !writeModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "ORG-Dvsh3", "Errors.Org.DomainPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-Dvsh3", "Errors.Org.DomainPolicy.NotFound") } instancePolicy, err := instanceDomainPolicy(ctx, filter) if err != nil { diff --git a/internal/command/org_policy_domain_model.go b/internal/command/org_policy_domain_model.go index 328041ba0..a689835f1 100644 --- a/internal/command/org_policy_domain_model.go +++ b/internal/command/org_policy_domain_model.go @@ -3,11 +3,10 @@ package command import ( "context" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) type OrgDomainPolicyWriteModel struct { @@ -72,7 +71,7 @@ func (wm *OrgDomainPolicyWriteModel) NewChangedEvent( changes = append(changes, policy.ChangeSMTPSenderAddressMatchesInstanceDomain(smtpSenderAddressMatchesInstanceDomain)) } if len(changes) == 0 { - return nil, false, caos_errs.ThrowPreconditionFailed(nil, "ORG-3M9ds", "Errors.Org.LabelPolicy.NotChanged") + return nil, false, zerrors.ThrowPreconditionFailed(nil, "ORG-3M9ds", "Errors.Org.LabelPolicy.NotChanged") } changedEvent, err = org.NewDomainPolicyChangedEvent(ctx, aggregate, changes) return changedEvent, usernameChange, err diff --git a/internal/command/org_policy_domain_test.go b/internal/command/org_policy_domain_test.go index c431612a5..1cb4c080a 100644 --- a/internal/command/org_policy_domain_test.go +++ b/internal/command/org_policy_domain_test.go @@ -8,12 +8,12 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddDomainPolicy(t *testing.T) { @@ -51,7 +51,7 @@ func TestCommandSide_AddDomainPolicy(t *testing.T) { smtpSenderAddressMatchesInstanceDomain: true, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -79,7 +79,7 @@ func TestCommandSide_AddDomainPolicy(t *testing.T) { smtpSenderAddressMatchesInstanceDomain: true, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -288,7 +288,7 @@ func TestCommandSide_ChangeDomainPolicy(t *testing.T) { smtpSenderAddressMatchesInstanceDomain: true, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -307,7 +307,7 @@ func TestCommandSide_ChangeDomainPolicy(t *testing.T) { smtpSenderAddressMatchesInstanceDomain: true, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -335,7 +335,7 @@ func TestCommandSide_ChangeDomainPolicy(t *testing.T) { smtpSenderAddressMatchesInstanceDomain: true, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -496,7 +496,7 @@ func TestCommandSide_RemoveDomainPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -512,7 +512,7 @@ func TestCommandSide_RemoveDomainPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_policy_label.go b/internal/command/org_policy_label.go index 6698baff6..4a1fff05d 100644 --- a/internal/command/org_policy_label.go +++ b/internal/command/org_policy_label.go @@ -4,14 +4,14 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddLabelPolicy(ctx context.Context, resourceOwner string, policy *domain.LabelPolicy) (*domain.LabelPolicy, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-Fn8ds", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-Fn8ds", "Errors.ResourceOwnerMissing") } if err := policy.IsValid(); err != nil { return nil, err @@ -22,7 +22,7 @@ func (c *Commands) AddLabelPolicy(ctx context.Context, resourceOwner string, pol return nil, err } if addedPolicy.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "Org-2B0ps", "Errors.Org.LabelPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "Org-2B0ps", "Errors.Org.LabelPolicy.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.LabelPolicyWriteModel.WriteModel) @@ -53,7 +53,7 @@ func (c *Commands) AddLabelPolicy(ctx context.Context, resourceOwner string, pol func (c *Commands) ChangeLabelPolicy(ctx context.Context, resourceOwner string, policy *domain.LabelPolicy) (*domain.LabelPolicy, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-3N9fs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-3N9fs", "Errors.ResourceOwnerMissing") } if err := policy.IsValid(); err != nil { return nil, err @@ -64,7 +64,7 @@ func (c *Commands) ChangeLabelPolicy(ctx context.Context, resourceOwner string, return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-0K9dq", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "Org-0K9dq", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) @@ -84,7 +84,7 @@ func (c *Commands) ChangeLabelPolicy(ctx context.Context, resourceOwner string, policy.DisableWatermark, policy.ThemeMode) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-8nfSr", "Errors.Org.LabelPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-8nfSr", "Errors.Org.LabelPolicy.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -100,7 +100,7 @@ func (c *Commands) ChangeLabelPolicy(ctx context.Context, resourceOwner string, func (c *Commands) ActivateLabelPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-KKd4X", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-KKd4X", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -108,7 +108,7 @@ func (c *Commands) ActivateLabelPolicy(ctx context.Context, orgID string) (*doma } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-34mSE", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-34mSE", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyActivatedEvent(ctx, orgAgg)) @@ -124,7 +124,7 @@ func (c *Commands) ActivateLabelPolicy(ctx context.Context, orgID string) (*doma func (c *Commands) AddLogoLabelPolicy(ctx context.Context, orgID string, upload *AssetUpload) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-KKd4X", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-KKd4X", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -132,11 +132,11 @@ func (c *Commands) AddLogoLabelPolicy(ctx context.Context, orgID string, upload } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-23BMs", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-23BMs", "Errors.Org.LabelPolicy.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(err, "IAM-4N3nf", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "IAM-4N3nf", "Errors.Assets.Object.PutFailed") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyLogoAddedEvent(ctx, orgAgg, asset.Name)) @@ -152,7 +152,7 @@ func (c *Commands) AddLogoLabelPolicy(ctx context.Context, orgID string, upload func (c *Commands) RemoveLogoLabelPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-2FN8s", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-2FN8s", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -160,7 +160,7 @@ func (c *Commands) RemoveLogoLabelPolicy(ctx context.Context, orgID string) (*do } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-4MVsf", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-4MVsf", "Errors.Org.LabelPolicy.NotFound") } err = c.removeAsset(ctx, orgID, existingPolicy.LogoKey) if err != nil { @@ -180,7 +180,7 @@ func (c *Commands) RemoveLogoLabelPolicy(ctx context.Context, orgID string) (*do func (c *Commands) AddIconLabelPolicy(ctx context.Context, orgID string, upload *AssetUpload) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-hMDs3", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-hMDs3", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -188,11 +188,11 @@ func (c *Commands) AddIconLabelPolicy(ctx context.Context, orgID string, upload } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-4nq2f", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-4nq2f", "Errors.Org.LabelPolicy.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(err, "IAM-4BS7f", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "IAM-4BS7f", "Errors.Assets.Object.PutFailed") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyIconAddedEvent(ctx, orgAgg, asset.Name)) @@ -208,7 +208,7 @@ func (c *Commands) AddIconLabelPolicy(ctx context.Context, orgID string, upload func (c *Commands) RemoveIconLabelPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-1nd0d", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-1nd0d", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -216,7 +216,7 @@ func (c *Commands) RemoveIconLabelPolicy(ctx context.Context, orgID string) (*do } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-1nd9f", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-1nd9f", "Errors.Org.LabelPolicy.NotFound") } err = c.removeAsset(ctx, orgID, existingPolicy.IconKey) @@ -237,7 +237,7 @@ func (c *Commands) RemoveIconLabelPolicy(ctx context.Context, orgID string) (*do func (c *Commands) AddLogoDarkLabelPolicy(ctx context.Context, orgID string, upload *AssetUpload) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-67Ms2", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-67Ms2", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -245,11 +245,11 @@ func (c *Commands) AddLogoDarkLabelPolicy(ctx context.Context, orgID string, upl } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-QSqcd", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-QSqcd", "Errors.Org.LabelPolicy.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(err, "IAM-3S7fN", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "IAM-3S7fN", "Errors.Assets.Object.PutFailed") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyLogoDarkAddedEvent(ctx, orgAgg, asset.Name)) @@ -265,7 +265,7 @@ func (c *Commands) AddLogoDarkLabelPolicy(ctx context.Context, orgID string, upl func (c *Commands) RemoveLogoDarkLabelPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-4NF0d", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-4NF0d", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -273,7 +273,7 @@ func (c *Commands) RemoveLogoDarkLabelPolicy(ctx context.Context, orgID string) } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-0peQw", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-0peQw", "Errors.Org.LabelPolicy.NotFound") } err = c.removeAsset(ctx, orgID, existingPolicy.LogoDarkKey) if err != nil { @@ -293,7 +293,7 @@ func (c *Commands) RemoveLogoDarkLabelPolicy(ctx context.Context, orgID string) func (c *Commands) AddIconDarkLabelPolicy(ctx context.Context, orgID string, upload *AssetUpload) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-tzBfs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-tzBfs", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -301,11 +301,11 @@ func (c *Commands) AddIconDarkLabelPolicy(ctx context.Context, orgID string, upl } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-4Nf8s", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-4Nf8s", "Errors.Org.LabelPolicy.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(err, "IAM-4B7cs", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "IAM-4B7cs", "Errors.Assets.Object.PutFailed") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyIconDarkAddedEvent(ctx, orgAgg, asset.Name)) @@ -321,7 +321,7 @@ func (c *Commands) AddIconDarkLabelPolicy(ctx context.Context, orgID string, upl func (c *Commands) RemoveIconDarkLabelPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-Mv9ds", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-Mv9ds", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -329,7 +329,7 @@ func (c *Commands) RemoveIconDarkLabelPolicy(ctx context.Context, orgID string) } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-3NFos", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-3NFos", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyIconDarkRemovedEvent(ctx, orgAgg, existingPolicy.IconDarkKey)) @@ -345,7 +345,7 @@ func (c *Commands) RemoveIconDarkLabelPolicy(ctx context.Context, orgID string) func (c *Commands) AddFontLabelPolicy(ctx context.Context, orgID string, upload *AssetUpload) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-1Nf9s", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-1Nf9s", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -353,11 +353,11 @@ func (c *Commands) AddFontLabelPolicy(ctx context.Context, orgID string, upload } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-2M9fs", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-2M9fs", "Errors.Org.LabelPolicy.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(err, "ORG-2f9fw", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "ORG-2f9fw", "Errors.Assets.Object.PutFailed") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyFontAddedEvent(ctx, orgAgg, asset.Name)) @@ -373,7 +373,7 @@ func (c *Commands) AddFontLabelPolicy(ctx context.Context, orgID string, upload func (c *Commands) RemoveFontLabelPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-2n0fW", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-2n0fW", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLabelPolicyWriteModelByID(ctx, orgID) if err != nil { @@ -381,7 +381,7 @@ func (c *Commands) RemoveFontLabelPolicy(ctx context.Context, orgID string) (*do } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-4n9SD", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-4n9SD", "Errors.Org.LabelPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LabelPolicyWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewLabelPolicyFontRemovedEvent(ctx, orgAgg, existingPolicy.FontKey)) @@ -397,7 +397,7 @@ func (c *Commands) RemoveFontLabelPolicy(ctx context.Context, orgID string) (*do func (c *Commands) RemoveLabelPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-Mf9sf", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-Mf9sf", "Errors.ResourceOwnerMissing") } existingPolicy := NewOrgLabelPolicyWriteModel(orgID) removeEvent, err := c.removeLabelPolicy(ctx, existingPolicy) @@ -421,7 +421,7 @@ func (c *Commands) removeLabelPolicy(ctx context.Context, existingPolicy *OrgLab return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-3M9df", "Errors.Org.LabelPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "Org-3M9df", "Errors.Org.LabelPolicy.NotFound") } err = c.removeAssetsFolder(ctx, existingPolicy.AggregateID, static.ObjectTypeStyling) diff --git a/internal/command/org_policy_label_test.go b/internal/command/org_policy_label_test.go index 0a1dbc85f..8fee5e890 100644 --- a/internal/command/org_policy_label_test.go +++ b/internal/command/org_policy_label_test.go @@ -9,13 +9,13 @@ import ( "go.uber.org/mock/gomock" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" "github.com/zitadel/zitadel/internal/static" "github.com/zitadel/zitadel/internal/static/mock" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddLabelPolicy(t *testing.T) { @@ -52,7 +52,7 @@ func TestCommandSide_AddLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -99,7 +99,7 @@ func TestCommandSide_AddLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -220,7 +220,7 @@ func TestCommandSide_ChangeLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -241,7 +241,7 @@ func TestCommandSide_ChangeLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -289,7 +289,7 @@ func TestCommandSide_ChangeLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -422,7 +422,7 @@ func TestCommandSide_ActivateLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -438,7 +438,7 @@ func TestCommandSide_ActivateLabelPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -523,7 +523,7 @@ func TestCommandSide_RemoveLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -539,7 +539,7 @@ func TestCommandSide_RemoveLabelPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -637,7 +637,7 @@ func TestCommandSide_AddLogoLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -661,7 +661,7 @@ func TestCommandSide_AddLogoLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -704,7 +704,7 @@ func TestCommandSide_AddLogoLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -811,7 +811,7 @@ func TestCommandSide_RemoveLogoLabelPolicy(t *testing.T) { storageKey: "key", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -828,7 +828,7 @@ func TestCommandSide_RemoveLogoLabelPolicy(t *testing.T) { storageKey: "key", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -942,7 +942,7 @@ func TestCommandSide_AddIconLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -966,7 +966,7 @@ func TestCommandSide_AddIconLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1009,7 +1009,7 @@ func TestCommandSide_AddIconLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -1115,7 +1115,7 @@ func TestCommandSide_RemoveIconLabelPolicy(t *testing.T) { orgID: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1131,7 +1131,7 @@ func TestCommandSide_RemoveIconLabelPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1244,7 +1244,7 @@ func TestCommandSide_AddLogoDarkLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1268,7 +1268,7 @@ func TestCommandSide_AddLogoDarkLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1311,7 +1311,7 @@ func TestCommandSide_AddLogoDarkLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -1418,7 +1418,7 @@ func TestCommandSide_RemoveLogoDarkLabelPolicy(t *testing.T) { storageKey: "key", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1435,7 +1435,7 @@ func TestCommandSide_RemoveLogoDarkLabelPolicy(t *testing.T) { storageKey: "key", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1549,7 +1549,7 @@ func TestCommandSide_AddIconDarkLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1573,7 +1573,7 @@ func TestCommandSide_AddIconDarkLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1616,7 +1616,7 @@ func TestCommandSide_AddIconDarkLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -1721,7 +1721,7 @@ func TestCommandSide_RemoveIconDarkLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1737,7 +1737,7 @@ func TestCommandSide_RemoveIconDarkLabelPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1849,7 +1849,7 @@ func TestCommandSide_AddFontLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1865,7 +1865,7 @@ func TestCommandSide_AddFontLabelPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1908,7 +1908,7 @@ func TestCommandSide_AddFontLabelPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -2013,7 +2013,7 @@ func TestCommandSide_RemoveFontLabelPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -2029,7 +2029,7 @@ func TestCommandSide_RemoveFontLabelPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_policy_lockout.go b/internal/command/org_policy_lockout.go index 72dd28615..47f98d977 100644 --- a/internal/command/org_policy_lockout.go +++ b/internal/command/org_policy_lockout.go @@ -4,20 +4,20 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddLockoutPolicy(ctx context.Context, resourceOwner string, policy *domain.LockoutPolicy) (*domain.LockoutPolicy, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-8fJif", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-8fJif", "Errors.ResourceOwnerMissing") } addedPolicy, err := c.orgLockoutPolicyWriteModelByID(ctx, resourceOwner) if err != nil { return nil, err } if addedPolicy.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "ORG-0olDf", "Errors.ORG.LockoutPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "ORG-0olDf", "Errors.ORG.LockoutPolicy.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.WriteModel) @@ -34,20 +34,20 @@ func (c *Commands) AddLockoutPolicy(ctx context.Context, resourceOwner string, p func (c *Commands) ChangeLockoutPolicy(ctx context.Context, resourceOwner string, policy *domain.LockoutPolicy) (*domain.LockoutPolicy, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-3J9fs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-3J9fs", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLockoutPolicyWriteModelByID(ctx, resourceOwner) if err != nil { return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-ADfs1", "Errors.Org.LockoutPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-ADfs1", "Errors.Org.LockoutPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.LockoutPolicyWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, orgAgg, policy.MaxPasswordAttempts, policy.ShowLockOutFailures) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "ORG-0JFSr", "Errors.Org.LockoutPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "ORG-0JFSr", "Errors.Org.LockoutPolicy.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -63,14 +63,14 @@ func (c *Commands) ChangeLockoutPolicy(ctx context.Context, resourceOwner string func (c *Commands) RemoveLockoutPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-4J9fs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-4J9fs", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgLockoutPolicyWriteModelByID(ctx, orgID) if err != nil { return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-D4zuz", "Errors.Org.LockoutPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-D4zuz", "Errors.Org.LockoutPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.WriteModel) diff --git a/internal/command/org_policy_lockout_test.go b/internal/command/org_policy_lockout_test.go index 0cb7c056d..1eda5f348 100644 --- a/internal/command/org_policy_lockout_test.go +++ b/internal/command/org_policy_lockout_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddPasswordLockoutPolicy(t *testing.T) { @@ -48,7 +48,7 @@ func TestCommandSide_AddPasswordLockoutPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -76,7 +76,7 @@ func TestCommandSide_AddPasswordLockoutPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -167,7 +167,7 @@ func TestCommandSide_ChangePasswordLockoutPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -187,7 +187,7 @@ func TestCommandSide_ChangePasswordLockoutPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -215,7 +215,7 @@ func TestCommandSide_ChangePasswordLockoutPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -305,7 +305,7 @@ func TestCommandSide_RemovePasswordLockoutPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -321,7 +321,7 @@ func TestCommandSide_RemovePasswordLockoutPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_policy_login.go b/internal/command/org_policy_login.go index 2c7ccbf93..0dc8e6346 100644 --- a/internal/command/org_policy_login.go +++ b/internal/command/org_policy_login.go @@ -9,10 +9,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type AddLoginPolicy struct { @@ -111,7 +111,7 @@ func (c *Commands) ChangeLoginPolicy(ctx context.Context, resourceOwner string, func (c *Commands) RemoveLoginPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-55Mg9", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-55Mg9", "Errors.ResourceOwnerMissing") } existingPolicy := NewOrgLoginPolicyWriteModel(orgID) err := c.eventstore.FilterToQueryReducer(ctx, existingPolicy) @@ -119,7 +119,7 @@ func (c *Commands) RemoveLoginPolicy(ctx context.Context, orgID string) (*domain return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-GHB37", "Errors.Org.LoginPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "Org-GHB37", "Errors.Org.LoginPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewLoginPolicyRemovedEvent(ctx, orgAgg)) @@ -135,17 +135,17 @@ func (c *Commands) RemoveLoginPolicy(ctx context.Context, orgID string) (*domain func (c *Commands) AddIDPToLoginPolicy(ctx context.Context, resourceOwner string, idpProvider *domain.IDPProvider) (*domain.IDPProvider, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-M0fs9", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-M0fs9", "Errors.ResourceOwnerMissing") } if !idpProvider.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-9nf88", "Errors.Org.LoginPolicy.IDP.") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-9nf88", "Errors.Org.LoginPolicy.IDP.") } existingPolicy, err := c.orgLoginPolicyWriteModelByID(ctx, resourceOwner) if err != nil { return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-Ffgw2", "Errors.Org.LoginPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "Org-Ffgw2", "Errors.Org.LoginPolicy.NotFound") } var exists bool @@ -155,7 +155,7 @@ func (c *Commands) AddIDPToLoginPolicy(ctx context.Context, resourceOwner string exists, err = ExistsInstanceIDP(ctx, c.eventstore.Filter, idpProvider.IDPConfigID) } if !exists || err != nil { - return nil, caos_errs.ThrowPreconditionFailed(err, "Org-3N9fs", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(err, "Org-3N9fs", "Errors.IDPConfig.NotExisting") } idpModel := NewOrgIdentityProviderWriteModel(resourceOwner, idpProvider.IDPConfigID) err = c.eventstore.FilterToQueryReducer(ctx, idpModel) @@ -163,7 +163,7 @@ func (c *Commands) AddIDPToLoginPolicy(ctx context.Context, resourceOwner string return nil, err } if idpModel.State == domain.IdentityProviderStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "Org-2B0ps", "Errors.Org.LoginPolicy.IDP.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "Org-2B0ps", "Errors.Org.LoginPolicy.IDP.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&idpModel.WriteModel) @@ -180,17 +180,17 @@ func (c *Commands) AddIDPToLoginPolicy(ctx context.Context, resourceOwner string func (c *Commands) RemoveIDPFromLoginPolicy(ctx context.Context, resourceOwner string, idpProvider *domain.IDPProvider, cascadeExternalIDPs ...*domain.UserIDPLink) (*domain.ObjectDetails, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-M0fs9", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-M0fs9", "Errors.ResourceOwnerMissing") } if !idpProvider.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-66m9s", "Errors.Org.LoginPolicy.IDP.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-66m9s", "Errors.Org.LoginPolicy.IDP.Invalid") } existingPolicy, err := c.orgLoginPolicyWriteModelByID(ctx, resourceOwner) if err != nil { return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-GVDfe", "Errors.Org.LoginPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "Org-GVDfe", "Errors.Org.LoginPolicy.NotFound") } idpModel := NewOrgIdentityProviderWriteModel(resourceOwner, idpProvider.IDPConfigID) @@ -199,7 +199,7 @@ func (c *Commands) RemoveIDPFromLoginPolicy(ctx context.Context, resourceOwner s return nil, err } if idpModel.State == domain.IdentityProviderStateUnspecified || idpModel.State == domain.IdentityProviderStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-39fjs", "Errors.Org.LoginPolicy.IDP.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "Org-39fjs", "Errors.Org.LoginPolicy.IDP.NotExisting") } orgAgg := OrgAggregateFromWriteModel(&idpModel.IdentityProviderWriteModel.WriteModel) @@ -237,10 +237,10 @@ func (c *Commands) removeIDPFromLoginPolicy(ctx context.Context, orgAgg *eventst func (c *Commands) AddSecondFactorToLoginPolicy(ctx context.Context, secondFactor domain.SecondFactorType, orgID string) (domain.SecondFactorType, *domain.ObjectDetails, error) { if orgID == "" { - return domain.SecondFactorTypeUnspecified, nil, caos_errs.ThrowInvalidArgument(nil, "Org-M0fs9", "Errors.ResourceOwnerMissing") + return domain.SecondFactorTypeUnspecified, nil, zerrors.ThrowInvalidArgument(nil, "Org-M0fs9", "Errors.ResourceOwnerMissing") } if !secondFactor.Valid() { - return domain.SecondFactorTypeUnspecified, nil, caos_errs.ThrowInvalidArgument(nil, "Org-5m9fs", "Errors.Org.LoginPolicy.MFA.Unspecified") + return domain.SecondFactorTypeUnspecified, nil, zerrors.ThrowInvalidArgument(nil, "Org-5m9fs", "Errors.Org.LoginPolicy.MFA.Unspecified") } secondFactorModel := NewOrgSecondFactorWriteModel(orgID, secondFactor) addedEvent, err := c.addSecondFactorToLoginPolicy(ctx, secondFactorModel, secondFactor) @@ -267,7 +267,7 @@ func (c *Commands) addSecondFactorToLoginPolicy(ctx context.Context, secondFacto } if secondFactorModel.State == domain.FactorStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "Org-2B0ps", "Errors.Org.LoginPolicy.MFA.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "Org-2B0ps", "Errors.Org.LoginPolicy.MFA.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&secondFactorModel.SecondFactorWriteModel.WriteModel) @@ -276,10 +276,10 @@ func (c *Commands) addSecondFactorToLoginPolicy(ctx context.Context, secondFacto func (c *Commands) RemoveSecondFactorFromLoginPolicy(ctx context.Context, secondFactor domain.SecondFactorType, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-fM0gs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-fM0gs", "Errors.ResourceOwnerMissing") } if !secondFactor.Valid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-55n8s", "Errors.Org.LoginPolicy.MFA.Unspecified") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-55n8s", "Errors.Org.LoginPolicy.MFA.Unspecified") } secondFactorModel := NewOrgSecondFactorWriteModel(orgID, secondFactor) removedEvent, err := c.removeSecondFactorFromLoginPolicy(ctx, secondFactorModel, secondFactor) @@ -304,7 +304,7 @@ func (c *Commands) removeSecondFactorFromLoginPolicy(ctx context.Context, second return nil, err } if secondFactorModel.State == domain.FactorStateUnspecified || secondFactorModel.State == domain.FactorStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-3M9od", "Errors.Org.LoginPolicy.MFA.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "Org-3M9od", "Errors.Org.LoginPolicy.MFA.NotExisting") } orgAgg := OrgAggregateFromWriteModel(&secondFactorModel.SecondFactorWriteModel.WriteModel) return org.NewLoginPolicySecondFactorRemovedEvent(ctx, orgAgg, secondFactor), nil @@ -312,10 +312,10 @@ func (c *Commands) removeSecondFactorFromLoginPolicy(ctx context.Context, second func (c *Commands) AddMultiFactorToLoginPolicy(ctx context.Context, multiFactor domain.MultiFactorType, orgID string) (domain.MultiFactorType, *domain.ObjectDetails, error) { if orgID == "" { - return domain.MultiFactorTypeUnspecified, nil, caos_errs.ThrowInvalidArgument(nil, "Org-M0fsf", "Errors.ResourceOwnerMissing") + return domain.MultiFactorTypeUnspecified, nil, zerrors.ThrowInvalidArgument(nil, "Org-M0fsf", "Errors.ResourceOwnerMissing") } if !multiFactor.Valid() { - return domain.MultiFactorTypeUnspecified, nil, caos_errs.ThrowInvalidArgument(nil, "Org-5m9fs", "Errors.Org.LoginPolicy.MFA.Unspecified") + return domain.MultiFactorTypeUnspecified, nil, zerrors.ThrowInvalidArgument(nil, "Org-5m9fs", "Errors.Org.LoginPolicy.MFA.Unspecified") } multiFactorModel := NewOrgMultiFactorWriteModel(orgID, multiFactor) addedEvent, err := c.addMultiFactorToLoginPolicy(ctx, multiFactorModel, multiFactor) @@ -340,7 +340,7 @@ func (c *Commands) addMultiFactorToLoginPolicy(ctx context.Context, multiFactorM return nil, err } if multiFactorModel.State == domain.FactorStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "Org-3M9od", "Errors.Org.LoginPolicy.MFA.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "Org-3M9od", "Errors.Org.LoginPolicy.MFA.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&multiFactorModel.WriteModel) @@ -349,10 +349,10 @@ func (c *Commands) addMultiFactorToLoginPolicy(ctx context.Context, multiFactorM func (c *Commands) RemoveMultiFactorFromLoginPolicy(ctx context.Context, multiFactor domain.MultiFactorType, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-M0fsf", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-M0fsf", "Errors.ResourceOwnerMissing") } if !multiFactor.Valid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-5m9fs", "Errors.Org.LoginPolicy.MFA.Unspecified") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-5m9fs", "Errors.Org.LoginPolicy.MFA.Unspecified") } multiFactorModel := NewOrgMultiFactorWriteModel(orgID, multiFactor) removedEvent, err := c.removeMultiFactorFromLoginPolicy(ctx, multiFactorModel, multiFactor) @@ -377,7 +377,7 @@ func (c *Commands) removeMultiFactorFromLoginPolicy(ctx context.Context, multiFa return nil, err } if multiFactorModel.State == domain.FactorStateUnspecified || multiFactorModel.State == domain.FactorStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-3M9df", "Errors.Org.LoginPolicy.MFA.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "Org-3M9df", "Errors.Org.LoginPolicy.MFA.NotExisting") } orgAgg := OrgAggregateFromWriteModel(&multiFactorModel.MultiFactorWriteModel.WriteModel) @@ -399,26 +399,26 @@ func (c *Commands) orgLoginPolicyAuthFactorsWriteModel(ctx context.Context, orgI func prepareAddLoginPolicy(a *org.Aggregate, policy *AddLoginPolicy) preparation.Validation { return func() (preparation.CreateCommands, error) { if ok := domain.ValidateDefaultRedirectURI(policy.DefaultRedirectURI); !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-WSfdq", "Errors.Org.LoginPolicy.RedirectURIInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-WSfdq", "Errors.Org.LoginPolicy.RedirectURIInvalid") } for _, factor := range policy.SecondFactors { if !factor.Valid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-SFeea", "Errors.Org.LoginPolicy.MFA.Unspecified") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-SFeea", "Errors.Org.LoginPolicy.MFA.Unspecified") } } for _, factor := range policy.MultiFactors { if !factor.Valid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-WSfrg", "Errors.Org.LoginPolicy.MFA.Unspecified") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-WSfrg", "Errors.Org.LoginPolicy.MFA.Unspecified") } } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { if exists, err := exists(ctx, filter, NewOrgLoginPolicyWriteModel(a.ID)); exists || err != nil { - return nil, caos_errs.ThrowAlreadyExists(nil, "Org-Dgfb2", "Errors.Org.LoginPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "Org-Dgfb2", "Errors.Org.LoginPolicy.AlreadyExists") } for _, idp := range policy.IDPProviders { exists, err := idpExists(ctx, filter, idp) if !exists || err != nil { - return nil, caos_errs.ThrowPreconditionFailed(err, "Org-FEd32", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(err, "Org-FEd32", "Errors.IDPConfig.NotExisting") } } cmds := make([]eventstore.Command, 0, len(policy.SecondFactors)+len(policy.MultiFactors)+len(policy.IDPProviders)+1) @@ -458,7 +458,7 @@ func prepareAddLoginPolicy(a *org.Aggregate, policy *AddLoginPolicy) preparation func prepareChangeLoginPolicy(a *org.Aggregate, policy *ChangeLoginPolicy) preparation.Validation { return func() (preparation.CreateCommands, error) { if ok := domain.ValidateDefaultRedirectURI(policy.DefaultRedirectURI); !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-Sfd21", "Errors.Org.LoginPolicy.RedirectURIInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-Sfd21", "Errors.Org.LoginPolicy.RedirectURIInvalid") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { wm := NewOrgLoginPolicyWriteModel(a.ID) @@ -466,7 +466,7 @@ func prepareChangeLoginPolicy(a *org.Aggregate, policy *ChangeLoginPolicy) prepa return nil, err } if !wm.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "Org-M0sif", "Errors.Org.LoginPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "Org-M0sif", "Errors.Org.LoginPolicy.NotFound") } changedEvent, hasChanged := wm.NewChangedEvent(ctx, &a.Aggregate, policy.AllowUsernamePassword, @@ -487,7 +487,7 @@ func prepareChangeLoginPolicy(a *org.Aggregate, policy *ChangeLoginPolicy) prepa policy.SecondFactorCheckLifetime, policy.MultiFactorCheckLifetime) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-5M9vdd", "Errors.Org.LoginPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-5M9vdd", "Errors.Org.LoginPolicy.NotChanged") } return []eventstore.Command{changedEvent}, nil }, nil diff --git a/internal/command/org_policy_login_test.go b/internal/command/org_policy_login_test.go index c04e5a709..96b134ed7 100644 --- a/internal/command/org_policy_login_test.go +++ b/internal/command/org_policy_login_test.go @@ -8,13 +8,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -96,7 +96,7 @@ func TestCommandSide_AddLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -190,7 +190,7 @@ func TestCommandSide_AddLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -301,7 +301,7 @@ func TestCommandSide_AddLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -451,7 +451,7 @@ func TestCommandSide_ChangeLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -509,7 +509,7 @@ func TestCommandSide_ChangeLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -642,7 +642,7 @@ func TestCommandSide_RemoveLoginPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -658,7 +658,7 @@ func TestCommandSide_RemoveLoginPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -761,7 +761,7 @@ func TestCommandSide_AddIDPProviderLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -777,7 +777,7 @@ func TestCommandSide_AddIDPProviderLoginPolicy(t *testing.T) { provider: &domain.IDPProvider{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -798,7 +798,7 @@ func TestCommandSide_AddIDPProviderLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -843,7 +843,7 @@ func TestCommandSide_AddIDPProviderLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -908,7 +908,7 @@ func TestCommandSide_AddIDPProviderLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -1037,7 +1037,7 @@ func TestCommandSide_RemoveIDPProviderLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1053,7 +1053,7 @@ func TestCommandSide_RemoveIDPProviderLoginPolicy(t *testing.T) { provider: &domain.IDPProvider{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1072,7 +1072,7 @@ func TestCommandSide_RemoveIDPProviderLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1117,7 +1117,7 @@ func TestCommandSide_RemoveIDPProviderLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1174,7 +1174,7 @@ func TestCommandSide_RemoveIDPProviderLoginPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1435,7 +1435,7 @@ func TestCommandSide_AddSecondFactorLoginPolicy(t *testing.T) { factor: domain.SecondFactorTypeU2F, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1450,7 +1450,7 @@ func TestCommandSide_AddSecondFactorLoginPolicy(t *testing.T) { factor: domain.SecondFactorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1474,7 +1474,7 @@ func TestCommandSide_AddSecondFactorLoginPolicy(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -1623,7 +1623,7 @@ func TestCommandSide_RemoveSecondFactoroginPolicy(t *testing.T) { factor: domain.SecondFactorTypeTOTP, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1638,7 +1638,7 @@ func TestCommandSide_RemoveSecondFactoroginPolicy(t *testing.T) { factor: domain.SecondFactorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1655,7 +1655,7 @@ func TestCommandSide_RemoveSecondFactoroginPolicy(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1685,7 +1685,7 @@ func TestCommandSide_RemoveSecondFactoroginPolicy(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1715,7 +1715,7 @@ func TestCommandSide_RemoveSecondFactoroginPolicy(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1745,7 +1745,7 @@ func TestCommandSide_RemoveSecondFactoroginPolicy(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1889,7 +1889,7 @@ func TestCommandSide_AddMultiFactorLoginPolicy(t *testing.T) { factor: domain.MultiFactorTypeU2FWithPIN, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1904,7 +1904,7 @@ func TestCommandSide_AddMultiFactorLoginPolicy(t *testing.T) { factor: domain.MultiFactorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1928,7 +1928,7 @@ func TestCommandSide_AddMultiFactorLoginPolicy(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -2004,7 +2004,7 @@ func TestCommandSide_RemoveMultiFactorLoginPolicy(t *testing.T) { factor: domain.MultiFactorTypeU2FWithPIN, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -2019,7 +2019,7 @@ func TestCommandSide_RemoveMultiFactorLoginPolicy(t *testing.T) { factor: domain.MultiFactorTypeUnspecified, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -2036,7 +2036,7 @@ func TestCommandSide_RemoveMultiFactorLoginPolicy(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -2066,7 +2066,7 @@ func TestCommandSide_RemoveMultiFactorLoginPolicy(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_policy_mail_template.go b/internal/command/org_policy_mail_template.go index 28bc3a382..9a7fa86e7 100644 --- a/internal/command/org_policy_mail_template.go +++ b/internal/command/org_policy_mail_template.go @@ -4,16 +4,16 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddMailTemplate(ctx context.Context, resourceOwner string, policy *domain.MailTemplate) (*domain.MailTemplate, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-M8dfs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-M8dfs", "Errors.ResourceOwnerMissing") } if !policy.IsValid() { - return nil, caos_errs.ThrowPreconditionFailed(nil, "ORG-3m9fs", "Errors.Org.MailTemplate.Invalid") + return nil, zerrors.ThrowPreconditionFailed(nil, "ORG-3m9fs", "Errors.Org.MailTemplate.Invalid") } addedPolicy := NewOrgMailTemplateWriteModel(resourceOwner) err := c.eventstore.FilterToQueryReducer(ctx, addedPolicy) @@ -21,7 +21,7 @@ func (c *Commands) AddMailTemplate(ctx context.Context, resourceOwner string, po return nil, err } if addedPolicy.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "Org-9kufs", "Errors.Org.MailTemplate.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "Org-9kufs", "Errors.Org.MailTemplate.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.MailTemplateWriteModel.WriteModel) @@ -38,10 +38,10 @@ func (c *Commands) AddMailTemplate(ctx context.Context, resourceOwner string, po func (c *Commands) ChangeMailTemplate(ctx context.Context, resourceOwner string, policy *domain.MailTemplate) (*domain.MailTemplate, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-M9fFs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-M9fFs", "Errors.ResourceOwnerMissing") } if !policy.IsValid() { - return nil, caos_errs.ThrowPreconditionFailed(nil, "ORG-9f9ds", "Errors.Org.MailTemplate.Invalid") + return nil, zerrors.ThrowPreconditionFailed(nil, "ORG-9f9ds", "Errors.Org.MailTemplate.Invalid") } existingPolicy := NewOrgMailTemplateWriteModel(resourceOwner) err := c.eventstore.FilterToQueryReducer(ctx, existingPolicy) @@ -49,13 +49,13 @@ func (c *Commands) ChangeMailTemplate(ctx context.Context, resourceOwner string, return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "Org-5m9ie", "Errors.Org.MailTemplate.NotFound") + return nil, zerrors.ThrowNotFound(nil, "Org-5m9ie", "Errors.Org.MailTemplate.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.MailTemplateWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, orgAgg, policy.Template) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-49hfj", "Errors.Org.MailTemplate.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-49hfj", "Errors.Org.MailTemplate.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -71,7 +71,7 @@ func (c *Commands) ChangeMailTemplate(ctx context.Context, resourceOwner string, func (c *Commands) RemoveMailTemplate(ctx context.Context, orgID string) error { if orgID == "" { - return caos_errs.ThrowInvalidArgument(nil, "Org-5Jgis", "Errors.ResourceOwnerMissing") + return zerrors.ThrowInvalidArgument(nil, "Org-5Jgis", "Errors.ResourceOwnerMissing") } existingPolicy := NewOrgMailTemplateWriteModel(orgID) err := c.eventstore.FilterToQueryReducer(ctx, existingPolicy) @@ -79,7 +79,7 @@ func (c *Commands) RemoveMailTemplate(ctx context.Context, orgID string) error { return err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return caos_errs.ThrowNotFound(nil, "Org-3b8Jf", "Errors.Org.MailTemplate.NotFound") + return zerrors.ThrowNotFound(nil, "Org-3b8Jf", "Errors.Org.MailTemplate.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.WriteModel) diff --git a/internal/command/org_policy_mail_template_test.go b/internal/command/org_policy_mail_template_test.go index ab4d1b1b9..a7e0e2aab 100644 --- a/internal/command/org_policy_mail_template_test.go +++ b/internal/command/org_policy_mail_template_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddMailTemplate(t *testing.T) { @@ -47,7 +47,7 @@ func TestCommandSide_AddMailTemplate(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -73,7 +73,7 @@ func TestCommandSide_AddMailTemplate(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -160,7 +160,7 @@ func TestCommandSide_ChangeMailTemplate(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -179,7 +179,7 @@ func TestCommandSide_ChangeMailTemplate(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -205,7 +205,7 @@ func TestCommandSide_ChangeMailTemplate(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -292,7 +292,7 @@ func TestCommandSide_RemoveMailTemplate(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -308,7 +308,7 @@ func TestCommandSide_RemoveMailTemplate(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_policy_notification.go b/internal/command/org_policy_notification.go index 34613d486..88228a7ed 100644 --- a/internal/command/org_policy_notification.go +++ b/internal/command/org_policy_notification.go @@ -5,14 +5,14 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddNotificationPolicy(ctx context.Context, resourceOwner string, passwordChange bool) (*domain.ObjectDetails, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-x801sk2i", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-x801sk2i", "Errors.ResourceOwnerMissing") } orgAgg := org.NewAggregate(resourceOwner) cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, prepareAddNotificationPolicy(orgAgg, passwordChange)) @@ -42,7 +42,7 @@ func prepareAddNotificationPolicy( return nil, err } if writeModel.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "Org-xa08n2", "Errors.Org.NotificationPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "Org-xa08n2", "Errors.Org.NotificationPolicy.AlreadyExists") } return []eventstore.Command{ org.NewNotificationPolicyAddedEvent(ctx, &a.Aggregate, passwordChange), @@ -53,7 +53,7 @@ func prepareAddNotificationPolicy( func (c *Commands) ChangeNotificationPolicy(ctx context.Context, resourceOwner string, passwordChange bool) (*domain.ObjectDetails, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-x091n1g", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-x091n1g", "Errors.ResourceOwnerMissing") } orgAgg := org.NewAggregate(resourceOwner) cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, prepareChangeNotificationPolicy(orgAgg, passwordChange)) @@ -84,11 +84,11 @@ func prepareChangeNotificationPolicy( } if writeModel.State == domain.PolicyStateUnspecified || writeModel.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-x029n3", "Errors.Org.NotificationPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-x029n3", "Errors.Org.NotificationPolicy.NotFound") } change, hasChanged := writeModel.NewChangedEvent(ctx, &a.Aggregate, passwordChange) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-ioqnxz", "Errors.Org.NotificationPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-ioqnxz", "Errors.Org.NotificationPolicy.NotChanged") } return []eventstore.Command{ change, @@ -99,7 +99,7 @@ func prepareChangeNotificationPolicy( func (c *Commands) RemoveNotificationPolicy(ctx context.Context, resourceOwner string) (*domain.ObjectDetails, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-x89ns2", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-x89ns2", "Errors.ResourceOwnerMissing") } orgAgg := org.NewAggregate(resourceOwner) cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, prepareRemoveNotificationPolicy(orgAgg)) @@ -129,7 +129,7 @@ func prepareRemoveNotificationPolicy( } if writeModel.State == domain.PolicyStateUnspecified || writeModel.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-x029n1s", "Errors.Org.NotificationPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-x029n1s", "Errors.Org.NotificationPolicy.NotFound") } return []eventstore.Command{ org.NewNotificationPolicyRemovedEvent(ctx, &a.Aggregate), diff --git a/internal/command/org_policy_notification_test.go b/internal/command/org_policy_notification_test.go index 5b780b892..5f8f4f49c 100644 --- a/internal/command/org_policy_notification_test.go +++ b/internal/command/org_policy_notification_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddNotificationPolicy(t *testing.T) { @@ -45,7 +45,7 @@ func TestCommandSide_AddNotificationPolicy(t *testing.T) { passwordChange: true, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -69,7 +69,7 @@ func TestCommandSide_AddNotificationPolicy(t *testing.T) { passwordChange: true, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -173,7 +173,7 @@ func TestCommandSide_ChangeNotificationPolicy(t *testing.T) { passwordChange: true, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -190,7 +190,7 @@ func TestCommandSide_ChangeNotificationPolicy(t *testing.T) { passwordChange: true, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -214,7 +214,7 @@ func TestCommandSide_ChangeNotificationPolicy(t *testing.T) { passwordChange: true, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -295,7 +295,7 @@ func TestCommandSide_RemoveNotificationPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -311,7 +311,7 @@ func TestCommandSide_RemoveNotificationPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_policy_password_age.go b/internal/command/org_policy_password_age.go index b390f309a..cc139cc79 100644 --- a/internal/command/org_policy_password_age.go +++ b/internal/command/org_policy_password_age.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddPasswordAgePolicy(ctx context.Context, resourceOwner string, policy *domain.PasswordAgePolicy) (*domain.PasswordAgePolicy, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-M9fsd", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-M9fsd", "Errors.ResourceOwnerMissing") } addedPolicy := NewOrgPasswordAgePolicyWriteModel(resourceOwner) err := c.eventstore.FilterToQueryReducer(ctx, addedPolicy) @@ -18,7 +18,7 @@ func (c *Commands) AddPasswordAgePolicy(ctx context.Context, resourceOwner strin return nil, err } if addedPolicy.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "ORG-Lk0dS", "Errors.Org.PasswordAgePolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "ORG-Lk0dS", "Errors.Org.PasswordAgePolicy.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.WriteModel) @@ -35,7 +35,7 @@ func (c *Commands) AddPasswordAgePolicy(ctx context.Context, resourceOwner strin func (c *Commands) ChangePasswordAgePolicy(ctx context.Context, resourceOwner string, policy *domain.PasswordAgePolicy) (*domain.PasswordAgePolicy, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-57tGs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-57tGs", "Errors.ResourceOwnerMissing") } existingPolicy := NewOrgPasswordAgePolicyWriteModel(resourceOwner) err := c.eventstore.FilterToQueryReducer(ctx, existingPolicy) @@ -43,13 +43,13 @@ func (c *Commands) ChangePasswordAgePolicy(ctx context.Context, resourceOwner st return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-0oPew", "Errors.Org.PasswordAgePolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-0oPew", "Errors.Org.PasswordAgePolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.PasswordAgePolicyWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, orgAgg, policy.ExpireWarnDays, policy.MaxAgeDays) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-dsgjR", "Errors.ORg.LabelPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-dsgjR", "Errors.ORg.LabelPolicy.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -65,7 +65,7 @@ func (c *Commands) ChangePasswordAgePolicy(ctx context.Context, resourceOwner st func (c *Commands) RemovePasswordAgePolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-M58wd", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-M58wd", "Errors.ResourceOwnerMissing") } existingPolicy := NewOrgPasswordAgePolicyWriteModel(orgID) err := c.eventstore.FilterToQueryReducer(ctx, existingPolicy) @@ -73,7 +73,7 @@ func (c *Commands) RemovePasswordAgePolicy(ctx context.Context, orgID string) (* return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-Dgs1g", "Errors.Org.PasswordAgePolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-Dgs1g", "Errors.Org.PasswordAgePolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, org.NewPasswordAgePolicyRemovedEvent(ctx, orgAgg)) diff --git a/internal/command/org_policy_password_age_test.go b/internal/command/org_policy_password_age_test.go index 79b703a99..610053387 100644 --- a/internal/command/org_policy_password_age_test.go +++ b/internal/command/org_policy_password_age_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddPasswordAgePolicy(t *testing.T) { @@ -48,7 +48,7 @@ func TestCommandSide_AddPasswordAgePolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -76,7 +76,7 @@ func TestCommandSide_AddPasswordAgePolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -167,7 +167,7 @@ func TestCommandSide_ChangePasswordAgePolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -187,7 +187,7 @@ func TestCommandSide_ChangePasswordAgePolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -215,7 +215,7 @@ func TestCommandSide_ChangePasswordAgePolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -305,7 +305,7 @@ func TestCommandSide_RemovePasswordAgePolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -321,7 +321,7 @@ func TestCommandSide_RemovePasswordAgePolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_policy_password_complexity.go b/internal/command/org_policy_password_complexity.go index 4c7b7df3f..932b598af 100644 --- a/internal/command/org_policy_password_complexity.go +++ b/internal/command/org_policy_password_complexity.go @@ -4,8 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) getOrgPasswordComplexityPolicy(ctx context.Context, orgID string) (*domain.PasswordComplexityPolicy, error) { @@ -30,7 +30,7 @@ func (c *Commands) orgPasswordComplexityPolicyWriteModelByID(ctx context.Context func (c *Commands) AddPasswordComplexityPolicy(ctx context.Context, resourceOwner string, policy *domain.PasswordComplexityPolicy) (*domain.PasswordComplexityPolicy, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-7ufEs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-7ufEs", "Errors.ResourceOwnerMissing") } if err := policy.IsValid(); err != nil { return nil, err @@ -41,7 +41,7 @@ func (c *Commands) AddPasswordComplexityPolicy(ctx context.Context, resourceOwne return nil, err } if addedPolicy.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "Org-LdhbS", "Errors.Org.PasswordComplexityPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "Org-LdhbS", "Errors.Org.PasswordComplexityPolicy.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.WriteModel) @@ -67,7 +67,7 @@ func (c *Commands) AddPasswordComplexityPolicy(ctx context.Context, resourceOwne func (c *Commands) ChangePasswordComplexityPolicy(ctx context.Context, resourceOwner string, policy *domain.PasswordComplexityPolicy) (*domain.PasswordComplexityPolicy, error) { if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-3J8fs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-3J8fs", "Errors.ResourceOwnerMissing") } if err := policy.IsValid(); err != nil { return nil, err @@ -79,13 +79,13 @@ func (c *Commands) ChangePasswordComplexityPolicy(ctx context.Context, resourceO return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-Dgs3g", "Errors.Org.PasswordComplexityPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-Dgs3g", "Errors.Org.PasswordComplexityPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.PasswordComplexityPolicyWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, orgAgg, policy.MinLength, policy.HasLowercase, policy.HasUppercase, policy.HasNumber, policy.HasSymbol) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-DAs21", "Errors.Org.PasswordComplexityPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-DAs21", "Errors.Org.PasswordComplexityPolicy.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -101,7 +101,7 @@ func (c *Commands) ChangePasswordComplexityPolicy(ctx context.Context, resourceO func (c *Commands) RemovePasswordComplexityPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-J8fsf", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-J8fsf", "Errors.ResourceOwnerMissing") } existingPolicy := NewOrgPasswordComplexityPolicyWriteModel(orgID) event, err := c.removePasswordComplexityPolicy(ctx, existingPolicy) @@ -125,7 +125,7 @@ func (c *Commands) removePasswordComplexityPolicy(ctx context.Context, existingP return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-ADgs2", "Errors.Org.PasswordComplexityPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-ADgs2", "Errors.Org.PasswordComplexityPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.WriteModel) return org.NewPasswordComplexityPolicyRemovedEvent(ctx, orgAgg), nil diff --git a/internal/command/org_policy_password_complexity_test.go b/internal/command/org_policy_password_complexity_test.go index 93b73170e..955b3bedf 100644 --- a/internal/command/org_policy_password_complexity_test.go +++ b/internal/command/org_policy_password_complexity_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddPasswordComplexityPolicy(t *testing.T) { @@ -51,7 +51,7 @@ func TestCommandSide_AddPasswordComplexityPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -82,7 +82,7 @@ func TestCommandSide_AddPasswordComplexityPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -182,7 +182,7 @@ func TestCommandSide_ChangePasswordComplexityPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -205,7 +205,7 @@ func TestCommandSide_ChangePasswordComplexityPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -236,7 +236,7 @@ func TestCommandSide_ChangePasswordComplexityPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -332,7 +332,7 @@ func TestCommandSide_RemovePasswordComplexityPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -348,7 +348,7 @@ func TestCommandSide_RemovePasswordComplexityPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_policy_privacy.go b/internal/command/org_policy_privacy.go index 04f730f8f..c4cf6f459 100644 --- a/internal/command/org_policy_privacy.go +++ b/internal/command/org_policy_privacy.go @@ -4,8 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) getOrgPrivacyPolicy(ctx context.Context, orgID string) (*domain.PrivacyPolicy, error) { @@ -38,7 +38,7 @@ func (c *Commands) AddPrivacyPolicy(ctx context.Context, resourceOwner string, p } if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-MMk9fs", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-MMk9fs", "Errors.ResourceOwnerMissing") } addedPolicy := NewOrgPrivacyPolicyWriteModel(resourceOwner) err := c.eventstore.FilterToQueryReducer(ctx, addedPolicy) @@ -46,7 +46,7 @@ func (c *Commands) AddPrivacyPolicy(ctx context.Context, resourceOwner string, p return nil, err } if addedPolicy.State == domain.PolicyStateActive { - return nil, caos_errs.ThrowAlreadyExists(nil, "Org-0oLpd", "Errors.Org.PrivacyPolicy.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "Org-0oLpd", "Errors.Org.PrivacyPolicy.AlreadyExists") } orgAgg := OrgAggregateFromWriteModel(&addedPolicy.WriteModel) @@ -79,7 +79,7 @@ func (c *Commands) ChangePrivacyPolicy(ctx context.Context, resourceOwner string } if resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-22N89f", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-22N89f", "Errors.ResourceOwnerMissing") } existingPolicy, err := c.orgPrivacyPolicyWriteModelByID(ctx, resourceOwner) @@ -87,13 +87,13 @@ func (c *Commands) ChangePrivacyPolicy(ctx context.Context, resourceOwner string return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-Ng8sf", "Errors.Org.PrivacyPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-Ng8sf", "Errors.Org.PrivacyPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.PrivacyPolicyWriteModel.WriteModel) changedEvent, hasChanged := existingPolicy.NewChangedEvent(ctx, orgAgg, policy.TOSLink, policy.PrivacyLink, policy.HelpLink, policy.SupportEmail) if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "Org-4N9fs", "Errors.Org.PrivacyPolicy.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "Org-4N9fs", "Errors.Org.PrivacyPolicy.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -109,7 +109,7 @@ func (c *Commands) ChangePrivacyPolicy(ctx context.Context, resourceOwner string func (c *Commands) RemovePrivacyPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) { if orgID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "Org-Nf9sf", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "Org-Nf9sf", "Errors.ResourceOwnerMissing") } existingPolicy := NewOrgPrivacyPolicyWriteModel(orgID) event, err := c.removePrivacyPolicy(ctx, existingPolicy) @@ -133,7 +133,7 @@ func (c *Commands) removePrivacyPolicy(ctx context.Context, existingPolicy *OrgP return nil, err } if existingPolicy.State == domain.PolicyStateUnspecified || existingPolicy.State == domain.PolicyStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "ORG-Ze9gs", "Errors.Org.PrivacyPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "ORG-Ze9gs", "Errors.Org.PrivacyPolicy.NotFound") } orgAgg := OrgAggregateFromWriteModel(&existingPolicy.WriteModel) return org.NewPrivacyPolicyRemovedEvent(ctx, orgAgg), nil diff --git a/internal/command/org_policy_privacy_test.go b/internal/command/org_policy_privacy_test.go index bc5e44885..3b251326d 100644 --- a/internal/command/org_policy_privacy_test.go +++ b/internal/command/org_policy_privacy_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddPrivacyPolicy(t *testing.T) { @@ -50,7 +50,7 @@ func TestCommandSide_AddPrivacyPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -82,7 +82,7 @@ func TestCommandSide_AddPrivacyPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -143,7 +143,7 @@ func TestCommandSide_AddPrivacyPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -242,7 +242,7 @@ func TestCommandSide_ChangePrivacyPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -264,7 +264,7 @@ func TestCommandSide_ChangePrivacyPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -296,7 +296,7 @@ func TestCommandSide_ChangePrivacyPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -312,7 +312,7 @@ func TestCommandSide_ChangePrivacyPolicy(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -452,7 +452,7 @@ func TestCommandSide_RemovePrivacyPolicy(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -468,7 +468,7 @@ func TestCommandSide_RemovePrivacyPolicy(t *testing.T) { orgID: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/org_test.go b/internal/command/org_test.go index 9bfe32a1c..12199a998 100644 --- a/internal/command/org_test.go +++ b/internal/command/org_test.go @@ -13,7 +13,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" @@ -21,6 +20,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestAddOrg(t *testing.T) { @@ -44,7 +44,7 @@ func TestAddOrg(t *testing.T) { name: "", }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "ORG-mruNY", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "ORG-mruNY", "Errors.Invalid.Argument"), }, }, { @@ -106,7 +106,7 @@ func TestCommandSide_AddOrg(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -123,7 +123,7 @@ func TestCommandSide_AddOrg(t *testing.T) { name: " ", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -167,7 +167,7 @@ func TestCommandSide_AddOrg(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -193,7 +193,7 @@ func TestCommandSide_AddOrg(t *testing.T) { ), ), expectFilterOrgMemberNotFound(), - expectPushFailed(errors.ThrowAlreadyExists(nil, "id", "internal"), + expectPushFailed(zerrors.ThrowAlreadyExists(nil, "id", "internal"), org.NewOrgAddedEvent( context.Background(), &org.NewAggregate("org2").Aggregate, @@ -235,7 +235,7 @@ func TestCommandSide_AddOrg(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -261,7 +261,7 @@ func TestCommandSide_AddOrg(t *testing.T) { ), ), expectFilterOrgMemberNotFound(), - expectPushFailed(errors.ThrowInternal(nil, "id", "internal"), + expectPushFailed(zerrors.ThrowInternal(nil, "id", "internal"), org.NewOrgAddedEvent( context.Background(), &org.NewAggregate("org2").Aggregate, @@ -303,7 +303,7 @@ func TestCommandSide_AddOrg(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -500,7 +500,7 @@ func TestCommandSide_ChangeOrg(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -516,7 +516,7 @@ func TestCommandSide_ChangeOrg(t *testing.T) { name: " ", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -533,7 +533,7 @@ func TestCommandSide_ChangeOrg(t *testing.T) { name: "org", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -556,7 +556,7 @@ func TestCommandSide_ChangeOrg(t *testing.T) { name: " org ", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -573,7 +573,7 @@ func TestCommandSide_ChangeOrg(t *testing.T) { ), expectFilter(), expectPushFailed( - errors.ThrowInternal(nil, "id", "message"), + zerrors.ThrowInternal(nil, "id", "message"), org.NewOrgChangedEvent(context.Background(), &org.NewAggregate("org1").Aggregate, "org", "neworg", ), @@ -586,7 +586,7 @@ func TestCommandSide_ChangeOrg(t *testing.T) { name: "neworg", }, res: res{ - err: errors.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -751,7 +751,7 @@ func TestCommandSide_DeactivateOrg(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -777,7 +777,7 @@ func TestCommandSide_DeactivateOrg(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -793,7 +793,7 @@ func TestCommandSide_DeactivateOrg(t *testing.T) { ), ), expectPushFailed( - errors.ThrowInternal(nil, "id", "message"), + zerrors.ThrowInternal(nil, "id", "message"), org.NewOrgDeactivatedEvent(context.Background(), &org.NewAggregate("org1").Aggregate, ), @@ -805,7 +805,7 @@ func TestCommandSide_DeactivateOrg(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -884,7 +884,7 @@ func TestCommandSide_ReactivateOrg(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -906,7 +906,7 @@ func TestCommandSide_ReactivateOrg(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -927,7 +927,7 @@ func TestCommandSide_ReactivateOrg(t *testing.T) { ), ), expectPushFailed( - errors.ThrowInternal(nil, "id", "message"), + zerrors.ThrowInternal(nil, "id", "message"), org.NewOrgReactivatedEvent(context.Background(), &org.NewAggregate("org1").Aggregate, ), @@ -939,7 +939,7 @@ func TestCommandSide_ReactivateOrg(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -1019,7 +1019,7 @@ func TestCommandSide_RemoveOrg(t *testing.T) { orgID: "defaultOrgID", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1045,7 +1045,7 @@ func TestCommandSide_RemoveOrg(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1062,7 +1062,7 @@ func TestCommandSide_RemoveOrg(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1093,7 +1093,7 @@ func TestCommandSide_RemoveOrg(t *testing.T) { expectFilter(), expectFilter(), expectPushFailed( - errors.ThrowInternal(nil, "id", "message"), + zerrors.ThrowInternal(nil, "id", "message"), org.NewOrgRemovedEvent( context.Background(), &org.NewAggregate("org1").Aggregate, "org", []string{}, false, []string{}, []*domain.UserIDPLink{}, []string{}, ), @@ -1105,7 +1105,7 @@ func TestCommandSide_RemoveOrg(t *testing.T) { orgID: "org1", }, res: res{ - err: errors.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -1292,7 +1292,7 @@ func TestCommandSide_SetUpOrg(t *testing.T) { }, }, res: res{ - err: errors.ThrowInvalidArgument(nil, "ORG-mruNY", "Errors.Invalid.Argument"), + err: zerrors.ThrowInvalidArgument(nil, "ORG-mruNY", "Errors.Invalid.Argument"), }, }, { @@ -1315,7 +1315,7 @@ func TestCommandSide_SetUpOrg(t *testing.T) { }, }, res: res{ - err: errors.ThrowPreconditionFailed(nil, "ORG-GoXOn", "Errors.User.NotFound"), + err: zerrors.ThrowPreconditionFailed(nil, "ORG-GoXOn", "Errors.User.NotFound"), }, }, { @@ -1346,7 +1346,7 @@ func TestCommandSide_SetUpOrg(t *testing.T) { allowInitialMail: true, }, res: res{ - err: errors.ThrowInvalidArgument(nil, "V2-zzad3", "Errors.Invalid.Argument"), + err: zerrors.ThrowInvalidArgument(nil, "V2-zzad3", "Errors.Invalid.Argument"), }, }, { diff --git a/internal/command/phone_test.go b/internal/command/phone_test.go index 0dda25891..521068d1b 100644 --- a/internal/command/phone_test.go +++ b/internal/command/phone_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestFormatPhoneNumber(t *testing.T) { @@ -22,7 +22,7 @@ func TestFormatPhoneNumber(t *testing.T) { args: args{ number: "PhoneNumber", }, - errFunc: errors.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, { name: "format phone +4171 xxx xx xx", diff --git a/internal/command/policy_password_complexity_model.go b/internal/command/policy_password_complexity_model.go index 197ae7ac7..ad8c3b11e 100644 --- a/internal/command/policy_password_complexity_model.go +++ b/internal/command/policy_password_complexity_model.go @@ -4,9 +4,9 @@ import ( "regexp" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -62,23 +62,23 @@ func (wm *PasswordComplexityPolicyWriteModel) Reduce() error { func (wm *PasswordComplexityPolicyWriteModel) Validate(password string) error { if wm.MinLength != 0 && uint64(len(password)) < wm.MinLength { - return errors.ThrowInvalidArgument(nil, "COMMA-HuJf6", "Errors.User.PasswordComplexityPolicy.MinLength") + return zerrors.ThrowInvalidArgument(nil, "COMMA-HuJf6", "Errors.User.PasswordComplexityPolicy.MinLength") } if wm.HasLowercase && !hasStringLowerCase(password) { - return errors.ThrowInvalidArgument(nil, "COMMA-co3Xw", "Errors.User.PasswordComplexityPolicy.HasLower") + return zerrors.ThrowInvalidArgument(nil, "COMMA-co3Xw", "Errors.User.PasswordComplexityPolicy.HasLower") } if wm.HasUppercase && !hasStringUpperCase(password) { - return errors.ThrowInvalidArgument(nil, "COMMA-VoaRj", "Errors.User.PasswordComplexityPolicy.HasUpper") + return zerrors.ThrowInvalidArgument(nil, "COMMA-VoaRj", "Errors.User.PasswordComplexityPolicy.HasUpper") } if wm.HasNumber && !hasNumber(password) { - return errors.ThrowInvalidArgument(nil, "COMMA-ZBv4H", "Errors.User.PasswordComplexityPolicy.HasNumber") + return zerrors.ThrowInvalidArgument(nil, "COMMA-ZBv4H", "Errors.User.PasswordComplexityPolicy.HasNumber") } if wm.HasSymbol && !hasSymbol(password) { - return errors.ThrowInvalidArgument(nil, "COMMA-ZDLwA", "Errors.User.PasswordComplexityPolicy.HasSymbol") + return zerrors.ThrowInvalidArgument(nil, "COMMA-ZDLwA", "Errors.User.PasswordComplexityPolicy.HasSymbol") } return nil } diff --git a/internal/command/preparation/command.go b/internal/command/preparation/command.go index ce383cb8d..f407ca6f8 100644 --- a/internal/command/preparation/command.go +++ b/internal/command/preparation/command.go @@ -3,8 +3,8 @@ package preparation import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) // Validation of the input values of the command and if correct returns @@ -21,7 +21,7 @@ type FilterToQueryReducer func(ctx context.Context, queryFactory *eventstore.Sea var ( //ErrNotExecutable is thrown if no command creator was created - ErrNotExecutable = errors.ThrowInvalidArgument(nil, "PREPA-pH70n", "Errors.Internal") + ErrNotExecutable = zerrors.ThrowInvalidArgument(nil, "PREPA-pH70n", "Errors.Internal") ) // PrepareCommands checks the passed validations and if ok creates the commands diff --git a/internal/command/project.go b/internal/command/project.go index a561daa90..6837fabd9 100644 --- a/internal/command/project.go +++ b/internal/command/project.go @@ -8,9 +8,9 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddProjectWithID(ctx context.Context, project *domain.Project, resourceOwner, projectID string) (_ *domain.Project, err error) { @@ -19,14 +19,14 @@ func (c *Commands) AddProjectWithID(ctx context.Context, project *domain.Project return nil, err } if existingProject.State != domain.ProjectStateUnspecified { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-opamwu", "Errors.Project.AlreadyExisting") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-opamwu", "Errors.Project.AlreadyExisting") } return c.addProjectWithID(ctx, project, resourceOwner, projectID) } func (c *Commands) AddProject(ctx context.Context, project *domain.Project, resourceOwner, ownerUserID string) (_ *domain.Project, err error) { if !project.IsValid() { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-IOVCC", "Errors.Project.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-IOVCC", "Errors.Project.Invalid") } projectID, err := c.idGenerator.Next() @@ -66,7 +66,7 @@ func (c *Commands) addProjectWithID(ctx context.Context, projectAdd *domain.Proj func (c *Commands) addProjectWithIDWithOwner(ctx context.Context, projectAdd *domain.Project, resourceOwner, ownerUserID, projectID string) (_ *domain.Project, err error) { if !projectAdd.IsValid() { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-IOVCC", "Errors.Project.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-IOVCC", "Errors.Project.Invalid") } projectAdd.AggregateID = projectID addedProject := NewProjectWriteModel(projectAdd.AggregateID, resourceOwner) @@ -107,13 +107,13 @@ func AddProjectCommand( ) preparation.Validation { return func() (preparation.CreateCommands, error) { if name = strings.TrimSpace(name); name == "" { - return nil, errors.ThrowInvalidArgument(nil, "PROJE-C01yo", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJE-C01yo", "Errors.Invalid.Argument") } if !privateLabelingSetting.Valid() { - return nil, errors.ThrowInvalidArgument(nil, "PROJE-AO52V", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJE-AO52V", "Errors.Invalid.Argument") } if owner == "" { - return nil, errors.ThrowPreconditionFailed(nil, "PROJE-hzxwo", "Errors.Invalid.Argument") + return nil, zerrors.ThrowPreconditionFailed(nil, "PROJE-hzxwo", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { return []eventstore.Command{ @@ -153,7 +153,7 @@ func (c *Commands) getProjectByID(ctx context.Context, projectID, resourceOwner return nil, err } if projectWriteModel.State == domain.ProjectStateUnspecified || projectWriteModel.State == domain.ProjectStateRemoved { - return nil, errors.ThrowNotFound(nil, "PROJECT-Gd2hh", "Errors.Project.NotFound") + return nil, zerrors.ThrowNotFound(nil, "PROJECT-Gd2hh", "Errors.Project.NotFound") } return projectWriteModelToProject(projectWriteModel), nil } @@ -164,14 +164,14 @@ func (c *Commands) checkProjectExists(ctx context.Context, projectID, resourceOw return err } if projectWriteModel.State == domain.ProjectStateUnspecified || projectWriteModel.State == domain.ProjectStateRemoved { - return errors.ThrowPreconditionFailed(nil, "COMMAND-EbFMN", "Errors.Project.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-EbFMN", "Errors.Project.NotFound") } return nil } func (c *Commands) ChangeProject(ctx context.Context, projectChange *domain.Project, resourceOwner string) (*domain.Project, error) { if !projectChange.IsValid() || projectChange.AggregateID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-4m9vS", "Errors.Project.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-4m9vS", "Errors.Project.Invalid") } existingProject, err := c.getProjectWriteModelByID(ctx, projectChange.AggregateID, resourceOwner) @@ -179,7 +179,7 @@ func (c *Commands) ChangeProject(ctx context.Context, projectChange *domain.Proj return nil, err } if existingProject.State == domain.ProjectStateUnspecified || existingProject.State == domain.ProjectStateRemoved { - return nil, errors.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.Project.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.Project.NotFound") } projectAgg := ProjectAggregateFromWriteModel(&existingProject.WriteModel) @@ -195,7 +195,7 @@ func (c *Commands) ChangeProject(ctx context.Context, projectChange *domain.Proj return nil, err } if !hasChanged { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-2M0fs", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-2M0fs", "Errors.NoChangesFound") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { @@ -210,7 +210,7 @@ func (c *Commands) ChangeProject(ctx context.Context, projectChange *domain.Proj func (c *Commands) DeactivateProject(ctx context.Context, projectID string, resourceOwner string) (*domain.ObjectDetails, error) { if projectID == "" || resourceOwner == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-88iF0", "Errors.Project.ProjectIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-88iF0", "Errors.Project.ProjectIDMissing") } existingProject, err := c.getProjectWriteModelByID(ctx, projectID, resourceOwner) @@ -218,10 +218,10 @@ func (c *Commands) DeactivateProject(ctx context.Context, projectID string, reso return nil, err } if existingProject.State == domain.ProjectStateUnspecified || existingProject.State == domain.ProjectStateRemoved { - return nil, errors.ThrowNotFound(nil, "COMMAND-112M9", "Errors.Project.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-112M9", "Errors.Project.NotFound") } if existingProject.State != domain.ProjectStateActive { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-mki55", "Errors.Project.NotActive") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-mki55", "Errors.Project.NotActive") } projectAgg := ProjectAggregateFromWriteModel(&existingProject.WriteModel) @@ -238,7 +238,7 @@ func (c *Commands) DeactivateProject(ctx context.Context, projectID string, reso func (c *Commands) ReactivateProject(ctx context.Context, projectID string, resourceOwner string) (*domain.ObjectDetails, error) { if projectID == "" || resourceOwner == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-3ihsF", "Errors.Project.ProjectIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-3ihsF", "Errors.Project.ProjectIDMissing") } existingProject, err := c.getProjectWriteModelByID(ctx, projectID, resourceOwner) @@ -246,10 +246,10 @@ func (c *Commands) ReactivateProject(ctx context.Context, projectID string, reso return nil, err } if existingProject.State == domain.ProjectStateUnspecified || existingProject.State == domain.ProjectStateRemoved { - return nil, errors.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.Project.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.Project.NotFound") } if existingProject.State != domain.ProjectStateInactive { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-5M9bs", "Errors.Project.NotInactive") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-5M9bs", "Errors.Project.NotInactive") } projectAgg := ProjectAggregateFromWriteModel(&existingProject.WriteModel) @@ -266,7 +266,7 @@ func (c *Commands) ReactivateProject(ctx context.Context, projectID string, reso func (c *Commands) RemoveProject(ctx context.Context, projectID, resourceOwner string, cascadingUserGrantIDs ...string) (*domain.ObjectDetails, error) { if projectID == "" || resourceOwner == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-66hM9", "Errors.Project.ProjectIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-66hM9", "Errors.Project.ProjectIDMissing") } existingProject, err := c.getProjectWriteModelByID(ctx, projectID, resourceOwner) @@ -274,7 +274,7 @@ func (c *Commands) RemoveProject(ctx context.Context, projectID, resourceOwner s return nil, err } if existingProject.State == domain.ProjectStateUnspecified || existingProject.State == domain.ProjectStateRemoved { - return nil, errors.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.Project.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.Project.NotFound") } samlEntityIDsAgg, err := c.getSAMLEntityIdsWriteModelByProjectID(ctx, projectID, resourceOwner) diff --git a/internal/command/project_application.go b/internal/command/project_application.go index 3929be9e7..700f3f68e 100644 --- a/internal/command/project_application.go +++ b/internal/command/project_application.go @@ -6,8 +6,8 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) type AddApp struct { @@ -22,7 +22,7 @@ func (c *Commands) newAppClientSecret(ctx context.Context, filter preparation.Fi func (c *Commands) ChangeApplication(ctx context.Context, projectID string, appChange domain.Application, resourceOwner string) (*domain.ObjectDetails, error) { if projectID == "" || appChange.GetAppID() == "" || appChange.GetApplicationName() == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-4m9vS", "Errors.Project.App.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-4m9vS", "Errors.Project.App.Invalid") } existingApp, err := c.getApplicationWriteModel(ctx, projectID, appChange.GetAppID(), resourceOwner) @@ -30,10 +30,10 @@ func (c *Commands) ChangeApplication(ctx context.Context, projectID string, appC return nil, err } if existingApp.State == domain.AppStateUnspecified || existingApp.State == domain.AppStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-28di9", "Errors.Project.App.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-28di9", "Errors.Project.App.NotExisting") } if existingApp.Name == appChange.GetApplicationName() { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2m8vx", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-2m8vx", "Errors.NoChangesFound") } projectAgg := ProjectAggregateFromWriteModel(&existingApp.WriteModel) pushedEvents, err := c.eventstore.Push( @@ -51,7 +51,7 @@ func (c *Commands) ChangeApplication(ctx context.Context, projectID string, appC func (c *Commands) DeactivateApplication(ctx context.Context, projectID, appID, resourceOwner string) (*domain.ObjectDetails, error) { if projectID == "" || appID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-88fi0", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-88fi0", "Errors.IDMissing") } existingApp, err := c.getApplicationWriteModel(ctx, projectID, appID, resourceOwner) @@ -59,10 +59,10 @@ func (c *Commands) DeactivateApplication(ctx context.Context, projectID, appID, return nil, err } if existingApp.State == domain.AppStateUnspecified || existingApp.State == domain.AppStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-ov9d3", "Errors.Project.App.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-ov9d3", "Errors.Project.App.NotExisting") } if existingApp.State != domain.AppStateActive { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-dsh35", "Errors.Project.App.NotActive") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-dsh35", "Errors.Project.App.NotActive") } projectAgg := ProjectAggregateFromWriteModel(&existingApp.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, project.NewApplicationDeactivatedEvent(ctx, projectAgg, appID)) @@ -78,7 +78,7 @@ func (c *Commands) DeactivateApplication(ctx context.Context, projectID, appID, func (c *Commands) ReactivateApplication(ctx context.Context, projectID, appID, resourceOwner string) (*domain.ObjectDetails, error) { if projectID == "" || appID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-983dF", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-983dF", "Errors.IDMissing") } existingApp, err := c.getApplicationWriteModel(ctx, projectID, appID, resourceOwner) @@ -86,10 +86,10 @@ func (c *Commands) ReactivateApplication(ctx context.Context, projectID, appID, return nil, err } if existingApp.State == domain.AppStateUnspecified || existingApp.State == domain.AppStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-ov9d3", "Errors.Project.App.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-ov9d3", "Errors.Project.App.NotExisting") } if existingApp.State != domain.AppStateInactive { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-1n8cM", "Errors.Project.App.NotInactive") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-1n8cM", "Errors.Project.App.NotInactive") } projectAgg := ProjectAggregateFromWriteModel(&existingApp.WriteModel) @@ -106,7 +106,7 @@ func (c *Commands) ReactivateApplication(ctx context.Context, projectID, appID, func (c *Commands) RemoveApplication(ctx context.Context, projectID, appID, resourceOwner string) (*domain.ObjectDetails, error) { if projectID == "" || appID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-1b7Jf", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-1b7Jf", "Errors.IDMissing") } existingApp, err := c.getApplicationWriteModel(ctx, projectID, appID, resourceOwner) @@ -114,7 +114,7 @@ func (c *Commands) RemoveApplication(ctx context.Context, projectID, appID, reso return nil, err } if existingApp.State == domain.AppStateUnspecified || existingApp.State == domain.AppStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-0po9s", "Errors.Project.App.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-0po9s", "Errors.Project.App.NotExisting") } projectAgg := ProjectAggregateFromWriteModel(&existingApp.WriteModel) diff --git a/internal/command/project_application_api.go b/internal/command/project_application_api.go index 16ff044db..cbbfb87ea 100644 --- a/internal/command/project_application_api.go +++ b/internal/command/project_application_api.go @@ -9,10 +9,10 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" project_repo "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type addAPIApp struct { @@ -27,20 +27,20 @@ type addAPIApp struct { func (c *Commands) AddAPIAppCommand(app *addAPIApp, clientSecretAlg crypto.HashAlgorithm) preparation.Validation { return func() (preparation.CreateCommands, error) { if app.ID == "" { - return nil, errors.ThrowInvalidArgument(nil, "PROJE-XHsKt", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJE-XHsKt", "Errors.Invalid.Argument") } if app.Name = strings.TrimSpace(app.Name); app.Name == "" { - return nil, errors.ThrowInvalidArgument(nil, "PROJE-F7g21", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJE-F7g21", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { project, err := projectWriteModel(ctx, filter, app.Aggregate.ID, app.Aggregate.ResourceOwner) if err != nil || !project.State.Valid() { - return nil, errors.ThrowNotFound(err, "PROJE-Sf2gb", "Errors.Project.NotFound") + return nil, zerrors.ThrowNotFound(err, "PROJE-Sf2gb", "Errors.Project.NotFound") } app.ClientID, err = domain.NewClientID(c.idGenerator, project.Name) if err != nil { - return nil, errors.ThrowInternal(err, "V2-f0pgP", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "V2-f0pgP", "Errors.Internal") } if app.AuthMethodType == domain.APIAuthMethodTypeBasic { @@ -77,11 +77,11 @@ func (c *Commands) AddAPIApplicationWithID(ctx context.Context, apiApp *domain.A return nil, err } if existingAPI.State != domain.AppStateUnspecified { - return nil, errors.ThrowPreconditionFailed(nil, "PROJECT-mabu12", "Errors.Project.App.AlreadyExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "PROJECT-mabu12", "Errors.Project.App.AlreadyExisting") } project, err := c.getProjectByID(ctx, apiApp.AggregateID, resourceOwner) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "PROJECT-9fnsa", "Errors.Project.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "PROJECT-9fnsa", "Errors.Project.NotFound") } return c.addAPIApplicationWithID(ctx, apiApp, resourceOwner, project, appID, appSecretGenerator) @@ -89,15 +89,15 @@ func (c *Commands) AddAPIApplicationWithID(ctx context.Context, apiApp *domain.A func (c *Commands) AddAPIApplication(ctx context.Context, apiApp *domain.APIApp, resourceOwner string, appSecretGenerator crypto.Generator) (_ *domain.APIApp, err error) { if apiApp == nil || apiApp.AggregateID == "" { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-5m9E", "Errors.Project.App.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-5m9E", "Errors.Project.App.Invalid") } project, err := c.getProjectByID(ctx, apiApp.AggregateID, resourceOwner) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "PROJECT-9fnsf", "Errors.Project.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "PROJECT-9fnsf", "Errors.Project.NotFound") } if !apiApp.IsValid() { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-Bff2g", "Errors.Project.App.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-Bff2g", "Errors.Project.App.Invalid") } appID, err := c.idGenerator.Next() @@ -150,7 +150,7 @@ func (c *Commands) addAPIApplicationWithID(ctx context.Context, apiApp *domain.A func (c *Commands) ChangeAPIApplication(ctx context.Context, apiApp *domain.APIApp, resourceOwner string) (*domain.APIApp, error) { if apiApp.AppID == "" || apiApp.AggregateID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-1m900", "Errors.Project.App.APIConfigInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-1m900", "Errors.Project.App.APIConfigInvalid") } existingAPI, err := c.getAPIAppWriteModel(ctx, apiApp.AggregateID, apiApp.AppID, resourceOwner) @@ -158,10 +158,10 @@ func (c *Commands) ChangeAPIApplication(ctx context.Context, apiApp *domain.APIA return nil, err } if existingAPI.State == domain.AppStateUnspecified || existingAPI.State == domain.AppStateRemoved { - return nil, errors.ThrowNotFound(nil, "COMMAND-2n8uU", "Errors.Project.App.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-2n8uU", "Errors.Project.App.NotExisting") } if !existingAPI.IsAPI() { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-Gnwt3", "Errors.Project.App.IsNotAPI") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Gnwt3", "Errors.Project.App.IsNotAPI") } projectAgg := ProjectAggregateFromWriteModel(&existingAPI.WriteModel) changedEvent, hasChanged, err := existingAPI.NewChangedEvent( @@ -173,7 +173,7 @@ func (c *Commands) ChangeAPIApplication(ctx context.Context, apiApp *domain.APIA return nil, err } if !hasChanged { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-1m88i", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-1m88i", "Errors.NoChangesFound") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -190,7 +190,7 @@ func (c *Commands) ChangeAPIApplication(ctx context.Context, apiApp *domain.APIA func (c *Commands) ChangeAPIApplicationSecret(ctx context.Context, projectID, appID, resourceOwner string, appSecretGenerator crypto.Generator) (*domain.APIApp, error) { if projectID == "" || appID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-99i83", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-99i83", "Errors.IDMissing") } existingAPI, err := c.getAPIAppWriteModel(ctx, projectID, appID, resourceOwner) @@ -198,10 +198,10 @@ func (c *Commands) ChangeAPIApplicationSecret(ctx context.Context, projectID, ap return nil, err } if existingAPI.State == domain.AppStateUnspecified || existingAPI.State == domain.AppStateRemoved { - return nil, errors.ThrowNotFound(nil, "COMMAND-2g66f", "Errors.Project.App.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-2g66f", "Errors.Project.App.NotExisting") } if !existingAPI.IsAPI() { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-aeH4", "Errors.Project.App.IsNotAPI") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-aeH4", "Errors.Project.App.IsNotAPI") } cryptoSecret, stringPW, err := domain.NewClientSecret(appSecretGenerator) if err != nil { @@ -233,13 +233,13 @@ func (c *Commands) VerifyAPIClientSecret(ctx context.Context, projectID, appID, return err } if !app.State.Exists() { - return errors.ThrowPreconditionFailed(nil, "COMMAND-DFnbf", "Errors.Project.App.NoExisting") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-DFnbf", "Errors.Project.App.NoExisting") } if !app.IsAPI() { - return errors.ThrowInvalidArgument(nil, "COMMAND-Bf3fw", "Errors.Project.App.IsNotAPI") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-Bf3fw", "Errors.Project.App.IsNotAPI") } if app.ClientSecret == nil { - return errors.ThrowPreconditionFailed(nil, "COMMAND-D3t5g", "Errors.Project.App.APIConfigInvalid") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-D3t5g", "Errors.Project.App.APIConfigInvalid") } projectAgg := ProjectAggregateFromWriteModel(&app.WriteModel) @@ -252,7 +252,7 @@ func (c *Commands) VerifyAPIClientSecret(ctx context.Context, projectID, appID, } _, err = c.eventstore.Push(ctx, project_repo.NewAPIConfigSecretCheckFailedEvent(ctx, projectAgg, app.AppID)) logging.Log("COMMAND-g3f12").OnError(err).Error("could not push event APIClientSecretCheckFailed") - return errors.ThrowInvalidArgument(nil, "COMMAND-SADfg", "Errors.Project.App.ClientSecretInvalid") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-SADfg", "Errors.Project.App.ClientSecretInvalid") } func (c *Commands) getAPIAppWriteModel(ctx context.Context, projectID, appID, resourceOwner string) (*APIApplicationWriteModel, error) { diff --git a/internal/command/project_application_api_test.go b/internal/command/project_application_api_test.go index 06cfa449c..f5d8fb783 100644 --- a/internal/command/project_application_api_test.go +++ b/internal/command/project_application_api_test.go @@ -9,12 +9,12 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestAddAPIConfig(t *testing.T) { @@ -46,7 +46,7 @@ func TestAddAPIConfig(t *testing.T) { name: "name", }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "PROJE-XHsKt", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "PROJE-XHsKt", "Errors.Invalid.Argument"), }, }, { @@ -58,7 +58,7 @@ func TestAddAPIConfig(t *testing.T) { name: "", }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "PROJE-F7g21", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "PROJE-F7g21", "Errors.Invalid.Argument"), }, }, { @@ -75,7 +75,7 @@ func TestAddAPIConfig(t *testing.T) { Filter(), }, want: Want{ - CreateErr: errors.ThrowNotFound(nil, "PROJE-Sf2gb", "Errors.Project.NotFound"), + CreateErr: zerrors.ThrowNotFound(nil, "PROJE-Sf2gb", "Errors.Project.NotFound"), }, }, { @@ -177,7 +177,7 @@ func TestCommandSide_AddAPIApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -200,7 +200,7 @@ func TestCommandSide_AddAPIApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -230,7 +230,7 @@ func TestCommandSide_AddAPIApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -408,7 +408,7 @@ func TestCommandSide_ChangeAPIApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -431,7 +431,7 @@ func TestCommandSide_ChangeAPIApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -454,7 +454,7 @@ func TestCommandSide_ChangeAPIApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -494,7 +494,7 @@ func TestCommandSide_ChangeAPIApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -613,7 +613,7 @@ func TestCommandSide_ChangeAPIApplicationSecret(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -630,7 +630,7 @@ func TestCommandSide_ChangeAPIApplicationSecret(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -648,7 +648,7 @@ func TestCommandSide_ChangeAPIApplicationSecret(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/project_application_key.go b/internal/command/project_application_key.go index 81fad14e0..1b791c267 100644 --- a/internal/command/project_application_key.go +++ b/internal/command/project_application_key.go @@ -4,9 +4,9 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddApplicationKeyWithID(ctx context.Context, key *domain.ApplicationKey, resourceOwner string) (_ *domain.ApplicationKey, err error) { @@ -15,28 +15,28 @@ func (c *Commands) AddApplicationKeyWithID(ctx context.Context, key *domain.Appl return nil, err } if writeModel.State != domain.AppStateUnspecified { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-so20alo", "Errors.Project.App.Key.AlreadyExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-so20alo", "Errors.Project.App.Key.AlreadyExisting") } application, err := c.getApplicationWriteModel(ctx, key.AggregateID, key.ApplicationID, resourceOwner) if err != nil { return nil, err } if !application.State.Exists() { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-sak24", "Errors.Project.App.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-sak24", "Errors.Project.App.NotFound") } return c.addApplicationKey(ctx, key, resourceOwner) } func (c *Commands) AddApplicationKey(ctx context.Context, key *domain.ApplicationKey, resourceOwner string) (_ *domain.ApplicationKey, err error) { if key.AggregateID == "" || key.ApplicationID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-55m9fs", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-55m9fs", "Errors.IDMissing") } application, err := c.getApplicationWriteModel(ctx, key.AggregateID, key.ApplicationID, resourceOwner) if err != nil { return nil, err } if !application.State.Exists() { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-sak25", "Errors.Project.App.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-sak25", "Errors.Project.App.NotFound") } key.KeyID, err = c.idGenerator.Next() if err != nil { @@ -55,7 +55,7 @@ func (c *Commands) addApplicationKey(ctx context.Context, key *domain.Applicatio } if !keyWriteModel.KeysAllowed { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-Dff54", "Errors.Project.App.AuthMethodNoPrivateKeyJWT") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Dff54", "Errors.Project.App.AuthMethodNoPrivateKeyJWT") } if err := domain.EnsureValidExpirationDate(key); err != nil { @@ -102,7 +102,7 @@ func (c *Commands) RemoveApplicationKey(ctx context.Context, projectID, applicat return nil, err } if !keyWriteModel.State.Exists() { - return nil, errors.ThrowNotFound(nil, "COMMAND-4m77G", "Errors.Project.App.Key.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-4m77G", "Errors.Project.App.Key.NotFound") } pushedEvents, err := c.eventstore.Push(ctx, project.NewApplicationKeyRemovedEvent(ctx, ProjectAggregateFromWriteModel(&keyWriteModel.WriteModel), keyID)) @@ -118,7 +118,7 @@ func (c *Commands) RemoveApplicationKey(ctx context.Context, projectID, applicat func (c *Commands) applicationKeyWriteModelByID(ctx context.Context, projectID, appID, keyID, resourceOwner string) (writeModel *ApplicationKeyWriteModel, err error) { if appID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-029sn", "Errors.Project.App.NotFound") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-029sn", "Errors.Project.App.NotFound") } ctx, span := tracing.NewSpan(ctx) defer func() { span.EndWithError(err) }() diff --git a/internal/command/project_application_key_test.go b/internal/command/project_application_key_test.go index 12aab721f..907b352a7 100644 --- a/internal/command/project_application_key_test.go +++ b/internal/command/project_application_key_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddAPIApplicationKey(t *testing.T) { @@ -51,7 +51,7 @@ func TestCommandSide_AddAPIApplicationKey(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -71,7 +71,7 @@ func TestCommandSide_AddAPIApplicationKey(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -93,7 +93,7 @@ func TestCommandSide_AddAPIApplicationKey(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -139,7 +139,7 @@ func TestCommandSide_AddAPIApplicationKey(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -186,7 +186,7 @@ func TestCommandSide_AddAPIApplicationKey(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, } diff --git a/internal/command/project_application_oidc.go b/internal/command/project_application_oidc.go index 2d14ecf3a..32989e0a5 100644 --- a/internal/command/project_application_oidc.go +++ b/internal/command/project_application_oidc.go @@ -11,10 +11,10 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" project_repo "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type addOIDCApp struct { @@ -44,36 +44,36 @@ type addOIDCApp struct { func (c *Commands) AddOIDCAppCommand(app *addOIDCApp, clientSecretAlg crypto.HashAlgorithm) preparation.Validation { return func() (preparation.CreateCommands, error) { if app.ID == "" { - return nil, errors.ThrowInvalidArgument(nil, "PROJE-NnavI", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJE-NnavI", "Errors.Invalid.Argument") } if app.Name = strings.TrimSpace(app.Name); app.Name == "" { - return nil, errors.ThrowInvalidArgument(nil, "PROJE-Fef31", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJE-Fef31", "Errors.Invalid.Argument") } if app.ClockSkew > time.Second*5 || app.ClockSkew < 0 { - return nil, errors.ThrowInvalidArgument(nil, "V2-PnCMS", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "V2-PnCMS", "Errors.Invalid.Argument") } for _, origin := range app.AdditionalOrigins { if !http_util.IsOrigin(origin) { - return nil, errors.ThrowInvalidArgument(nil, "V2-DqWPX", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "V2-DqWPX", "Errors.Invalid.Argument") } } if !domain.ContainsRequiredGrantTypes(app.ResponseTypes, app.GrantTypes) { - return nil, errors.ThrowInvalidArgument(nil, "V2-sLpW1", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "V2-sLpW1", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) (_ []eventstore.Command, err error) { project, err := projectWriteModel(ctx, filter, app.Aggregate.ID, app.Aggregate.ResourceOwner) if err != nil || !project.State.Valid() { - return nil, errors.ThrowNotFound(err, "PROJE-6swVG", "Errors.Project.NotFound") + return nil, zerrors.ThrowNotFound(err, "PROJE-6swVG", "Errors.Project.NotFound") } app.ClientID, err = domain.NewClientID(c.idGenerator, project.Name) if err != nil { - return nil, errors.ThrowInternal(err, "V2-VMSQ1", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "V2-VMSQ1", "Errors.Internal") } if app.AuthMethodType == domain.OIDCAuthMethodTypeBasic || app.AuthMethodType == domain.OIDCAuthMethodTypePost { @@ -124,12 +124,12 @@ func (c *Commands) AddOIDCApplicationWithID(ctx context.Context, oidcApp *domain return nil, err } if existingApp.State != domain.AppStateUnspecified { - return nil, errors.ThrowPreconditionFailed(nil, "PROJECT-lxowmp", "Errors.Project.App.AlreadyExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "PROJECT-lxowmp", "Errors.Project.App.AlreadyExisting") } project, err := c.getProjectByID(ctx, oidcApp.AggregateID, resourceOwner) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "PROJECT-3m9s2", "Errors.Project.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "PROJECT-3m9s2", "Errors.Project.NotFound") } return c.addOIDCApplicationWithID(ctx, oidcApp, resourceOwner, project, appID, appSecretGenerator) @@ -137,15 +137,15 @@ func (c *Commands) AddOIDCApplicationWithID(ctx context.Context, oidcApp *domain func (c *Commands) AddOIDCApplication(ctx context.Context, oidcApp *domain.OIDCApp, resourceOwner string, appSecretGenerator crypto.Generator) (_ *domain.OIDCApp, err error) { if oidcApp == nil || oidcApp.AggregateID == "" { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-34Fm0", "Errors.Project.App.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-34Fm0", "Errors.Project.App.Invalid") } project, err := c.getProjectByID(ctx, oidcApp.AggregateID, resourceOwner) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "PROJECT-3m9ss", "Errors.Project.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "PROJECT-3m9ss", "Errors.Project.NotFound") } if oidcApp.AppName == "" || !oidcApp.IsValid() { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-1n8df", "Errors.Project.App.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-1n8df", "Errors.Project.App.Invalid") } appID, err := c.idGenerator.Next() @@ -215,7 +215,7 @@ func (c *Commands) addOIDCApplicationWithID(ctx context.Context, oidcApp *domain func (c *Commands) ChangeOIDCApplication(ctx context.Context, oidc *domain.OIDCApp, resourceOwner string) (*domain.OIDCApp, error) { if !oidc.IsValid() || oidc.AppID == "" || oidc.AggregateID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-5m9fs", "Errors.Project.App.OIDCConfigInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-5m9fs", "Errors.Project.App.OIDCConfigInvalid") } existingOIDC, err := c.getOIDCAppWriteModel(ctx, oidc.AggregateID, oidc.AppID, resourceOwner) @@ -223,10 +223,10 @@ func (c *Commands) ChangeOIDCApplication(ctx context.Context, oidc *domain.OIDCA return nil, err } if existingOIDC.State == domain.AppStateUnspecified || existingOIDC.State == domain.AppStateRemoved { - return nil, errors.ThrowNotFound(nil, "COMMAND-2n8uU", "Errors.Project.App.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-2n8uU", "Errors.Project.App.NotExisting") } if !existingOIDC.IsOIDC() { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-GBr34", "Errors.Project.App.IsNotOIDC") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-GBr34", "Errors.Project.App.IsNotOIDC") } projectAgg := ProjectAggregateFromWriteModel(&existingOIDC.WriteModel) changedEvent, hasChanged, err := existingOIDC.NewChangedEvent( @@ -253,7 +253,7 @@ func (c *Commands) ChangeOIDCApplication(ctx context.Context, oidc *domain.OIDCA return nil, err } if !hasChanged { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-1m88i", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-1m88i", "Errors.NoChangesFound") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) @@ -272,7 +272,7 @@ func (c *Commands) ChangeOIDCApplication(ctx context.Context, oidc *domain.OIDCA func (c *Commands) ChangeOIDCApplicationSecret(ctx context.Context, projectID, appID, resourceOwner string, appSecretGenerator crypto.Generator) (*domain.OIDCApp, error) { if projectID == "" || appID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-99i83", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-99i83", "Errors.IDMissing") } existingOIDC, err := c.getOIDCAppWriteModel(ctx, projectID, appID, resourceOwner) @@ -280,10 +280,10 @@ func (c *Commands) ChangeOIDCApplicationSecret(ctx context.Context, projectID, a return nil, err } if existingOIDC.State == domain.AppStateUnspecified || existingOIDC.State == domain.AppStateRemoved { - return nil, errors.ThrowNotFound(nil, "COMMAND-2g66f", "Errors.Project.App.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-2g66f", "Errors.Project.App.NotExisting") } if !existingOIDC.IsOIDC() { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-Ghrh3", "Errors.Project.App.IsNotOIDC") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Ghrh3", "Errors.Project.App.IsNotOIDC") } cryptoSecret, stringPW, err := domain.NewClientSecret(appSecretGenerator) if err != nil { @@ -315,13 +315,13 @@ func (c *Commands) VerifyOIDCClientSecret(ctx context.Context, projectID, appID, return err } if !app.State.Exists() { - return errors.ThrowPreconditionFailed(nil, "COMMAND-D6hba", "Errors.Project.App.NotExisting") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-D6hba", "Errors.Project.App.NotExisting") } if !app.IsOIDC() { - return errors.ThrowInvalidArgument(nil, "COMMAND-BHgn2", "Errors.Project.App.IsNotOIDC") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-BHgn2", "Errors.Project.App.IsNotOIDC") } if app.ClientSecret == nil { - return errors.ThrowPreconditionFailed(nil, "COMMAND-D6hba", "Errors.Project.App.OIDCConfigInvalid") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-D6hba", "Errors.Project.App.OIDCConfigInvalid") } projectAgg := ProjectAggregateFromWriteModel(&app.WriteModel) @@ -334,7 +334,7 @@ func (c *Commands) VerifyOIDCClientSecret(ctx context.Context, projectID, appID, } _, err = c.eventstore.Push(ctx, project_repo.NewOIDCConfigSecretCheckFailedEvent(ctx, projectAgg, app.AppID)) logging.OnError(err).Error("could not push event OIDCClientSecretCheckFailed") - return errors.ThrowInvalidArgument(nil, "COMMAND-Bz542", "Errors.Project.App.ClientSecretInvalid") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-Bz542", "Errors.Project.App.ClientSecretInvalid") } func (c *Commands) getOIDCAppWriteModel(ctx context.Context, projectID, appID, resourceOwner string) (*OIDCApplicationWriteModel, error) { diff --git a/internal/command/project_application_oidc_test.go b/internal/command/project_application_oidc_test.go index 85cdf5d5b..8efdd8c25 100644 --- a/internal/command/project_application_oidc_test.go +++ b/internal/command/project_application_oidc_test.go @@ -10,12 +10,12 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestAddOIDCApp(t *testing.T) { @@ -56,7 +56,7 @@ func TestAddOIDCApp(t *testing.T) { }, }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "PROJE-NnavI", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "PROJE-NnavI", "Errors.Invalid.Argument"), }, }, { @@ -78,7 +78,7 @@ func TestAddOIDCApp(t *testing.T) { }, }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "PROJE-Fef31", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "PROJE-Fef31", "Errors.Invalid.Argument"), }, }, { @@ -105,7 +105,7 @@ func TestAddOIDCApp(t *testing.T) { Filter(), }, want: Want{ - CreateErr: errors.ThrowNotFound(nil, "PROJE-6swVG", ""), + CreateErr: zerrors.ThrowNotFound(nil, "PROJE-6swVG", ""), }, }, { @@ -223,7 +223,7 @@ func TestCommandSide_AddOIDCApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -246,7 +246,7 @@ func TestCommandSide_AddOIDCApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -276,7 +276,7 @@ func TestCommandSide_AddOIDCApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -442,7 +442,7 @@ func TestCommandSide_ChangeOIDCApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -466,7 +466,7 @@ func TestCommandSide_ChangeOIDCApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -490,7 +490,7 @@ func TestCommandSide_ChangeOIDCApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -515,7 +515,7 @@ func TestCommandSide_ChangeOIDCApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -589,7 +589,7 @@ func TestCommandSide_ChangeOIDCApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -751,7 +751,7 @@ func TestCommandSide_ChangeOIDCApplicationSecret(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -768,7 +768,7 @@ func TestCommandSide_ChangeOIDCApplicationSecret(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -786,7 +786,7 @@ func TestCommandSide_ChangeOIDCApplicationSecret(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/project_application_saml.go b/internal/command/project_application_saml.go index e28e9c635..d6b3679a3 100644 --- a/internal/command/project_application_saml.go +++ b/internal/command/project_application_saml.go @@ -6,19 +6,19 @@ import ( "github.com/zitadel/saml/pkg/provider/xml" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddSAMLApplication(ctx context.Context, application *domain.SAMLApp, resourceOwner string) (_ *domain.SAMLApp, err error) { if application == nil || application.AggregateID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "PROJECT-35Fn0", "Errors.Project.App.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-35Fn0", "Errors.Project.App.Invalid") } _, err = c.getProjectByID(ctx, application.AggregateID, resourceOwner) if err != nil { - return nil, caos_errs.ThrowPreconditionFailed(err, "PROJECT-3p9ss", "Errors.Project.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "PROJECT-3p9ss", "Errors.Project.NotFound") } addedApplication := NewSAMLApplicationWriteModel(application.AggregateID, resourceOwner) @@ -43,24 +43,24 @@ func (c *Commands) AddSAMLApplication(ctx context.Context, application *domain.S func (c *Commands) addSAMLApplication(ctx context.Context, projectAgg *eventstore.Aggregate, samlApp *domain.SAMLApp) (events []eventstore.Command, err error) { if samlApp.AppName == "" || !samlApp.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "PROJECT-1n9df", "Errors.Project.App.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-1n9df", "Errors.Project.App.Invalid") } if samlApp.Metadata == nil && samlApp.MetadataURL == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "SAML-podix9", "Errors.Project.App.SAMLMetadataMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "SAML-podix9", "Errors.Project.App.SAMLMetadataMissing") } if samlApp.MetadataURL != "" { data, err := xml.ReadMetadataFromURL(c.httpClient, samlApp.MetadataURL) if err != nil { - return nil, caos_errs.ThrowInvalidArgument(err, "SAML-wmqlo1", "Errors.Project.App.SAMLMetadataMissing") + return nil, zerrors.ThrowInvalidArgument(err, "SAML-wmqlo1", "Errors.Project.App.SAMLMetadataMissing") } samlApp.Metadata = data } entity, err := xml.ParseMetadataXmlIntoStruct(samlApp.Metadata) if err != nil { - return nil, caos_errs.ThrowInvalidArgument(err, "SAML-bquso", "Errors.Project.App.SAMLMetadataFormat") + return nil, zerrors.ThrowInvalidArgument(err, "SAML-bquso", "Errors.Project.App.SAMLMetadataFormat") } samlApp.AppID, err = c.idGenerator.Next() @@ -82,7 +82,7 @@ func (c *Commands) addSAMLApplication(ctx context.Context, projectAgg *eventstor func (c *Commands) ChangeSAMLApplication(ctx context.Context, samlApp *domain.SAMLApp, resourceOwner string) (*domain.SAMLApp, error) { if !samlApp.IsValid() || samlApp.AppID == "" || samlApp.AggregateID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-5n9fs", "Errors.Project.App.SAMLConfigInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-5n9fs", "Errors.Project.App.SAMLConfigInvalid") } existingSAML, err := c.getSAMLAppWriteModel(ctx, samlApp.AggregateID, samlApp.AppID, resourceOwner) @@ -90,24 +90,24 @@ func (c *Commands) ChangeSAMLApplication(ctx context.Context, samlApp *domain.SA return nil, err } if existingSAML.State == domain.AppStateUnspecified || existingSAML.State == domain.AppStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-2n8uU", "Errors.Project.App.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-2n8uU", "Errors.Project.App.NotExisting") } if !existingSAML.IsSAML() { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-GBr35", "Errors.Project.App.IsNotSAML") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-GBr35", "Errors.Project.App.IsNotSAML") } projectAgg := ProjectAggregateFromWriteModel(&existingSAML.WriteModel) if samlApp.MetadataURL != "" { data, err := xml.ReadMetadataFromURL(c.httpClient, samlApp.MetadataURL) if err != nil { - return nil, caos_errs.ThrowInvalidArgument(err, "SAML-J3kg3", "Errors.Project.App.SAMLMetadataMissing") + return nil, zerrors.ThrowInvalidArgument(err, "SAML-J3kg3", "Errors.Project.App.SAMLMetadataMissing") } samlApp.Metadata = data } entity, err := xml.ParseMetadataXmlIntoStruct(samlApp.Metadata) if err != nil { - return nil, caos_errs.ThrowInvalidArgument(err, "SAML-3fk2b", "Errors.Project.App.SAMLMetadataFormat") + return nil, zerrors.ThrowInvalidArgument(err, "SAML-3fk2b", "Errors.Project.App.SAMLMetadataFormat") } changedEvent, hasChanged, err := existingSAML.NewChangedEvent( @@ -121,7 +121,7 @@ func (c *Commands) ChangeSAMLApplication(ctx context.Context, samlApp *domain.SA return nil, err } if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-1m88i", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-1m88i", "Errors.NoChangesFound") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) diff --git a/internal/command/project_application_saml_test.go b/internal/command/project_application_saml_test.go index a9b74a99e..978e1ed01 100644 --- a/internal/command/project_application_saml_test.go +++ b/internal/command/project_application_saml_test.go @@ -10,12 +10,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) var testMetadata = []byte(` @@ -81,7 +81,7 @@ func TestCommandSide_AddSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -104,7 +104,7 @@ func TestCommandSide_AddSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -134,7 +134,7 @@ func TestCommandSide_AddSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -167,7 +167,7 @@ func TestCommandSide_AddSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -318,7 +318,7 @@ func TestCommandSide_AddSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, } @@ -383,7 +383,7 @@ func TestCommandSide_ChangeSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -405,7 +405,7 @@ func TestCommandSide_ChangeSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -427,7 +427,7 @@ func TestCommandSide_ChangeSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -450,7 +450,7 @@ func TestCommandSide_ChangeSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -495,7 +495,7 @@ func TestCommandSide_ChangeSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -540,7 +540,7 @@ func TestCommandSide_ChangeSAMLApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/project_application_test.go b/internal/command/project_application_test.go index 95e808dd5..66671a5a5 100644 --- a/internal/command/project_application_test.go +++ b/internal/command/project_application_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ChangeApplication(t *testing.T) { @@ -49,7 +49,7 @@ func TestCommandSide_ChangeApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -68,7 +68,7 @@ func TestCommandSide_ChangeApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -88,7 +88,7 @@ func TestCommandSide_ChangeApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -109,7 +109,7 @@ func TestCommandSide_ChangeApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -136,7 +136,7 @@ func TestCommandSide_ChangeApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -230,7 +230,7 @@ func TestCommandSide_DeactivateApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -247,7 +247,7 @@ func TestCommandSide_DeactivateApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -265,7 +265,7 @@ func TestCommandSide_DeactivateApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -293,7 +293,7 @@ func TestCommandSide_DeactivateApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -382,7 +382,7 @@ func TestCommandSide_ReactivateApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -399,7 +399,7 @@ func TestCommandSide_ReactivateApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -417,7 +417,7 @@ func TestCommandSide_ReactivateApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -441,7 +441,7 @@ func TestCommandSide_ReactivateApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -534,7 +534,7 @@ func TestCommandSide_RemoveApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -551,7 +551,7 @@ func TestCommandSide_RemoveApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -569,7 +569,7 @@ func TestCommandSide_RemoveApplication(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/project_grant.go b/internal/command/project_grant.go index 21b9e61ce..c53e5252d 100644 --- a/internal/command/project_grant.go +++ b/internal/command/project_grant.go @@ -7,19 +7,19 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddProjectGrantWithID(ctx context.Context, grant *domain.ProjectGrant, grantID string, resourceOwner string) (_ *domain.ProjectGrant, err error) { existingMember, err := c.projectGrantWriteModelByID(ctx, grantID, grant.AggregateID, resourceOwner) - if err != nil && !caos_errs.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return nil, err } if existingMember != nil && existingMember.State != domain.ProjectGrantStateUnspecified { - return nil, caos_errs.ThrowInvalidArgument(nil, "PROJECT-2b8fs", "Errors.Project.Grant.AlreadyExisting") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-2b8fs", "Errors.Project.Grant.AlreadyExisting") } return c.addProjectGrantWithID(ctx, grant, grantID, resourceOwner) @@ -27,7 +27,7 @@ func (c *Commands) AddProjectGrantWithID(ctx context.Context, grant *domain.Proj func (c *Commands) AddProjectGrant(ctx context.Context, grant *domain.ProjectGrant, resourceOwner string) (_ *domain.ProjectGrant, err error) { if !grant.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "PROJECT-3b8fs", "Errors.Project.Grant.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-3b8fs", "Errors.Project.Grant.Invalid") } err = c.checkProjectGrantPreCondition(ctx, grant) if err != nil { @@ -62,7 +62,7 @@ func (c *Commands) addProjectGrantWithID(ctx context.Context, grant *domain.Proj func (c *Commands) ChangeProjectGrant(ctx context.Context, grant *domain.ProjectGrant, resourceOwner string, cascadeUserGrantIDs ...string) (_ *domain.ProjectGrant, err error) { if grant.GrantID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "PROJECT-1j83s", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-1j83s", "Errors.IDMissing") } existingGrant, err := c.projectGrantWriteModelByID(ctx, grant.GrantID, grant.AggregateID, resourceOwner) if err != nil { @@ -76,7 +76,7 @@ func (c *Commands) ChangeProjectGrant(ctx context.Context, grant *domain.Project projectAgg := ProjectAggregateFromWriteModel(&existingGrant.WriteModel) if reflect.DeepEqual(existingGrant.RoleKeys, grant.RoleKeys) { - return nil, caos_errs.ThrowPreconditionFailed(nil, "PROJECT-0o0pL", "Errors.NoChangesFoundc") + return nil, zerrors.ThrowPreconditionFailed(nil, "PROJECT-0o0pL", "Errors.NoChangesFoundc") } events := []eventstore.Command{ @@ -120,7 +120,7 @@ func (c *Commands) removeRoleFromProjectGrant(ctx context.Context, projectAgg *e return nil, nil, err } if existingProjectGrant.State == domain.ProjectGrantStateUnspecified || existingProjectGrant.State == domain.ProjectGrantStateRemoved { - return nil, nil, caos_errs.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.Project.Grant.NotFound") + return nil, nil, zerrors.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.Project.Grant.NotFound") } keyExists := false for i, key := range existingProjectGrant.RoleKeys { @@ -133,7 +133,7 @@ func (c *Commands) removeRoleFromProjectGrant(ctx context.Context, projectAgg *e } } if !keyExists { - return nil, nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-5m8g9", "Errors.Project.Grant.RoleKeyNotFound") + return nil, nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-5m8g9", "Errors.Project.Grant.RoleKeyNotFound") } changedProjectGrant := NewProjectGrantWriteModel(projectGrantID, projectID, existingProjectGrant.ResourceOwner) @@ -146,7 +146,7 @@ func (c *Commands) removeRoleFromProjectGrant(ctx context.Context, projectAgg *e func (c *Commands) DeactivateProjectGrant(ctx context.Context, projectID, grantID, resourceOwner string) (details *domain.ObjectDetails, err error) { if grantID == "" || projectID == "" { - return details, caos_errs.ThrowInvalidArgument(nil, "PROJECT-p0s4V", "Errors.IDMissing") + return details, zerrors.ThrowInvalidArgument(nil, "PROJECT-p0s4V", "Errors.IDMissing") } err = c.checkProjectExists(ctx, projectID, resourceOwner) if err != nil { @@ -157,7 +157,7 @@ func (c *Commands) DeactivateProjectGrant(ctx context.Context, projectID, grantI return details, err } if existingGrant.State != domain.ProjectGrantStateActive { - return details, caos_errs.ThrowPreconditionFailed(nil, "PROJECT-47fu8", "Errors.Project.Grant.NotActive") + return details, zerrors.ThrowPreconditionFailed(nil, "PROJECT-47fu8", "Errors.Project.Grant.NotActive") } projectAgg := ProjectAggregateFromWriteModel(&existingGrant.WriteModel) @@ -174,7 +174,7 @@ func (c *Commands) DeactivateProjectGrant(ctx context.Context, projectID, grantI func (c *Commands) ReactivateProjectGrant(ctx context.Context, projectID, grantID, resourceOwner string) (details *domain.ObjectDetails, err error) { if grantID == "" || projectID == "" { - return details, caos_errs.ThrowInvalidArgument(nil, "PROJECT-p0s4V", "Errors.IDMissing") + return details, zerrors.ThrowInvalidArgument(nil, "PROJECT-p0s4V", "Errors.IDMissing") } err = c.checkProjectExists(ctx, projectID, resourceOwner) if err != nil { @@ -185,7 +185,7 @@ func (c *Commands) ReactivateProjectGrant(ctx context.Context, projectID, grantI return details, err } if existingGrant.State != domain.ProjectGrantStateInactive { - return details, caos_errs.ThrowPreconditionFailed(nil, "PROJECT-47fu8", "Errors.Project.Grant.NotInactive") + return details, zerrors.ThrowPreconditionFailed(nil, "PROJECT-47fu8", "Errors.Project.Grant.NotInactive") } projectAgg := ProjectAggregateFromWriteModel(&existingGrant.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, project.NewGrantReactivatedEvent(ctx, projectAgg, grantID)) @@ -201,11 +201,11 @@ func (c *Commands) ReactivateProjectGrant(ctx context.Context, projectID, grantI func (c *Commands) RemoveProjectGrant(ctx context.Context, projectID, grantID, resourceOwner string, cascadeUserGrantIDs ...string) (details *domain.ObjectDetails, err error) { if grantID == "" || projectID == "" { - return details, caos_errs.ThrowInvalidArgument(nil, "PROJECT-1m9fJ", "Errors.IDMissing") + return details, zerrors.ThrowInvalidArgument(nil, "PROJECT-1m9fJ", "Errors.IDMissing") } err = c.checkProjectExists(ctx, projectID, resourceOwner) if err != nil { - return details, caos_errs.ThrowPreconditionFailed(err, "PROJECT-6mf9s", "Errors.Project.NotFound") + return details, zerrors.ThrowPreconditionFailed(err, "PROJECT-6mf9s", "Errors.Project.NotFound") } existingGrant, err := c.projectGrantWriteModelByID(ctx, grantID, projectID, resourceOwner) if err != nil { @@ -245,7 +245,7 @@ func (c *Commands) projectGrantWriteModelByID(ctx context.Context, grantID, proj } if writeModel.State == domain.ProjectGrantStateUnspecified || writeModel.State == domain.ProjectGrantStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "PROJECT-D8JxR", "Errors.Project.Grant.NotFound") + return nil, zerrors.ThrowNotFound(nil, "PROJECT-D8JxR", "Errors.Project.Grant.NotFound") } return writeModel, nil @@ -258,13 +258,13 @@ func (c *Commands) checkProjectGrantPreCondition(ctx context.Context, projectGra return err } if !preConditions.ProjectExists { - return caos_errs.ThrowPreconditionFailed(err, "COMMAND-m9gsd", "Errors.Project.NotFound") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-m9gsd", "Errors.Project.NotFound") } if !preConditions.GrantedOrgExists { - return caos_errs.ThrowPreconditionFailed(err, "COMMAND-3m9gg", "Errors.Org.NotFound") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-3m9gg", "Errors.Org.NotFound") } if projectGrant.HasInvalidRoles(preConditions.ExistingRoleKeys) { - return caos_errs.ThrowPreconditionFailed(err, "COMMAND-6m9gd", "Errors.Project.Role.NotFound") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-6m9gd", "Errors.Project.Role.NotFound") } return nil } diff --git a/internal/command/project_grant_member.go b/internal/command/project_grant_member.go index ad43f81f1..096851fb4 100644 --- a/internal/command/project_grant_member.go +++ b/internal/command/project_grant_member.go @@ -5,18 +5,18 @@ import ( "reflect" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddProjectGrantMember(ctx context.Context, member *domain.ProjectGrantMember) (*domain.ProjectGrantMember, error) { if !member.IsValid() { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-8fi7G", "Errors.Project.Grant.Member.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-8fi7G", "Errors.Project.Grant.Member.Invalid") } if len(domain.CheckForInvalidRoles(member.Roles, domain.ProjectGrantRolePrefix, c.zitadelRoles)) > 0 { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-m9gKK", "Errors.Project.Grant.Member.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-m9gKK", "Errors.Project.Grant.Member.Invalid") } err := c.checkUserExists(ctx, member.UserID, "") if err != nil { @@ -28,7 +28,7 @@ func (c *Commands) AddProjectGrantMember(ctx context.Context, member *domain.Pro return nil, err } if addedMember.State == domain.MemberStateActive { - return nil, errors.ThrowAlreadyExists(nil, "PROJECT-16dVN", "Errors.Project.Member.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "PROJECT-16dVN", "Errors.Project.Member.AlreadyExists") } projectAgg := ProjectAggregateFromWriteModel(&addedMember.WriteModel) pushedEvents, err := c.eventstore.Push( @@ -48,10 +48,10 @@ func (c *Commands) AddProjectGrantMember(ctx context.Context, member *domain.Pro // ChangeProjectGrantMember updates an existing member func (c *Commands) ChangeProjectGrantMember(ctx context.Context, member *domain.ProjectGrantMember) (*domain.ProjectGrantMember, error) { if !member.IsValid() { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-109fs", "Errors.Project.Member.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-109fs", "Errors.Project.Member.Invalid") } if len(domain.CheckForInvalidRoles(member.Roles, domain.ProjectGrantRolePrefix, c.zitadelRoles)) > 0 { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-m0sDf", "Errors.Project.Member.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-m0sDf", "Errors.Project.Member.Invalid") } existingMember, err := c.projectGrantMemberWriteModelByID(ctx, member.AggregateID, member.UserID, member.GrantID) @@ -60,7 +60,7 @@ func (c *Commands) ChangeProjectGrantMember(ctx context.Context, member *domain. } if reflect.DeepEqual(existingMember.Roles, member.Roles) { - return nil, errors.ThrowPreconditionFailed(nil, "PROJECT-2n8vx", "Errors.Project.Member.RolesNotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "PROJECT-2n8vx", "Errors.Project.Member.RolesNotChanged") } projectAgg := ProjectAggregateFromWriteModel(&existingMember.WriteModel) pushedEvents, err := c.eventstore.Push( @@ -79,7 +79,7 @@ func (c *Commands) ChangeProjectGrantMember(ctx context.Context, member *domain. func (c *Commands) RemoveProjectGrantMember(ctx context.Context, projectID, userID, grantID string) (*domain.ObjectDetails, error) { if projectID == "" || userID == "" || grantID == "" { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-66mHd", "Errors.Project.Member.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-66mHd", "Errors.Project.Member.Invalid") } m, err := c.projectGrantMemberWriteModelByID(ctx, projectID, userID, grantID) if err != nil { @@ -122,7 +122,7 @@ func (c *Commands) projectGrantMemberWriteModelByID(ctx context.Context, project } if writeModel.State == domain.MemberStateUnspecified || writeModel.State == domain.MemberStateRemoved { - return nil, errors.ThrowNotFound(nil, "PROJECT-37fug", "Errors.NotFound") + return nil, zerrors.ThrowNotFound(nil, "PROJECT-37fug", "Errors.NotFound") } return writeModel, nil diff --git a/internal/command/project_grant_member_test.go b/internal/command/project_grant_member_test.go index da00b8ccd..2c52eace2 100644 --- a/internal/command/project_grant_member_test.go +++ b/internal/command/project_grant_member_test.go @@ -5,14 +5,15 @@ import ( "testing" "github.com/stretchr/testify/assert" + "golang.org/x/text/language" + "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" - "golang.org/x/text/language" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddProjectGrantMember(t *testing.T) { @@ -50,7 +51,7 @@ func TestCommandSide_AddProjectGrantMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -72,7 +73,7 @@ func TestCommandSide_AddProjectGrantMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -100,7 +101,7 @@ func TestCommandSide_AddProjectGrantMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -152,7 +153,7 @@ func TestCommandSide_AddProjectGrantMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -177,7 +178,7 @@ func TestCommandSide_AddProjectGrantMember(t *testing.T) { ), ), expectFilter(), - expectPushFailed(caos_errs.ThrowAlreadyExists(nil, "ERROR", "internal"), + expectPushFailed(zerrors.ThrowAlreadyExists(nil, "ERROR", "internal"), project.NewProjectGrantMemberAddedEvent(context.Background(), &project.NewAggregate("project1", "").Aggregate, "user1", @@ -204,7 +205,7 @@ func TestCommandSide_AddProjectGrantMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -322,7 +323,7 @@ func TestCommandSide_ChangeProjectGrantMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -344,7 +345,7 @@ func TestCommandSide_ChangeProjectGrantMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -372,7 +373,7 @@ func TestCommandSide_ChangeProjectGrantMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -409,7 +410,7 @@ func TestCommandSide_ChangeProjectGrantMember(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -523,7 +524,7 @@ func TestCommandSide_RemoveProjectGrantMember(t *testing.T) { grantID: "projectgrant1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -540,7 +541,7 @@ func TestCommandSide_RemoveProjectGrantMember(t *testing.T) { grantID: "projectgrant1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -557,7 +558,7 @@ func TestCommandSide_RemoveProjectGrantMember(t *testing.T) { grantID: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -575,7 +576,7 @@ func TestCommandSide_RemoveProjectGrantMember(t *testing.T) { grantID: "projectgrant1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/project_grant_test.go b/internal/command/project_grant_test.go index af74c8db0..745072318 100644 --- a/internal/command/project_grant_test.go +++ b/internal/command/project_grant_test.go @@ -7,7 +7,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" @@ -15,6 +14,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddProjectGrant(t *testing.T) { @@ -54,7 +54,7 @@ func TestCommandSide_AddProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -76,7 +76,7 @@ func TestCommandSide_AddProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -106,7 +106,7 @@ func TestCommandSide_AddProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -143,7 +143,7 @@ func TestCommandSide_AddProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -267,7 +267,7 @@ func TestCommandSide_ChangeProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -291,7 +291,7 @@ func TestCommandSide_ChangeProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -322,7 +322,7 @@ func TestCommandSide_ChangeProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -361,7 +361,7 @@ func TestCommandSide_ChangeProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -407,7 +407,7 @@ func TestCommandSide_ChangeProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -461,7 +461,7 @@ func TestCommandSide_ChangeProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -768,7 +768,7 @@ func TestCommandSide_DeactivateProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -784,7 +784,7 @@ func TestCommandSide_DeactivateProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -802,7 +802,7 @@ func TestCommandSide_DeactivateProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -829,7 +829,7 @@ func TestCommandSide_DeactivateProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -867,7 +867,7 @@ func TestCommandSide_DeactivateProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -965,7 +965,7 @@ func TestCommandSide_ReactivateProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -981,7 +981,7 @@ func TestCommandSide_ReactivateProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -999,7 +999,7 @@ func TestCommandSide_ReactivateProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1026,7 +1026,7 @@ func TestCommandSide_ReactivateProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1060,7 +1060,7 @@ func TestCommandSide_ReactivateProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1163,7 +1163,7 @@ func TestCommandSide_RemoveProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1179,7 +1179,7 @@ func TestCommandSide_RemoveProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1197,7 +1197,7 @@ func TestCommandSide_RemoveProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1224,7 +1224,7 @@ func TestCommandSide_RemoveProjectGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/project_member.go b/internal/command/project_member.go index ed9f35146..e47a4c85e 100644 --- a/internal/command/project_member.go +++ b/internal/command/project_member.go @@ -5,10 +5,10 @@ import ( "reflect" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddProjectMember(ctx context.Context, member *domain.Member, resourceOwner string) (*domain.Member, error) { @@ -33,10 +33,10 @@ func (c *Commands) AddProjectMember(ctx context.Context, member *domain.Member, func (c *Commands) addProjectMember(ctx context.Context, projectAgg *eventstore.Aggregate, addedMember *ProjectMemberWriteModel, member *domain.Member) (eventstore.Command, error) { if !member.IsValid() { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-W8m4l", "Errors.Project.Member.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-W8m4l", "Errors.Project.Member.Invalid") } if len(domain.CheckForInvalidRoles(member.Roles, domain.ProjectRolePrefix, c.zitadelRoles)) > 0 { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-3m9ds", "Errors.Project.Member.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-3m9ds", "Errors.Project.Member.Invalid") } err := c.checkUserExists(ctx, addedMember.UserID, "") @@ -48,7 +48,7 @@ func (c *Commands) addProjectMember(ctx context.Context, projectAgg *eventstore. return nil, err } if addedMember.State == domain.MemberStateActive { - return nil, errors.ThrowAlreadyExists(nil, "PROJECT-PtXi1", "Errors.Project.Member.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "PROJECT-PtXi1", "Errors.Project.Member.AlreadyExists") } return project.NewProjectMemberAddedEvent(ctx, projectAgg, member.UserID, member.Roles...), nil @@ -57,10 +57,10 @@ func (c *Commands) addProjectMember(ctx context.Context, projectAgg *eventstore. // ChangeProjectMember updates an existing member func (c *Commands) ChangeProjectMember(ctx context.Context, member *domain.Member, resourceOwner string) (*domain.Member, error) { if !member.IsValid() { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-LiaZi", "Errors.Project.Member.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-LiaZi", "Errors.Project.Member.Invalid") } if len(domain.CheckForInvalidRoles(member.Roles, domain.ProjectRolePrefix, c.zitadelRoles)) > 0 { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-3m9d", "Errors.Project.Member.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-3m9d", "Errors.Project.Member.Invalid") } existingMember, err := c.projectMemberWriteModelByID(ctx, member.AggregateID, member.UserID, resourceOwner) @@ -69,7 +69,7 @@ func (c *Commands) ChangeProjectMember(ctx context.Context, member *domain.Membe } if reflect.DeepEqual(existingMember.Roles, member.Roles) { - return nil, errors.ThrowPreconditionFailed(nil, "PROJECT-LiaZi", "Errors.Project.Member.RolesNotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "PROJECT-LiaZi", "Errors.Project.Member.RolesNotChanged") } projectAgg := ProjectAggregateFromWriteModel(&existingMember.MemberWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, project.NewProjectMemberChangedEvent(ctx, projectAgg, member.UserID, member.Roles...)) @@ -87,13 +87,13 @@ func (c *Commands) ChangeProjectMember(ctx context.Context, member *domain.Membe func (c *Commands) RemoveProjectMember(ctx context.Context, projectID, userID, resourceOwner string) (*domain.ObjectDetails, error) { if projectID == "" || userID == "" { - return nil, errors.ThrowInvalidArgument(nil, "PROJECT-66mHd", "Errors.Project.Member.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "PROJECT-66mHd", "Errors.Project.Member.Invalid") } m, err := c.projectMemberWriteModelByID(ctx, projectID, userID, resourceOwner) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return nil, err } - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { // empty response because we have no data that match the request return &domain.ObjectDetails{}, nil } @@ -133,7 +133,7 @@ func (c *Commands) projectMemberWriteModelByID(ctx context.Context, projectID, u } if writeModel.State == domain.MemberStateUnspecified || writeModel.State == domain.MemberStateRemoved { - return nil, errors.ThrowNotFound(nil, "PROJECT-D8JxR", "Errors.NotFound") + return nil, zerrors.ThrowNotFound(nil, "PROJECT-D8JxR", "Errors.NotFound") } return writeModel, nil diff --git a/internal/command/project_member_test.go b/internal/command/project_member_test.go index fd6a4105e..358ee4382 100644 --- a/internal/command/project_member_test.go +++ b/internal/command/project_member_test.go @@ -5,14 +5,15 @@ import ( "testing" "github.com/stretchr/testify/assert" + "golang.org/x/text/language" + "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" - "golang.org/x/text/language" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddProjectMember(t *testing.T) { @@ -52,7 +53,7 @@ func TestCommandSide_AddProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -74,7 +75,7 @@ func TestCommandSide_AddProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -102,7 +103,7 @@ func TestCommandSide_AddProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -153,7 +154,7 @@ func TestCommandSide_AddProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -178,7 +179,7 @@ func TestCommandSide_AddProjectMember(t *testing.T) { ), ), expectFilter(), - expectPushFailed(caos_errs.ThrowAlreadyExists(nil, "ERROR", "internal"), + expectPushFailed(zerrors.ThrowAlreadyExists(nil, "ERROR", "internal"), project.NewProjectMemberAddedEvent(context.Background(), &project.NewAggregate("project1", "org1").Aggregate, "user1", @@ -204,7 +205,7 @@ func TestCommandSide_AddProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -323,7 +324,7 @@ func TestCommandSide_ChangeProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -345,7 +346,7 @@ func TestCommandSide_ChangeProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -373,7 +374,7 @@ func TestCommandSide_ChangeProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -409,7 +410,7 @@ func TestCommandSide_ChangeProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -520,7 +521,7 @@ func TestCommandSide_RemoveProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -537,7 +538,7 @@ func TestCommandSide_RemoveProjectMember(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/project_role.go b/internal/command/project_role.go index c52f170d8..065d784ef 100644 --- a/internal/command/project_role.go +++ b/internal/command/project_role.go @@ -4,10 +4,11 @@ import ( "context" "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddProjectRole(ctx context.Context, projectRole *domain.ProjectRole, resourceOwner string) (_ *domain.ProjectRole, err error) { @@ -62,7 +63,7 @@ func (c *Commands) addProjectRoles(ctx context.Context, projectAgg *eventstore.A for _, projectRole := range projectRoles { projectRole.AggregateID = projectAgg.ID if !projectRole.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-4m9vS", "Errors.Project.Role.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-4m9vS", "Errors.Project.Role.Invalid") } events = append(events, project.NewRoleAddedEvent( ctx, @@ -78,7 +79,7 @@ func (c *Commands) addProjectRoles(ctx context.Context, projectAgg *eventstore.A func (c *Commands) ChangeProjectRole(ctx context.Context, projectRole *domain.ProjectRole, resourceOwner string) (_ *domain.ProjectRole, err error) { if !projectRole.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-2ilfW", "Errors.Project.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-2ilfW", "Errors.Project.Invalid") } err = c.checkProjectExists(ctx, projectRole.AggregateID, resourceOwner) if err != nil { @@ -90,7 +91,7 @@ func (c *Commands) ChangeProjectRole(ctx context.Context, projectRole *domain.Pr return nil, err } if existingRole.State == domain.ProjectRoleStateUnspecified || existingRole.State == domain.ProjectRoleStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-vv8M9", "Errors.Project.Role.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-vv8M9", "Errors.Project.Role.NotExisting") } projectAgg := ProjectAggregateFromWriteModel(&existingRole.WriteModel) @@ -100,7 +101,7 @@ func (c *Commands) ChangeProjectRole(ctx context.Context, projectRole *domain.Pr return nil, err } if !changed { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-5M0cs", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-5M0cs", "Errors.NoChangesFound") } pushedEvents, err := c.eventstore.Push(ctx, changeEvent) @@ -116,14 +117,14 @@ func (c *Commands) ChangeProjectRole(ctx context.Context, projectRole *domain.Pr func (c *Commands) RemoveProjectRole(ctx context.Context, projectID, key, resourceOwner string, cascadingProjectGrantIds []string, cascadeUserGrantIDs ...string) (details *domain.ObjectDetails, err error) { if projectID == "" || key == "" { - return details, caos_errs.ThrowInvalidArgument(nil, "COMMAND-fl9eF", "Errors.Project.Role.Invalid") + return details, zerrors.ThrowInvalidArgument(nil, "COMMAND-fl9eF", "Errors.Project.Role.Invalid") } existingRole, err := c.getProjectRoleWriteModelByID(ctx, key, projectID, resourceOwner) if err != nil { return details, err } if existingRole.State == domain.ProjectRoleStateUnspecified || existingRole.State == domain.ProjectRoleStateRemoved { - return details, caos_errs.ThrowNotFound(nil, "COMMAND-m9vMf", "Errors.Project.Role.NotExisting") + return details, zerrors.ThrowNotFound(nil, "COMMAND-m9vMf", "Errors.Project.Role.NotExisting") } projectAgg := ProjectAggregateFromWriteModel(&existingRole.WriteModel) events := []eventstore.Command{ diff --git a/internal/command/project_role_test.go b/internal/command/project_role_test.go index 2d40cdc91..bd8c85aef 100644 --- a/internal/command/project_role_test.go +++ b/internal/command/project_role_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddProjectRole(t *testing.T) { @@ -67,7 +67,7 @@ func TestCommandSide_AddProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -96,7 +96,7 @@ func TestCommandSide_AddProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -113,7 +113,7 @@ func TestCommandSide_AddProjectRole(t *testing.T) { ), ), ), - expectPushFailed(caos_errs.ThrowAlreadyExists(nil, "id", "internal"), + expectPushFailed(zerrors.ThrowAlreadyExists(nil, "id", "internal"), project.NewRoleAddedEvent( context.Background(), &project.NewAggregate("project1", "org1").Aggregate, @@ -137,7 +137,7 @@ func TestCommandSide_AddProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -265,7 +265,7 @@ func TestCommandSide_BulkAddProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -298,7 +298,7 @@ func TestCommandSide_BulkAddProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -315,7 +315,7 @@ func TestCommandSide_BulkAddProjectRole(t *testing.T) { ), ), ), - expectPushFailed(caos_errs.ThrowAlreadyExists(nil, "id", "internal"), + expectPushFailed(zerrors.ThrowAlreadyExists(nil, "id", "internal"), project.NewRoleAddedEvent( context.Background(), &project.NewAggregate("project1", "org1").Aggregate, @@ -351,7 +351,7 @@ func TestCommandSide_BulkAddProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -465,7 +465,7 @@ func TestCommandSide_ChangeProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -502,7 +502,7 @@ func TestCommandSide_ChangeProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -550,7 +550,7 @@ func TestCommandSide_ChangeProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -592,7 +592,7 @@ func TestCommandSide_ChangeProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -703,7 +703,7 @@ func TestCommandSide_RemoveProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -720,7 +720,7 @@ func TestCommandSide_RemoveProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -738,7 +738,7 @@ func TestCommandSide_RemoveProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -771,7 +771,7 @@ func TestCommandSide_RemoveProjectRole(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/project_test.go b/internal/command/project_test.go index 715b82f08..ca8d2b2dd 100644 --- a/internal/command/project_test.go +++ b/internal/command/project_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddProject(t *testing.T) { @@ -49,7 +49,7 @@ func TestCommandSide_AddProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -57,7 +57,7 @@ func TestCommandSide_AddProject(t *testing.T) { fields: fields{ eventstore: eventstoreExpect( t, - expectPushFailed(errors.ThrowAlreadyExists(nil, "ERROR", "internl"), + expectPushFailed(zerrors.ThrowAlreadyExists(nil, "ERROR", "internl"), project.NewProjectAddedEvent( context.Background(), &project.NewAggregate("project1", "org1").Aggregate, @@ -87,7 +87,7 @@ func TestCommandSide_AddProject(t *testing.T) { ownerID: "user1", }, res: res{ - err: errors.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -195,7 +195,7 @@ func TestCommandSide_ChangeProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -213,7 +213,7 @@ func TestCommandSide_ChangeProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -235,7 +235,7 @@ func TestCommandSide_ChangeProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -270,7 +270,7 @@ func TestCommandSide_ChangeProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -303,7 +303,7 @@ func TestCommandSide_ChangeProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -468,7 +468,7 @@ func TestCommandSide_DeactivateProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -484,7 +484,7 @@ func TestCommandSide_DeactivateProject(t *testing.T) { resourceOwner: "", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -501,7 +501,7 @@ func TestCommandSide_DeactivateProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -531,7 +531,7 @@ func TestCommandSide_DeactivateProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -559,7 +559,7 @@ func TestCommandSide_DeactivateProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -644,7 +644,7 @@ func TestCommandSide_ReactivateProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -660,7 +660,7 @@ func TestCommandSide_ReactivateProject(t *testing.T) { resourceOwner: "", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -677,7 +677,7 @@ func TestCommandSide_ReactivateProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -707,7 +707,7 @@ func TestCommandSide_ReactivateProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -731,7 +731,7 @@ func TestCommandSide_ReactivateProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -820,7 +820,7 @@ func TestCommandSide_RemoveProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -836,7 +836,7 @@ func TestCommandSide_RemoveProject(t *testing.T) { resourceOwner: "", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -853,7 +853,7 @@ func TestCommandSide_RemoveProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -883,7 +883,7 @@ func TestCommandSide_RemoveProject(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1115,7 +1115,7 @@ func TestAddProject(t *testing.T) { privateLabelingSetting: domain.PrivateLabelingSettingAllowLoginUserResourceOwnerPolicy, }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "PROJE-C01yo", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "PROJE-C01yo", "Errors.Invalid.Argument"), }, }, { @@ -1127,7 +1127,7 @@ func TestAddProject(t *testing.T) { privateLabelingSetting: -1, }, want: Want{ - ValidationErr: errors.ThrowInvalidArgument(nil, "PROJE-AO52V", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "PROJE-AO52V", "Errors.Invalid.Argument"), }, }, { @@ -1139,7 +1139,7 @@ func TestAddProject(t *testing.T) { privateLabelingSetting: domain.PrivateLabelingSettingAllowLoginUserResourceOwnerPolicy, }, want: Want{ - ValidationErr: errors.ThrowPreconditionFailed(nil, "PROJE-hzxwo", "Errors.Invalid.Argument"), + ValidationErr: zerrors.ThrowPreconditionFailed(nil, "PROJE-hzxwo", "Errors.Invalid.Argument"), }, }, { diff --git a/internal/command/quota.go b/internal/command/quota.go index d3b1ab7e8..511239482 100644 --- a/internal/command/quota.go +++ b/internal/command/quota.go @@ -8,9 +8,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/quota" + "github.com/zitadel/zitadel/internal/zerrors" ) type QuotaUnit string @@ -43,7 +43,7 @@ func (c *Commands) AddQuota( return nil, err } if wm.AggregateID != "" { - return nil, errors.ThrowAlreadyExists(nil, "COMMAND-WDfFf", "Errors.Quota.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "COMMAND-WDfFf", "Errors.Quota.AlreadyExists") } aggregateId, err := c.idGenerator.Next() if err != nil { @@ -106,7 +106,7 @@ func (c *Commands) RemoveQuota(ctx context.Context, unit QuotaUnit) (*domain.Obj return nil, err } if wm.AggregateID == "" { - return nil, errors.ThrowNotFound(nil, "COMMAND-WDfFf", "Errors.Quota.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-WDfFf", "Errors.Quota.NotFound") } aggregate := quota.NewAggregate(wm.AggregateID, instanceId) events := []eventstore.Command{quota.NewRemovedEvent(ctx, &aggregate.Aggregate, unit.Enum())} @@ -147,13 +147,13 @@ type QuotaNotifications []*QuotaNotification func (q *QuotaNotification) validate() error { u, err := url.Parse(q.CallURL) if err != nil { - return errors.ThrowInvalidArgument(err, "QUOTA-bZ0Fj", "Errors.Quota.Invalid.CallURL") + return zerrors.ThrowInvalidArgument(err, "QUOTA-bZ0Fj", "Errors.Quota.Invalid.CallURL") } if !u.IsAbs() || u.Host == "" { - return errors.ThrowInvalidArgument(nil, "QUOTA-HAYmN", "Errors.Quota.Invalid.CallURL") + return zerrors.ThrowInvalidArgument(nil, "QUOTA-HAYmN", "Errors.Quota.Invalid.CallURL") } if q.Percent < 1 { - return errors.ThrowInvalidArgument(nil, "QUOTA-pBfjq", "Errors.Quota.Invalid.Percent") + return zerrors.ThrowInvalidArgument(nil, "QUOTA-pBfjq", "Errors.Quota.Invalid.Percent") } return nil } @@ -165,10 +165,10 @@ func (q *SetQuota) validate() error { } } if q.Unit.Enum() == quota.Unimplemented { - return errors.ThrowInvalidArgument(nil, "QUOTA-OTeSh", "Errors.Quota.Invalid.Unimplemented") + return zerrors.ThrowInvalidArgument(nil, "QUOTA-OTeSh", "Errors.Quota.Invalid.Unimplemented") } if q.ResetInterval < time.Minute { - return errors.ThrowInvalidArgument(nil, "QUOTA-R5otd", "Errors.Quota.Invalid.ResetInterval") + return zerrors.ThrowInvalidArgument(nil, "QUOTA-R5otd", "Errors.Quota.Invalid.ResetInterval") } return nil } diff --git a/internal/command/quota_model.go b/internal/command/quota_model.go index 8c2efa7df..7b4cbac9b 100644 --- a/internal/command/quota_model.go +++ b/internal/command/quota_model.go @@ -6,10 +6,10 @@ import ( "slices" "time" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/repository/quota" + "github.com/zitadel/zitadel/internal/zerrors" ) type quotaWriteModel struct { @@ -168,12 +168,12 @@ func (q QuotaNotifications) newSetEventNotifications(idGenerator id.Generator) ( func sortSetEventNotifications(notifications []*quota.SetEventNotification) (err error) { slices.SortFunc(notifications, func(i, j *quota.SetEventNotification) int { if i == nil || j == nil { - err = zitadel_errors.ThrowInternal(errors.New("sorting slices of *quota.SetEventNotification with nil pointers is not supported"), "QUOTA-8YXPk", "Errors.Internal") + err = zerrors.ThrowInternal(errors.New("sorting slices of *quota.SetEventNotification with nil pointers is not supported"), "QUOTA-8YXPk", "Errors.Internal") return 0 } if i.Percent == j.Percent && i.CallURL == j.CallURL && i.Repeat == j.Repeat { // TODO: translate - err = zitadel_errors.ThrowInternal(fmt.Errorf("%+v", i), "QUOTA-Pty2n", "Errors.Quota.Notifications.Duplicate") + err = zerrors.ThrowInternal(fmt.Errorf("%+v", i), "QUOTA-Pty2n", "Errors.Quota.Notifications.Duplicate") return 0 } if i.Percent < j.Percent || diff --git a/internal/command/quota_model_test.go b/internal/command/quota_model_test.go index 3ba984720..37815056e 100644 --- a/internal/command/quota_model_test.go +++ b/internal/command/quota_model_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/quota" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestQuotaWriteModel_NewChanges(t *testing.T) { @@ -277,7 +277,7 @@ func TestQuotaWriteModel_NewChanges(t *testing.T) { idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "notification1", "notification2"), }, wantErr: func(t assert.TestingT, err error, i ...interface{}) bool { - return zitadel_errors.IsErrorInvalidArgument(err) + return zerrors.IsErrorInvalidArgument(err) }, }, { name: "deduplicate existing notifications", diff --git a/internal/command/quota_test.go b/internal/command/quota_test.go index 5b28f3e61..14d5d5079 100644 --- a/internal/command/quota_test.go +++ b/internal/command/quota_test.go @@ -10,11 +10,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/quota" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestQuota_AddQuota(t *testing.T) { @@ -71,7 +71,7 @@ func TestQuota_AddQuota(t *testing.T) { }, }, res: res{ - err: caos_errors.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -96,7 +96,7 @@ func TestQuota_AddQuota(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "QUOTA-OTeSh", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "QUOTA-OTeSh", "")) }, }, }, @@ -362,7 +362,7 @@ func TestQuota_SetQuota(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "QUOTA-OTeSh", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "QUOTA-OTeSh", "")) }, }, }, @@ -579,7 +579,7 @@ func TestQuota_RemoveQuota(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowNotFound(nil, "COMMAND-WDfFf", "")) + return errors.Is(err, zerrors.ThrowNotFound(nil, "COMMAND-WDfFf", "")) }, }, }, @@ -620,7 +620,7 @@ func TestQuota_RemoveQuota(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowNotFound(nil, "COMMAND-WDfFf", "")) + return errors.Is(err, zerrors.ThrowNotFound(nil, "COMMAND-WDfFf", "")) }, }, }, @@ -707,7 +707,7 @@ func TestQuota_QuotaNotification_validate(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "QUOTA-bZ0Fj", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "QUOTA-bZ0Fj", "")) }, }, }, @@ -722,7 +722,7 @@ func TestQuota_QuotaNotification_validate(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "QUOTA-HAYmN", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "QUOTA-HAYmN", "")) }, }, }, @@ -737,7 +737,7 @@ func TestQuota_QuotaNotification_validate(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "QUOTA-HAYmN", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "QUOTA-HAYmN", "")) }, }, }, @@ -752,7 +752,7 @@ func TestQuota_QuotaNotification_validate(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "QUOTA-pBfjq", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "QUOTA-pBfjq", "")) }, }, }, @@ -815,7 +815,7 @@ func TestQuota_SetQuota_validate(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "QUOTA-bZ0Fj", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "QUOTA-bZ0Fj", "")) }, }, }, @@ -833,7 +833,7 @@ func TestQuota_SetQuota_validate(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "QUOTA-OTeSh", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "QUOTA-OTeSh", "")) }, }, }, @@ -851,7 +851,7 @@ func TestQuota_SetQuota_validate(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errors.ThrowInvalidArgument(nil, "QUOTA-R5otd", "")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "QUOTA-R5otd", "")) }, }, }, diff --git a/internal/command/restrictions.go b/internal/command/restrictions.go index b386ce828..e47a0e8c0 100644 --- a/internal/command/restrictions.go +++ b/internal/command/restrictions.go @@ -8,10 +8,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/repository/restrictions" + "github.com/zitadel/zitadel/internal/zerrors" ) type SetRestrictions struct { @@ -21,7 +21,7 @@ type SetRestrictions struct { func (s *SetRestrictions) Validate(defaultLanguage language.Tag) error { if s == nil || (s.DisallowPublicOrgRegistration == nil && s.AllowedLanguages == nil) { - return zitadel_errors.ThrowInvalidArgument(nil, "COMMAND-oASwj", "Errors.Restrictions.NoneSpecified") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-oASwj", "Errors.Restrictions.NoneSpecified") } if s.AllowedLanguages != nil { if err := domain.LanguagesHaveDuplicates(s.AllowedLanguages); err != nil { @@ -31,7 +31,7 @@ func (s *SetRestrictions) Validate(defaultLanguage language.Tag) error { return err } if err := domain.LanguageIsAllowed(false, s.AllowedLanguages, defaultLanguage); err != nil { - return zitadel_errors.ThrowPreconditionFailedf(err, "COMMAND-L0m2u", "Errors.Restrictions.DefaultLanguageMustBeAllowed") + return zerrors.ThrowPreconditionFailedf(err, "COMMAND-L0m2u", "Errors.Restrictions.DefaultLanguageMustBeAllowed") } } return nil diff --git a/internal/command/restrictions_test.go b/internal/command/restrictions_test.go index 6f4bf4ee9..4dcbc479e 100644 --- a/internal/command/restrictions_test.go +++ b/internal/command/restrictions_test.go @@ -10,11 +10,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - zitadel_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/restrictions" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestSetRestrictions(t *testing.T) { @@ -162,7 +162,7 @@ func TestSetRestrictions(t *testing.T) { setRestrictions: &SetRestrictions{}, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -189,7 +189,7 @@ func TestSetRestrictions(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -216,7 +216,7 @@ func TestSetRestrictions(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, } diff --git a/internal/command/session.go b/internal/command/session.go index fefb24ddd..f359860ba 100644 --- a/internal/command/session.go +++ b/internal/command/session.go @@ -11,12 +11,12 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/repository/session" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type SessionCommand func(ctx context.Context, cmd *SessionCommands) error @@ -59,7 +59,7 @@ func (c *Commands) NewSessionCommands(cmds []SessionCommand, session *SessionWri func CheckUser(id string, resourceOwner string) SessionCommand { return func(ctx context.Context, cmd *SessionCommands) error { if cmd.sessionWriteModel.UserID != "" && id != "" && cmd.sessionWriteModel.UserID != id { - return caos_errs.ThrowInvalidArgument(nil, "", "user change not possible") + return zerrors.ThrowInvalidArgument(nil, "", "user change not possible") } return cmd.UserChecked(ctx, id, resourceOwner, cmd.now()) } @@ -69,7 +69,7 @@ func CheckUser(id string, resourceOwner string) SessionCommand { func CheckPassword(password string) SessionCommand { return func(ctx context.Context, cmd *SessionCommands) error { if cmd.sessionWriteModel.UserID == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sfw3f", "Errors.User.UserIDMissing") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sfw3f", "Errors.User.UserIDMissing") } cmd.passwordWriteModel = NewHumanPasswordWriteModel(cmd.sessionWriteModel.UserID, "") err := cmd.eventstore.FilterToQueryReducer(ctx, cmd.passwordWriteModel) @@ -77,18 +77,18 @@ func CheckPassword(password string) SessionCommand { return err } if cmd.passwordWriteModel.UserState == domain.UserStateUnspecified || cmd.passwordWriteModel.UserState == domain.UserStateDeleted { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Df4b3", "Errors.User.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Df4b3", "Errors.User.NotFound") } if cmd.passwordWriteModel.EncodedHash == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-WEf3t", "Errors.User.Password.NotSet") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-WEf3t", "Errors.User.Password.NotSet") } ctx, spanPasswordComparison := tracing.NewNamedSpan(ctx, "passwap.Verify") updated, err := cmd.hasher.Verify(cmd.passwordWriteModel.EncodedHash, password) spanPasswordComparison.EndWithError(err) if err != nil { //TODO: maybe we want to reset the session in the future https://github.com/zitadel/zitadel/issues/5807 - return caos_errs.ThrowInvalidArgument(err, "COMMAND-SAF3g", "Errors.User.Password.Invalid") + return zerrors.ThrowInvalidArgument(err, "COMMAND-SAF3g", "Errors.User.Password.Invalid") } if updated != "" { cmd.eventCommands = append(cmd.eventCommands, user.NewHumanPasswordHashUpdatedEvent(ctx, UserAggregateFromWriteModel(&cmd.passwordWriteModel.WriteModel), updated)) @@ -103,7 +103,7 @@ func CheckPassword(password string) SessionCommand { func CheckIntent(intentID, token string) SessionCommand { return func(ctx context.Context, cmd *SessionCommands) error { if cmd.sessionWriteModel.UserID == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sfw3r", "Errors.User.UserIDMissing") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sfw3r", "Errors.User.UserIDMissing") } if err := crypto.CheckToken(cmd.intentAlg, token, intentID); err != nil { return err @@ -114,11 +114,11 @@ func CheckIntent(intentID, token string) SessionCommand { return err } if cmd.intentWriteModel.State != domain.IDPIntentStateSucceeded { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Df4bw", "Errors.Intent.NotSucceeded") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Df4bw", "Errors.Intent.NotSucceeded") } if cmd.intentWriteModel.UserID != "" { if cmd.intentWriteModel.UserID != cmd.sessionWriteModel.UserID { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-O8xk3w", "Errors.Intent.OtherUser") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-O8xk3w", "Errors.Intent.OtherUser") } } else { linkWriteModel := NewUserIDPLinkWriteModel(cmd.sessionWriteModel.UserID, cmd.intentWriteModel.IDPID, cmd.intentWriteModel.IDPUserID, cmd.intentWriteModel.ResourceOwner) @@ -127,7 +127,7 @@ func CheckIntent(intentID, token string) SessionCommand { return err } if linkWriteModel.State != domain.UserIDPLinkStateActive { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-O8xk3w", "Errors.Intent.OtherUser") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-O8xk3w", "Errors.Intent.OtherUser") } } cmd.IntentChecked(ctx, cmd.now()) @@ -138,7 +138,7 @@ func CheckIntent(intentID, token string) SessionCommand { func CheckTOTP(code string) SessionCommand { return func(ctx context.Context, cmd *SessionCommands) (err error) { if cmd.sessionWriteModel.UserID == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Neil7", "Errors.User.UserIDMissing") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Neil7", "Errors.User.UserIDMissing") } cmd.totpWriteModel = NewHumanTOTPWriteModel(cmd.sessionWriteModel.UserID, "") err = cmd.eventstore.FilterToQueryReducer(ctx, cmd.totpWriteModel) @@ -146,7 +146,7 @@ func CheckTOTP(code string) SessionCommand { return err } if cmd.totpWriteModel.State != domain.MFAStateReady { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-eej1U", "Errors.User.MFA.OTP.NotReady") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-eej1U", "Errors.User.MFA.OTP.NotReady") } err = domain.VerifyTOTP(code, cmd.totpWriteModel.Secret, cmd.totpAlg) if err != nil { @@ -258,7 +258,7 @@ func (s *SessionCommands) ChangeMetadata(ctx context.Context, metadata map[strin func (s *SessionCommands) SetLifetime(ctx context.Context, lifetime time.Duration) error { if lifetime < 0 { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-asEG4", "Errors.Session.PositiveLifetime") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-asEG4", "Errors.Session.PositiveLifetime") } if lifetime == 0 { return nil @@ -269,7 +269,7 @@ func (s *SessionCommands) SetLifetime(ctx context.Context, lifetime time.Duratio func (s *SessionCommands) gethumanWriteModel(ctx context.Context) (*HumanWriteModel, error) { if s.sessionWriteModel.UserID == "" { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-eeR2e", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-eeR2e", "Errors.User.UserIDMissing") } humanWriteModel := NewHumanWriteModel(s.sessionWriteModel.UserID, s.sessionWriteModel.UserResourceOwner) err := s.eventstore.FilterToQueryReducer(ctx, humanWriteModel) @@ -277,7 +277,7 @@ func (s *SessionCommands) gethumanWriteModel(ctx context.Context) (*HumanWriteMo return nil, err } if humanWriteModel.UserState != domain.UserStateActive { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Df4b3", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Df4b3", "Errors.User.NotFound") } return humanWriteModel, nil } diff --git a/internal/command/session_model.go b/internal/command/session_model.go index 492990457..7059c4ab9 100644 --- a/internal/command/session_model.go +++ b/internal/command/session_model.go @@ -5,9 +5,9 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/session" + "github.com/zitadel/zitadel/internal/zerrors" ) type WebAuthNChallengeModel struct { @@ -261,10 +261,10 @@ func (wm *SessionWriteModel) AuthMethodTypes() []domain.UserAuthMethodType { // or automatically (expired). func (wm *SessionWriteModel) CheckNotInvalidated() error { if wm.State == domain.SessionStateTerminated { - return errors.ThrowPreconditionFailed(nil, "COMMAND-Hewfq", "Errors.Session.Terminated") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Hewfq", "Errors.Session.Terminated") } if !wm.Expiration.IsZero() && wm.Expiration.Before(time.Now()) { - return errors.ThrowPreconditionFailed(nil, "COMMAND-Hkl3d", "Errors.Session.Expired") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Hkl3d", "Errors.Session.Expired") } return nil } @@ -272,7 +272,7 @@ func (wm *SessionWriteModel) CheckNotInvalidated() error { // CheckIsActive checks that the session was not invalidated ([CheckNotInvalidated]) and actually already exists. func (wm *SessionWriteModel) CheckIsActive() error { if wm.State == domain.SessionStateUnspecified { - return errors.ThrowPreconditionFailed(nil, "COMMAND-Flk38", "Errors.Session.NotExisting") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Flk38", "Errors.Session.NotExisting") } return wm.CheckNotInvalidated() } diff --git a/internal/command/session_otp.go b/internal/command/session_otp.go index eecf47f90..8afee5d2d 100644 --- a/internal/command/session_otp.go +++ b/internal/command/session_otp.go @@ -8,8 +8,8 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/session" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) CreateOTPSMSChallengeReturnCode(dst *string) SessionCommand { @@ -23,14 +23,14 @@ func (c *Commands) CreateOTPSMSChallenge() SessionCommand { func (c *Commands) createOTPSMSChallenge(returnCode bool, dst *string) SessionCommand { return func(ctx context.Context, cmd *SessionCommands) error { if cmd.sessionWriteModel.UserID == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JKL3g", "Errors.User.UserIDMissing") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-JKL3g", "Errors.User.UserIDMissing") } writeModel := NewHumanOTPSMSWriteModel(cmd.sessionWriteModel.UserID, "") if err := cmd.eventstore.FilterToQueryReducer(ctx, writeModel); err != nil { return err } if !writeModel.OTPAdded() { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-BJ2g3", "Errors.User.MFA.OTP.NotReady") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-BJ2g3", "Errors.User.MFA.OTP.NotReady") } code, err := cmd.createCode(ctx, cmd.eventstore.Filter, domain.SecretGeneratorTypeOTPSMS, cmd.otpAlg, c.defaultSecretGenerators.OTPSMS) if err != nil { @@ -51,7 +51,7 @@ func (c *Commands) OTPSMSSent(ctx context.Context, sessionID, resourceOwner stri return err } if sessionWriteModel.OTPSMSCodeChallenge == nil { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-G3t31", "Errors.User.Code.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-G3t31", "Errors.User.Code.NotFound") } return c.pushAppendAndReduce(ctx, sessionWriteModel, session.NewOTPSMSSentEvent(ctx, &session.NewAggregate(sessionID, sessionWriteModel.ResourceOwner).Aggregate), @@ -76,14 +76,14 @@ func (c *Commands) CreateOTPEmailChallenge() SessionCommand { func (c *Commands) createOTPEmailChallenge(returnCode bool, urlTmpl string, dst *string) SessionCommand { return func(ctx context.Context, cmd *SessionCommands) error { if cmd.sessionWriteModel.UserID == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JK3gp", "Errors.User.UserIDMissing") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-JK3gp", "Errors.User.UserIDMissing") } writeModel := NewHumanOTPEmailWriteModel(cmd.sessionWriteModel.UserID, "") if err := cmd.eventstore.FilterToQueryReducer(ctx, writeModel); err != nil { return err } if !writeModel.OTPAdded() { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JKLJ3", "Errors.User.MFA.OTP.NotReady") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-JKLJ3", "Errors.User.MFA.OTP.NotReady") } code, err := cmd.createCode(ctx, cmd.eventstore.Filter, domain.SecretGeneratorTypeOTPEmail, cmd.otpAlg, c.defaultSecretGenerators.OTPEmail) if err != nil { @@ -104,7 +104,7 @@ func (c *Commands) OTPEmailSent(ctx context.Context, sessionID, resourceOwner st return err } if sessionWriteModel.OTPEmailCodeChallenge == nil { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SLr02", "Errors.User.Code.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-SLr02", "Errors.User.Code.NotFound") } return c.pushAppendAndReduce(ctx, sessionWriteModel, session.NewOTPEmailSentEvent(ctx, &session.NewAggregate(sessionID, sessionWriteModel.ResourceOwner).Aggregate), @@ -114,11 +114,11 @@ func (c *Commands) OTPEmailSent(ctx context.Context, sessionID, resourceOwner st func CheckOTPSMS(code string) SessionCommand { return func(ctx context.Context, cmd *SessionCommands) (err error) { if cmd.sessionWriteModel.UserID == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-VDrh3", "Errors.User.UserIDMissing") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-VDrh3", "Errors.User.UserIDMissing") } challenge := cmd.sessionWriteModel.OTPSMSCodeChallenge if challenge == nil { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SF3tv", "Errors.User.Code.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-SF3tv", "Errors.User.Code.NotFound") } err = crypto.VerifyCodeWithAlgorithm(challenge.CreationDate, challenge.Expiry, challenge.Code, code, cmd.otpAlg) if err != nil { @@ -132,11 +132,11 @@ func CheckOTPSMS(code string) SessionCommand { func CheckOTPEmail(code string) SessionCommand { return func(ctx context.Context, cmd *SessionCommands) (err error) { if cmd.sessionWriteModel.UserID == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-ejo2w", "Errors.User.UserIDMissing") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-ejo2w", "Errors.User.UserIDMissing") } challenge := cmd.sessionWriteModel.OTPEmailCodeChallenge if challenge == nil { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-zF3g3", "Errors.User.Code.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-zF3g3", "Errors.User.Code.NotFound") } err = crypto.VerifyCodeWithAlgorithm(challenge.CreationDate, challenge.Expiry, challenge.Code, code, cmd.otpAlg) if err != nil { diff --git a/internal/command/session_otp_test.go b/internal/command/session_otp_test.go index 10801d79b..f4db8241c 100644 --- a/internal/command/session_otp_test.go +++ b/internal/command/session_otp_test.go @@ -10,10 +10,10 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/session" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_CreateOTPSMSChallengeReturnCode(t *testing.T) { @@ -39,7 +39,7 @@ func TestCommands_CreateOTPSMSChallengeReturnCode(t *testing.T) { eventstore: expectEventstore(), }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JKL3g", "Errors.User.UserIDMissing"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-JKL3g", "Errors.User.UserIDMissing"), }, }, { @@ -51,7 +51,7 @@ func TestCommands_CreateOTPSMSChallengeReturnCode(t *testing.T) { ), }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-BJ2g3", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-BJ2g3", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -140,7 +140,7 @@ func TestCommands_CreateOTPSMSChallenge(t *testing.T) { eventstore: expectEventstore(), }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JKL3g", "Errors.User.UserIDMissing"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-JKL3g", "Errors.User.UserIDMissing"), }, }, { @@ -152,7 +152,7 @@ func TestCommands_CreateOTPSMSChallenge(t *testing.T) { ), }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-BJ2g3", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-BJ2g3", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -244,7 +244,7 @@ func TestCommands_OTPSMSSent(t *testing.T) { sessionID: "sessionID", resourceOwner: "instanceID", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-G3t31", "Errors.User.Code.NotFound"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-G3t31", "Errors.User.Code.NotFound"), }, { name: "challenged and sent", @@ -317,7 +317,7 @@ func TestCommands_CreateOTPEmailChallengeURLTemplate(t *testing.T) { eventstore: expectEventstore(), }, res: res{ - templateError: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-ieYa7", "Errors.User.InvalidURLTemplate"), + templateError: zerrors.ThrowInvalidArgument(nil, "DOMAIN-ieYa7", "Errors.User.InvalidURLTemplate"), }, }, { @@ -329,7 +329,7 @@ func TestCommands_CreateOTPEmailChallengeURLTemplate(t *testing.T) { eventstore: expectEventstore(), }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JK3gp", "Errors.User.UserIDMissing"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-JK3gp", "Errors.User.UserIDMissing"), }, }, { @@ -344,7 +344,7 @@ func TestCommands_CreateOTPEmailChallengeURLTemplate(t *testing.T) { ), }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JKLJ3", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-JKLJ3", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -439,7 +439,7 @@ func TestCommands_CreateOTPEmailChallengeReturnCode(t *testing.T) { eventstore: expectEventstore(), }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JK3gp", "Errors.User.UserIDMissing"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-JK3gp", "Errors.User.UserIDMissing"), }, }, { @@ -451,7 +451,7 @@ func TestCommands_CreateOTPEmailChallengeReturnCode(t *testing.T) { ), }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JKLJ3", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-JKLJ3", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -540,7 +540,7 @@ func TestCommands_CreateOTPEmailChallenge(t *testing.T) { eventstore: expectEventstore(), }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JK3gp", "Errors.User.UserIDMissing"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-JK3gp", "Errors.User.UserIDMissing"), }, }, { @@ -552,7 +552,7 @@ func TestCommands_CreateOTPEmailChallenge(t *testing.T) { ), }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JKLJ3", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-JKLJ3", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -645,7 +645,7 @@ func TestCommands_OTPEmailSent(t *testing.T) { sessionID: "sessionID", resourceOwner: "instanceID", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SLr02", "Errors.User.Code.NotFound"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-SLr02", "Errors.User.Code.NotFound"), }, { name: "challenged and sent", @@ -720,7 +720,7 @@ func TestCheckOTPSMS(t *testing.T) { code: "code", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-VDrh3", "Errors.User.UserIDMissing"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-VDrh3", "Errors.User.UserIDMissing"), }, }, { @@ -734,7 +734,7 @@ func TestCheckOTPSMS(t *testing.T) { code: "code", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SF3tv", "Errors.User.Code.NotFound"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-SF3tv", "Errors.User.Code.NotFound"), }, }, { @@ -758,7 +758,7 @@ func TestCheckOTPSMS(t *testing.T) { code: "code", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "CODE-QvUQ4P", "Errors.User.Code.Expired"), + err: zerrors.ThrowPreconditionFailed(nil, "CODE-QvUQ4P", "Errors.User.Code.Expired"), }, }, { @@ -848,7 +848,7 @@ func TestCheckOTPEmail(t *testing.T) { code: "code", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-ejo2w", "Errors.User.UserIDMissing"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-ejo2w", "Errors.User.UserIDMissing"), }, }, { @@ -862,7 +862,7 @@ func TestCheckOTPEmail(t *testing.T) { code: "code", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-zF3g3", "Errors.User.Code.NotFound"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-zF3g3", "Errors.User.Code.NotFound"), }, }, { @@ -886,7 +886,7 @@ func TestCheckOTPEmail(t *testing.T) { code: "code", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "CODE-QvUQ4P", "Errors.User.Code.Expired"), + err: zerrors.ThrowPreconditionFailed(nil, "CODE-QvUQ4P", "Errors.User.Code.Expired"), }, }, { diff --git a/internal/command/session_test.go b/internal/command/session_test.go index b4f6c8123..6862aba3f 100644 --- a/internal/command/session_test.go +++ b/internal/command/session_test.go @@ -18,13 +18,13 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/idpintent" "github.com/zitadel/zitadel/internal/repository/session" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestSessionCommands_getHumanWriteModel(t *testing.T) { @@ -51,7 +51,7 @@ func TestSessionCommands_getHumanWriteModel(t *testing.T) { }, res: res{ want: nil, - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-eeR2e", "Errors.User.UserIDMissing"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-eeR2e", "Errors.User.UserIDMissing"), }, }, { @@ -95,7 +95,7 @@ func TestSessionCommands_getHumanWriteModel(t *testing.T) { }, res: res{ want: nil, - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Df4b3", "Errors.User.NotFound"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Df4b3", "Errors.User.NotFound"), }, }, { @@ -168,14 +168,14 @@ func TestCommands_CreateSession(t *testing.T) { { "id generator fails", fields{ - idGenerator: mock.NewIDGeneratorExpectError(t, caos_errs.ThrowInternal(nil, "id", "generator failed")), + idGenerator: mock.NewIDGeneratorExpectError(t, zerrors.ThrowInternal(nil, "id", "generator failed")), }, args{ ctx: context.Background(), }, []expect{}, res{ - err: caos_errs.ThrowInternal(nil, "id", "generator failed"), + err: zerrors.ThrowInternal(nil, "id", "generator failed"), }, }, { @@ -187,10 +187,10 @@ func TestCommands_CreateSession(t *testing.T) { ctx: context.Background(), }, []expect{ - expectFilterError(caos_errs.ThrowInternal(nil, "id", "filter failed")), + expectFilterError(zerrors.ThrowInternal(nil, "id", "filter failed")), }, res{ - err: caos_errs.ThrowInternal(nil, "id", "filter failed"), + err: zerrors.ThrowInternal(nil, "id", "filter failed"), }, }, { @@ -217,7 +217,7 @@ func TestCommands_CreateSession(t *testing.T) { expectFilter(), }, res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-asEG4", "Errors.Session.PositiveLifetime"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-asEG4", "Errors.Session.PositiveLifetime"), }, }, { @@ -309,14 +309,14 @@ func TestCommands_UpdateSession(t *testing.T) { "eventstore failed", fields{ eventstore: eventstoreExpect(t, - expectFilterError(caos_errs.ThrowInternal(nil, "id", "filter failed")), + expectFilterError(zerrors.ThrowInternal(nil, "id", "filter failed")), ), }, args{ ctx: context.Background(), }, res{ - err: caos_errs.ThrowInternal(nil, "id", "filter failed"), + err: zerrors.ThrowInternal(nil, "id", "filter failed"), }, }, { @@ -347,7 +347,7 @@ func TestCommands_UpdateSession(t *testing.T) { sessionToken: "invalid", }, res{ - err: caos_errs.ThrowPermissionDenied(nil, "COMMAND-sGr42", "Errors.Session.Token.Invalid"), + err: zerrors.ThrowPermissionDenied(nil, "COMMAND-sGr42", "Errors.Session.Token.Invalid"), }, }, { @@ -450,7 +450,7 @@ func TestCommands_updateSession(t *testing.T) { }, }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Hewfq", "Errors.Session.Terminated"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Hewfq", "Errors.Session.Terminated"), }, }, { @@ -464,13 +464,13 @@ func TestCommands_updateSession(t *testing.T) { sessionWriteModel: NewSessionWriteModel("sessionID", "instance1"), sessionCommands: []SessionCommand{ func(ctx context.Context, cmd *SessionCommands) error { - return caos_errs.ThrowInternal(nil, "id", "check failed") + return zerrors.ThrowInternal(nil, "id", "check failed") }, }, }, }, res{ - err: caos_errs.ThrowInternal(nil, "id", "check failed"), + err: zerrors.ThrowInternal(nil, "id", "check failed"), }, }, { @@ -518,7 +518,7 @@ func TestCommands_updateSession(t *testing.T) { lifetime: -10 * time.Minute, }, res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-asEG4", "Errors.Session.PositiveLifetime"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-asEG4", "Errors.Session.PositiveLifetime"), }, }, { @@ -662,7 +662,7 @@ func TestCommands_updateSession(t *testing.T) { }, }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Df4bw", "Errors.Intent.NotSucceeded"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Df4bw", "Errors.Intent.NotSucceeded"), }, }, { @@ -711,7 +711,7 @@ func TestCommands_updateSession(t *testing.T) { }, }, res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-O8xk3w", "Errors.Intent.OtherUser"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-O8xk3w", "Errors.Intent.OtherUser"), }, }, { @@ -743,7 +743,7 @@ func TestCommands_updateSession(t *testing.T) { }, }, res{ - err: caos_errs.ThrowPermissionDenied(nil, "CRYPTO-CRYPTO", "Errors.Intent.InvalidToken"), + err: zerrors.ThrowPermissionDenied(nil, "CRYPTO-CRYPTO", "Errors.Intent.InvalidToken"), }, }, { @@ -859,7 +859,7 @@ func TestCheckTOTP(t *testing.T) { }, eventstore: expectEventstore(), }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Neil7", "Errors.User.UserIDMissing"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Neil7", "Errors.User.UserIDMissing"), }, { name: "filter error", @@ -893,7 +893,7 @@ func TestCheckTOTP(t *testing.T) { ), ), }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-eej1U", "Errors.User.MFA.OTP.NotReady"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-eej1U", "Errors.User.MFA.OTP.NotReady"), }, { name: "otp verify error", @@ -915,7 +915,7 @@ func TestCheckTOTP(t *testing.T) { ), ), }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "EVENT-8isk2", "Errors.User.MFA.OTP.InvalidCode"), + wantErr: zerrors.ThrowInvalidArgument(nil, "EVENT-8isk2", "Errors.User.MFA.OTP.InvalidCode"), }, { name: "ok", @@ -982,14 +982,14 @@ func TestCommands_TerminateSession(t *testing.T) { "eventstore failed", fields{ eventstore: expectEventstore( - expectFilterError(caos_errs.ThrowInternal(nil, "id", "filter failed")), + expectFilterError(zerrors.ThrowInternal(nil, "id", "filter failed")), ), }, args{ ctx: context.Background(), }, res{ - err: caos_errs.ThrowInternal(nil, "id", "filter failed"), + err: zerrors.ThrowInternal(nil, "id", "filter failed"), }, }, { @@ -1020,7 +1020,7 @@ func TestCommands_TerminateSession(t *testing.T) { sessionToken: "invalid", }, res{ - err: caos_errs.ThrowPermissionDenied(nil, "COMMAND-sGr42", "Errors.Session.Token.Invalid"), + err: zerrors.ThrowPermissionDenied(nil, "COMMAND-sGr42", "Errors.Session.Token.Invalid"), }, }, { @@ -1051,7 +1051,7 @@ func TestCommands_TerminateSession(t *testing.T) { sessionToken: "", }, res{ - err: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + err: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, }, { @@ -1112,7 +1112,7 @@ func TestCommands_TerminateSession(t *testing.T) { ), ), expectPushFailed( - caos_errs.ThrowInternal(nil, "id", "pushed failed"), + zerrors.ThrowInternal(nil, "id", "pushed failed"), session.NewTerminateEvent(context.Background(), &session.NewAggregate("sessionID", "instance1").Aggregate), ), ), @@ -1126,7 +1126,7 @@ func TestCommands_TerminateSession(t *testing.T) { sessionToken: "token", }, res{ - err: caos_errs.ThrowInternal(nil, "id", "pushed failed"), + err: zerrors.ThrowInternal(nil, "id", "pushed failed"), }, }, { diff --git a/internal/command/session_webauhtn.go b/internal/command/session_webauhtn.go index 991a51988..680b641a5 100644 --- a/internal/command/session_webauhtn.go +++ b/internal/command/session_webauhtn.go @@ -5,7 +5,7 @@ import ( "encoding/json" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type humanWebAuthNTokens struct { @@ -51,7 +51,7 @@ func (c *Commands) CreateWebAuthNChallenge(userVerification domain.UserVerificat return err } if err = json.Unmarshal(webAuthNLogin.CredentialAssertionData, dst); err != nil { - return caos_errs.ThrowInternal(err, "COMMAND-Yah6A", "Errors.Internal") + return zerrors.ThrowInternal(err, "COMMAND-Yah6A", "Errors.Internal") } cmd.WebAuthNChallenged(ctx, webAuthNLogin.Challenge, webAuthNLogin.AllowedCredentialIDs, webAuthNLogin.UserVerification, rpid) @@ -63,11 +63,11 @@ func (c *Commands) CheckWebAuthN(credentialAssertionData json.Marshaler) Session return func(ctx context.Context, cmd *SessionCommands) error { credentialAssertionData, err := json.Marshal(credentialAssertionData) if err != nil { - return caos_errs.ThrowInternal(err, "COMMAND-ohG2o", "Errors.Internal") + return zerrors.ThrowInternal(err, "COMMAND-ohG2o", "Errors.Internal") } challenge := cmd.sessionWriteModel.WebAuthNChallenge if challenge == nil { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Ioqu5", "Errors.Session.WebAuthN.NoChallenge") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Ioqu5", "Errors.Session.WebAuthN.NoChallenge") } webAuthNTokens, err := cmd.getHumanWebAuthNTokens(ctx, challenge.UserVerification) if err != nil { @@ -81,7 +81,7 @@ func (c *Commands) CheckWebAuthN(credentialAssertionData json.Marshaler) Session } _, token := domain.GetTokenByKeyID(webAuthNTokens.tokens, credential.ID) if token == nil { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Aej7i", "Errors.User.WebAuthN.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Aej7i", "Errors.User.WebAuthN.NotFound") } cmd.WebAuthNChecked(ctx, cmd.now(), token.WebAuthNTokenID, credential.Authenticator.SignCount, credential.Flags.UserVerified) return nil diff --git a/internal/command/session_webauthn_test.go b/internal/command/session_webauthn_test.go index 3352286eb..e649cb6c3 100644 --- a/internal/command/session_webauthn_test.go +++ b/internal/command/session_webauthn_test.go @@ -10,11 +10,11 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestSessionCommands_getHumanWebAuthNTokens(t *testing.T) { @@ -48,7 +48,7 @@ func TestSessionCommands_getHumanWebAuthNTokens(t *testing.T) { }, res: res{ want: nil, - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-eeR2e", "Errors.User.UserIDMissing"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-eeR2e", "Errors.User.UserIDMissing"), }, }, { diff --git a/internal/command/sms_config.go b/internal/command/sms_config.go index 0d37d2b12..cd5e38e51 100644 --- a/internal/command/sms_config.go +++ b/internal/command/sms_config.go @@ -5,9 +5,9 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/notification/channels/twilio" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddSMSConfigTwilio(ctx context.Context, instanceID string, config *twilio.Config) (string, *domain.ObjectDetails, error) { @@ -48,14 +48,14 @@ func (c *Commands) AddSMSConfigTwilio(ctx context.Context, instanceID string, co func (c *Commands) ChangeSMSConfigTwilio(ctx context.Context, instanceID, id string, config *twilio.Config) (*domain.ObjectDetails, error) { if id == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "SMS-e9jwf", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "SMS-e9jwf", "Errors.IDMissing") } smsConfigWriteModel, err := c.getSMSConfig(ctx, instanceID, id) if err != nil { return nil, err } if !smsConfigWriteModel.State.Exists() || smsConfigWriteModel.Twilio == nil { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-2m9fw", "Errors.SMSConfig.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-2m9fw", "Errors.SMSConfig.NotFound") } iamAgg := InstanceAggregateFromWriteModel(&smsConfigWriteModel.WriteModel) @@ -69,7 +69,7 @@ func (c *Commands) ChangeSMSConfigTwilio(ctx context.Context, instanceID, id str return nil, err } if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-jf9wk", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-jf9wk", "Errors.NoChangesFound") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { @@ -88,7 +88,7 @@ func (c *Commands) ChangeSMSConfigTwilioToken(ctx context.Context, instanceID, i return nil, err } if !smsConfigWriteModel.State.Exists() || smsConfigWriteModel.Twilio == nil { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-fj9wf", "Errors.SMSConfig.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-fj9wf", "Errors.SMSConfig.NotFound") } iamAgg := InstanceAggregateFromWriteModel(&smsConfigWriteModel.WriteModel) newtoken, err := crypto.Encrypt([]byte(token), c.smsEncryption) @@ -112,7 +112,7 @@ func (c *Commands) ChangeSMSConfigTwilioToken(ctx context.Context, instanceID, i func (c *Commands) ActivateSMSConfig(ctx context.Context, instanceID, id string) (*domain.ObjectDetails, error) { if id == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "SMS-dn93n", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "SMS-dn93n", "Errors.IDMissing") } smsConfigWriteModel, err := c.getSMSConfig(ctx, instanceID, id) if err != nil { @@ -120,10 +120,10 @@ func (c *Commands) ActivateSMSConfig(ctx context.Context, instanceID, id string) } if !smsConfigWriteModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-sn9we", "Errors.SMSConfig.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-sn9we", "Errors.SMSConfig.NotFound") } if smsConfigWriteModel.State == domain.SMSConfigStateActive { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-sn9we", "Errors.SMSConfig.AlreadyActive") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-sn9we", "Errors.SMSConfig.AlreadyActive") } iamAgg := InstanceAggregateFromWriteModel(&smsConfigWriteModel.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, instance.NewSMSConfigTwilioActivatedEvent( @@ -142,17 +142,17 @@ func (c *Commands) ActivateSMSConfig(ctx context.Context, instanceID, id string) func (c *Commands) DeactivateSMSConfig(ctx context.Context, instanceID, id string) (*domain.ObjectDetails, error) { if id == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "SMS-frkwf", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "SMS-frkwf", "Errors.IDMissing") } smsConfigWriteModel, err := c.getSMSConfig(ctx, instanceID, id) if err != nil { return nil, err } if !smsConfigWriteModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-s39Kg", "Errors.SMSConfig.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-s39Kg", "Errors.SMSConfig.NotFound") } if smsConfigWriteModel.State == domain.SMSConfigStateInactive { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-dm9e3", "Errors.SMSConfig.AlreadyDeactivated") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-dm9e3", "Errors.SMSConfig.AlreadyDeactivated") } iamAgg := InstanceAggregateFromWriteModel(&smsConfigWriteModel.WriteModel) @@ -172,14 +172,14 @@ func (c *Commands) DeactivateSMSConfig(ctx context.Context, instanceID, id strin func (c *Commands) RemoveSMSConfig(ctx context.Context, instanceID, id string) (*domain.ObjectDetails, error) { if id == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "SMS-3j9fs", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "SMS-3j9fs", "Errors.IDMissing") } smsConfigWriteModel, err := c.getSMSConfig(ctx, instanceID, id) if err != nil { return nil, err } if !smsConfigWriteModel.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-sn9we", "Errors.SMSConfig.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-sn9we", "Errors.SMSConfig.NotFound") } iamAgg := InstanceAggregateFromWriteModel(&smsConfigWriteModel.WriteModel) diff --git a/internal/command/sms_config_test.go b/internal/command/sms_config_test.go index 49a476d1d..b79ab2551 100644 --- a/internal/command/sms_config_test.go +++ b/internal/command/sms_config_test.go @@ -9,12 +9,12 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/notification/channels/twilio" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddSMSConfigTwilio(t *testing.T) { @@ -132,7 +132,7 @@ func TestCommandSide_ChangeSMSConfigTwilio(t *testing.T) { sms: &twilio.Config{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -150,7 +150,7 @@ func TestCommandSide_ChangeSMSConfigTwilio(t *testing.T) { id: "id", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -188,7 +188,7 @@ func TestCommandSide_ChangeSMSConfigTwilio(t *testing.T) { id: "providerid", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -289,7 +289,7 @@ func TestCommandSide_ActivateSMSConfigTwilio(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -306,7 +306,7 @@ func TestCommandSide_ActivateSMSConfigTwilio(t *testing.T) { id: "id", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -396,7 +396,7 @@ func TestCommandSide_DeactivateSMSConfigTwilio(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -413,7 +413,7 @@ func TestCommandSide_DeactivateSMSConfigTwilio(t *testing.T) { id: "id", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -510,7 +510,7 @@ func TestCommandSide_RemoveSMSConfig(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -527,7 +527,7 @@ func TestCommandSide_RemoveSMSConfig(t *testing.T) { id: "id", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/smtp.go b/internal/command/smtp.go index 2f7ea95f2..c52dd98f0 100644 --- a/internal/command/smtp.go +++ b/internal/command/smtp.go @@ -9,10 +9,10 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/notification/channels/smtp" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddSMTPConfig(ctx context.Context, config *smtp.Config) (*domain.ObjectDetails, error) { @@ -58,7 +58,7 @@ func (c *Commands) ChangeSMTPConfigPassword(ctx context.Context, password string return nil, err } if smtpConfigWriteModel.State != domain.SMTPConfigStateActive { - return nil, errors.ThrowNotFound(nil, "COMMAND-3n9ls", "Errors.SMTPConfig.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-3n9ls", "Errors.SMTPConfig.NotFound") } var smtpPassword *crypto.CryptoValue if password != "" { @@ -102,14 +102,14 @@ func (c *Commands) RemoveSMTPConfig(ctx context.Context) (*domain.ObjectDetails, func (c *Commands) prepareAddSMTPConfig(a *instance.Aggregate, from, name, replyTo, hostAndPort, user string, password []byte, tls bool) preparation.Validation { return func() (preparation.CreateCommands, error) { if from = strings.TrimSpace(from); from == "" { - return nil, errors.ThrowInvalidArgument(nil, "INST-mruNY", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-mruNY", "Errors.Invalid.Argument") } replyTo = strings.TrimSpace(replyTo) hostAndPort = strings.TrimSpace(hostAndPort) if _, _, err := net.SplitHostPort(hostAndPort); err != nil { - return nil, errors.ThrowInvalidArgument(nil, "INST-9JdRe", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-9JdRe", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { fromSplitted := strings.Split(from, "@") @@ -119,7 +119,7 @@ func (c *Commands) prepareAddSMTPConfig(a *instance.Aggregate, from, name, reply return nil, err } if writeModel.State == domain.SMTPConfigStateActive { - return nil, errors.ThrowAlreadyExists(nil, "INST-W3VS2", "Errors.SMTPConfig.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "INST-W3VS2", "Errors.SMTPConfig.AlreadyExists") } err = checkSenderAddress(writeModel) if err != nil { @@ -152,13 +152,13 @@ func (c *Commands) prepareAddSMTPConfig(a *instance.Aggregate, from, name, reply func (c *Commands) prepareChangeSMTPConfig(a *instance.Aggregate, from, name, replyTo, hostAndPort, user string, tls bool) preparation.Validation { return func() (preparation.CreateCommands, error) { if from = strings.TrimSpace(from); from == "" { - return nil, errors.ThrowInvalidArgument(nil, "INST-ASv2d", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-ASv2d", "Errors.Invalid.Argument") } replyTo = strings.TrimSpace(replyTo) hostAndPort = strings.TrimSpace(hostAndPort) if _, _, err := net.SplitHostPort(hostAndPort); err != nil { - return nil, errors.ThrowInvalidArgument(nil, "INST-Kv875", "Errors.Invalid.Argument") + return nil, zerrors.ThrowInvalidArgument(nil, "INST-Kv875", "Errors.Invalid.Argument") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { fromSplitted := strings.Split(from, "@") @@ -168,7 +168,7 @@ func (c *Commands) prepareChangeSMTPConfig(a *instance.Aggregate, from, name, re return nil, err } if writeModel.State != domain.SMTPConfigStateActive { - return nil, errors.ThrowNotFound(nil, "INST-Svq1a", "Errors.SMTPConfig.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INST-Svq1a", "Errors.SMTPConfig.NotFound") } err = checkSenderAddress(writeModel) if err != nil { @@ -188,7 +188,7 @@ func (c *Commands) prepareChangeSMTPConfig(a *instance.Aggregate, from, name, re return nil, err } if !hasChanged { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-m0o3f", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-m0o3f", "Errors.NoChangesFound") } return []eventstore.Command{ changedEvent, @@ -205,7 +205,7 @@ func (c *Commands) prepareRemoveSMTPConfig(a *instance.Aggregate) preparation.Va return nil, err } if writeModel.State != domain.SMTPConfigStateActive { - return nil, errors.ThrowNotFound(nil, "INST-Sfefg", "Errors.SMTPConfig.NotFound") + return nil, zerrors.ThrowNotFound(nil, "INST-Sfefg", "Errors.SMTPConfig.NotFound") } return []eventstore.Command{ instance.NewSMTPConfigRemovedEvent(ctx, &a.Aggregate), @@ -219,7 +219,7 @@ func checkSenderAddress(writeModel *InstanceSMTPConfigWriteModel) error { return nil } if !writeModel.domainState.Exists() { - return errors.ThrowInvalidArgument(nil, "INST-83nl8", "Errors.SMTPConfig.SenderAdressNotCustomDomain") + return zerrors.ThrowInvalidArgument(nil, "INST-83nl8", "Errors.SMTPConfig.SenderAdressNotCustomDomain") } return nil } diff --git a/internal/command/smtp_test.go b/internal/command/smtp_test.go index 10a7aff44..bb46968da 100644 --- a/internal/command/smtp_test.go +++ b/internal/command/smtp_test.go @@ -10,10 +10,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/notification/channels/smtp" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddSMTPConfig(t *testing.T) { @@ -66,7 +66,7 @@ func TestCommandSide_AddSMTPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -118,7 +118,7 @@ func TestCommandSide_AddSMTPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, { @@ -261,7 +261,7 @@ func TestCommandSide_AddSMTPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -283,7 +283,7 @@ func TestCommandSide_AddSMTPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -397,7 +397,7 @@ func TestCommandSide_ChangeSMTPConfig(t *testing.T) { smtp: &smtp.Config{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -421,7 +421,7 @@ func TestCommandSide_ChangeSMTPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -472,7 +472,7 @@ func TestCommandSide_ChangeSMTPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -523,7 +523,7 @@ func TestCommandSide_ChangeSMTPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -610,7 +610,7 @@ func TestCommandSide_ChangeSMTPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -632,7 +632,7 @@ func TestCommandSide_ChangeSMTPConfig(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -752,7 +752,7 @@ func TestCommandSide_ChangeSMTPConfigPassword(t *testing.T) { password: "", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -851,7 +851,7 @@ func TestCommandSide_RemoveSMTPConfig(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/user.go b/internal/command/user.go index 15631a960..929c5b9d6 100644 --- a/internal/command/user.go +++ b/internal/command/user.go @@ -12,17 +12,17 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ChangeUsername(ctx context.Context, orgID, userID, userName string) (*domain.ObjectDetails, error) { userName = strings.TrimSpace(userName) if orgID == "" || userID == "" || userName == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-2N9fs", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-2N9fs", "Errors.IDMissing") } existingUser, err := c.userWriteModelByID(ctx, userID, orgID) @@ -31,16 +31,16 @@ func (c *Commands) ChangeUsername(ctx context.Context, orgID, userID, userName s } if !isUserStateExists(existingUser.UserState) { - return nil, errors.ThrowNotFound(nil, "COMMAND-5N9ds", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-5N9ds", "Errors.User.NotFound") } if existingUser.UserName == userName { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-6m9gs", "Errors.User.UsernameNotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-6m9gs", "Errors.User.UsernameNotChanged") } domainPolicy, err := c.getOrgDomainPolicy(ctx, orgID) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "COMMAND-38fnu", "Errors.Org.DomainPolicy.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-38fnu", "Errors.Org.DomainPolicy.NotExisting") } if !domainPolicy.UserLoginMustBeDomain { index := strings.LastIndex(userName, "@") @@ -50,7 +50,7 @@ func (c *Commands) ChangeUsername(ctx context.Context, orgID, userID, userName s return nil, err } if domainCheck.Verified && domainCheck.ResourceOwner != orgID { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-Di2ei", "Errors.User.DomainNotAllowedAsUsername") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Di2ei", "Errors.User.DomainNotAllowedAsUsername") } } } @@ -70,7 +70,7 @@ func (c *Commands) ChangeUsername(ctx context.Context, orgID, userID, userName s func (c *Commands) DeactivateUser(ctx context.Context, userID, resourceOwner string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-m0gDf", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-m0gDf", "Errors.User.UserIDMissing") } existingUser, err := c.userWriteModelByID(ctx, userID, resourceOwner) @@ -78,13 +78,13 @@ func (c *Commands) DeactivateUser(ctx context.Context, userID, resourceOwner str return nil, err } if !isUserStateExists(existingUser.UserState) { - return nil, errors.ThrowNotFound(nil, "COMMAND-3M9ds", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-3M9ds", "Errors.User.NotFound") } if isUserStateInitial(existingUser.UserState) { - return nil, errors.ThrowNotFound(nil, "COMMAND-ke0fw", "Errors.User.CantDeactivateInitial") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-ke0fw", "Errors.User.CantDeactivateInitial") } if isUserStateInactive(existingUser.UserState) { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-5M0sf", "Errors.User.AlreadyInactive") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-5M0sf", "Errors.User.AlreadyInactive") } pushedEvents, err := c.eventstore.Push(ctx, @@ -101,7 +101,7 @@ func (c *Commands) DeactivateUser(ctx context.Context, userID, resourceOwner str func (c *Commands) ReactivateUser(ctx context.Context, userID, resourceOwner string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-4M9ds", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-4M9ds", "Errors.User.UserIDMissing") } existingUser, err := c.userWriteModelByID(ctx, userID, resourceOwner) @@ -109,10 +109,10 @@ func (c *Commands) ReactivateUser(ctx context.Context, userID, resourceOwner str return nil, err } if !isUserStateExists(existingUser.UserState) { - return nil, errors.ThrowNotFound(nil, "COMMAND-4M0sd", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-4M0sd", "Errors.User.NotFound") } if !isUserStateInactive(existingUser.UserState) { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-6M0sf", "Errors.User.NotInactive") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-6M0sf", "Errors.User.NotInactive") } pushedEvents, err := c.eventstore.Push(ctx, @@ -129,7 +129,7 @@ func (c *Commands) ReactivateUser(ctx context.Context, userID, resourceOwner str func (c *Commands) LockUser(ctx context.Context, userID, resourceOwner string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-2M0sd", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-2M0sd", "Errors.User.UserIDMissing") } existingUser, err := c.userWriteModelByID(ctx, userID, resourceOwner) @@ -137,10 +137,10 @@ func (c *Commands) LockUser(ctx context.Context, userID, resourceOwner string) ( return nil, err } if !isUserStateExists(existingUser.UserState) { - return nil, errors.ThrowNotFound(nil, "COMMAND-5M9fs", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-5M9fs", "Errors.User.NotFound") } if !hasUserState(existingUser.UserState, domain.UserStateActive, domain.UserStateInitial) { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-3NN8v", "Errors.User.ShouldBeActiveOrInitial") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-3NN8v", "Errors.User.ShouldBeActiveOrInitial") } pushedEvents, err := c.eventstore.Push(ctx, @@ -157,7 +157,7 @@ func (c *Commands) LockUser(ctx context.Context, userID, resourceOwner string) ( func (c *Commands) UnlockUser(ctx context.Context, userID, resourceOwner string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-M0dse", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-M0dse", "Errors.User.UserIDMissing") } existingUser, err := c.userWriteModelByID(ctx, userID, resourceOwner) @@ -165,10 +165,10 @@ func (c *Commands) UnlockUser(ctx context.Context, userID, resourceOwner string) return nil, err } if !isUserStateExists(existingUser.UserState) { - return nil, errors.ThrowNotFound(nil, "COMMAND-M0dos", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-M0dos", "Errors.User.NotFound") } if !hasUserState(existingUser.UserState, domain.UserStateLocked) { - return nil, errors.ThrowPreconditionFailed(nil, "COMMAND-4M0ds", "Errors.User.NotLocked") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-4M0ds", "Errors.User.NotLocked") } pushedEvents, err := c.eventstore.Push(ctx, @@ -185,7 +185,7 @@ func (c *Commands) UnlockUser(ctx context.Context, userID, resourceOwner string) func (c *Commands) RemoveUser(ctx context.Context, userID, resourceOwner string, cascadingUserMemberships []*CascadingMembership, cascadingGrantIDs ...string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-2M0ds", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-2M0ds", "Errors.User.UserIDMissing") } existingUser, err := c.userWriteModelByID(ctx, userID, resourceOwner) @@ -193,12 +193,12 @@ func (c *Commands) RemoveUser(ctx context.Context, userID, resourceOwner string, return nil, err } if !isUserStateExists(existingUser.UserState) { - return nil, errors.ThrowNotFound(nil, "COMMAND-m9od", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-m9od", "Errors.User.NotFound") } domainPolicy, err := c.getOrgDomainPolicy(ctx, existingUser.ResourceOwner) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "COMMAND-3M9fs", "Errors.Org.DomainPolicy.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-3M9fs", "Errors.Org.DomainPolicy.NotExisting") } var events []eventstore.Command userAgg := UserAggregateFromWriteModel(&existingUser.WriteModel) @@ -234,7 +234,7 @@ func (c *Commands) RemoveUser(ctx context.Context, userID, resourceOwner string, func (c *Commands) AddUserToken(ctx context.Context, orgID, agentID, clientID, userID string, audience, scopes []string, lifetime time.Duration) (*domain.Token, error) { if userID == "" { //do not check for empty orgID (JWT Profile requests won't provide it, so service user requests fail) - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-Dbge4", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Dbge4", "Errors.IDMissing") } userWriteModel := NewUserWriteModel(userID, orgID) event, accessToken, err := c.addUserToken(ctx, userWriteModel, agentID, clientID, "", audience, scopes, lifetime) @@ -270,7 +270,7 @@ func (c *Commands) addUserToken(ctx context.Context, userWriteModel *UserWriteMo return nil, nil, err } if userWriteModel.UserState != domain.UserStateActive { - return nil, nil, errors.ThrowNotFound(nil, "COMMAND-1d6Gg", "Errors.User.NotFound") + return nil, nil, zerrors.ThrowNotFound(nil, "COMMAND-1d6Gg", "Errors.User.NotFound") } audience = domain.AddAudScopeToAudience(ctx, audience, scopes) @@ -305,7 +305,7 @@ func (c *Commands) addUserToken(ctx context.Context, userWriteModel *UserWriteMo func (c *Commands) removeAccessToken(ctx context.Context, userID, orgID, tokenID string) (*user.UserTokenRemovedEvent, *UserAccessTokenWriteModel, error) { if userID == "" || orgID == "" || tokenID == "" { - return nil, nil, errors.ThrowInvalidArgument(nil, "COMMAND-Dng42", "Errors.IDMissing") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Dng42", "Errors.IDMissing") } refreshTokenWriteModel := NewUserAccessTokenWriteModel(userID, orgID, tokenID) err := c.eventstore.FilterToQueryReducer(ctx, refreshTokenWriteModel) @@ -313,7 +313,7 @@ func (c *Commands) removeAccessToken(ctx context.Context, userID, orgID, tokenID return nil, nil, err } if refreshTokenWriteModel.UserState != domain.UserStateActive { - return nil, nil, errors.ThrowNotFound(nil, "COMMAND-BF4hd", "Errors.User.AccessToken.NotFound") + return nil, nil, zerrors.ThrowNotFound(nil, "COMMAND-BF4hd", "Errors.User.AccessToken.NotFound") } userAgg := UserAggregateFromWriteModel(&refreshTokenWriteModel.WriteModel) return user.NewUserTokenRemovedEvent(ctx, userAgg, tokenID), refreshTokenWriteModel, nil @@ -325,7 +325,7 @@ func (c *Commands) userDomainClaimed(ctx context.Context, userID string) (events return nil, nil, err } if existingUser.UserState == domain.UserStateUnspecified || existingUser.UserState == domain.UserStateDeleted { - return nil, nil, errors.ThrowNotFound(nil, "COMMAND-ii9K0", "Errors.User.NotFound") + return nil, nil, zerrors.ThrowNotFound(nil, "COMMAND-ii9K0", "Errors.User.NotFound") } changedUserGrant := NewUserWriteModel(userID, existingUser.ResourceOwner) userAgg := UserAggregateFromWriteModel(&changedUserGrant.WriteModel) @@ -355,7 +355,7 @@ func (c *Commands) prepareUserDomainClaimed(ctx context.Context, filter preparat return nil, err } if !userWriteModel.UserState.Exists() { - return nil, errors.ThrowNotFound(nil, "COMMAND-ii9K0", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-ii9K0", "Errors.User.NotFound") } domainPolicy, err := domainPolicyWriteModel(ctx, filter, userWriteModel.ResourceOwner) if err != nil { @@ -378,14 +378,14 @@ func (c *Commands) prepareUserDomainClaimed(ctx context.Context, filter preparat func (c *Commands) UserDomainClaimedSent(ctx context.Context, orgID, userID string) (err error) { if userID == "" { - return errors.ThrowInvalidArgument(nil, "COMMAND-5m0fs", "Errors.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-5m0fs", "Errors.IDMissing") } existingUser, err := c.userWriteModelByID(ctx, userID, orgID) if err != nil { return err } if !isUserStateExists(existingUser.UserState) { - return errors.ThrowNotFound(nil, "COMMAND-5m9gK", "Errors.User.NotFound") + return zerrors.ThrowNotFound(nil, "COMMAND-5m9gK", "Errors.User.NotFound") } _, err = c.eventstore.Push(ctx, @@ -399,7 +399,7 @@ func (c *Commands) checkUserExists(ctx context.Context, userID, resourceOwner st return err } if !isUserStateExists(existingUser.UserState) { - return errors.ThrowPreconditionFailed(nil, "COMMAND-uXHNj", "Errors.User.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-uXHNj", "Errors.User.NotFound") } return nil } diff --git a/internal/command/user_domain_policy.go b/internal/command/user_domain_policy.go index ca8f68e1c..deda7cacb 100644 --- a/internal/command/user_domain_policy.go +++ b/internal/command/user_domain_policy.go @@ -4,7 +4,7 @@ import ( "context" "github.com/zitadel/zitadel/internal/command/preparation" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func domainPolicyWriteModel(ctx context.Context, filter preparation.FilterToQueryReducer, orgID string) (*PolicyDomainWriteModel, error) { @@ -22,7 +22,7 @@ func domainPolicyWriteModel(ctx context.Context, filter preparation.FilterToQuer if instanceWriteModel != nil && instanceWriteModel.State.Exists() { return &instanceWriteModel.PolicyDomainWriteModel, err } - return nil, errors.ThrowInternal(nil, "USER-Ggk9n", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-Ggk9n", "Errors.Internal") } func orgDomainPolicy(ctx context.Context, filter preparation.FilterToQueryReducer, orgID string) (*OrgDomainPolicyWriteModel, error) { diff --git a/internal/command/user_domain_policy_test.go b/internal/command/user_domain_policy_test.go index bfc458b93..a4813a371 100644 --- a/internal/command/user_domain_policy_test.go +++ b/internal/command/user_domain_policy_test.go @@ -8,10 +8,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func Test_customDomainPolicy(t *testing.T) { @@ -29,7 +29,7 @@ func Test_customDomainPolicy(t *testing.T) { name: "err from filter", args: args{ filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") }, orgID: "id", }, @@ -115,7 +115,7 @@ func Test_defaultDomainPolicy(t *testing.T) { name: "err from filter", args: args{ filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") }, }, want: nil, @@ -200,7 +200,7 @@ func Test_DomainPolicy(t *testing.T) { name: "err from filter custom", args: args{ filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") }, orgID: "id", }, @@ -244,7 +244,7 @@ func Test_DomainPolicy(t *testing.T) { return nil, nil }). Append(func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "USER-6HnsD", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-6HnsD", "Errors.Internal") }). Filter(), orgID: "id", diff --git a/internal/command/user_grant.go b/internal/command/user_grant.go index 9acc79dc7..bc22e1af1 100644 --- a/internal/command/user_grant.go +++ b/internal/command/user_grant.go @@ -5,9 +5,9 @@ import ( "reflect" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/usergrant" "github.com/zitadel/zitadel/internal/telemetry/tracing" ) @@ -31,7 +31,7 @@ func (c *Commands) AddUserGrant(ctx context.Context, usergrant *domain.UserGrant func (c *Commands) addUserGrant(ctx context.Context, userGrant *domain.UserGrant, resourceOwner string) (command eventstore.Command, _ *UserGrantWriteModel, err error) { if !userGrant.IsValid() { - return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-kVfMa", "Errors.UserGrant.Invalid") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-kVfMa", "Errors.UserGrant.Invalid") } err = c.checkUserGrantPreCondition(ctx, userGrant, resourceOwner) if err != nil { @@ -73,7 +73,7 @@ func (c *Commands) ChangeUserGrant(ctx context.Context, userGrant *domain.UserGr func (c *Commands) changeUserGrant(ctx context.Context, userGrant *domain.UserGrant, resourceOwner string, cascade bool) (_ eventstore.Command, _ *UserGrantWriteModel, err error) { if userGrant.AggregateID == "" { - return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-3M0sd", "Errors.UserGrant.Invalid") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-3M0sd", "Errors.UserGrant.Invalid") } existingUserGrant, err := c.userGrantWriteModelByID(ctx, userGrant.AggregateID, userGrant.ResourceOwner) if err != nil { @@ -84,10 +84,10 @@ func (c *Commands) changeUserGrant(ctx context.Context, userGrant *domain.UserGr return nil, nil, err } if existingUserGrant.State == domain.UserGrantStateUnspecified || existingUserGrant.State == domain.UserGrantStateRemoved { - return nil, nil, caos_errs.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.UserGrant.NotFound") + return nil, nil, zerrors.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.UserGrant.NotFound") } if reflect.DeepEqual(existingUserGrant.RoleKeys, userGrant.RoleKeys) { - return nil, nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Rs8fy", "Errors.UserGrant.NotChanged") + return nil, nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Rs8fy", "Errors.UserGrant.NotChanged") } userGrant.ProjectID = existingUserGrant.ProjectID userGrant.ProjectGrantID = existingUserGrant.ProjectGrantID @@ -111,7 +111,7 @@ func (c *Commands) removeRoleFromUserGrant(ctx context.Context, userGrantID stri return nil, err } if existingUserGrant.State == domain.UserGrantStateUnspecified || existingUserGrant.State == domain.UserGrantStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.UserGrant.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.UserGrant.NotFound") } keyExists := false for i, key := range existingUserGrant.RoleKeys { @@ -126,7 +126,7 @@ func (c *Commands) removeRoleFromUserGrant(ctx context.Context, userGrantID stri } } if !keyExists { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-5m8g9", "Errors.UserGrant.RoleKeyNotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-5m8g9", "Errors.UserGrant.RoleKeyNotFound") } changedUserGrant := NewUserGrantWriteModel(userGrantID, existingUserGrant.ResourceOwner) userGrantAgg := UserGrantAggregateFromWriteModel(&changedUserGrant.WriteModel) @@ -140,7 +140,7 @@ func (c *Commands) removeRoleFromUserGrant(ctx context.Context, userGrantID stri func (c *Commands) DeactivateUserGrant(ctx context.Context, grantID, resourceOwner string) (objectDetails *domain.ObjectDetails, err error) { if grantID == "" || resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-N2OhG", "Errors.UserGrant.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-N2OhG", "Errors.UserGrant.IDMissing") } existingUserGrant, err := c.userGrantWriteModelByID(ctx, grantID, resourceOwner) @@ -148,10 +148,10 @@ func (c *Commands) DeactivateUserGrant(ctx context.Context, grantID, resourceOwn return nil, err } if existingUserGrant.State == domain.UserGrantStateUnspecified || existingUserGrant.State == domain.UserGrantStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.UserGrant.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-3M9sd", "Errors.UserGrant.NotFound") } if existingUserGrant.State != domain.UserGrantStateActive { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-1S9gx", "Errors.UserGrant.NotActive") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-1S9gx", "Errors.UserGrant.NotActive") } err = checkExplicitProjectPermission(ctx, existingUserGrant.ProjectGrantID, existingUserGrant.ProjectID) if err != nil { @@ -173,7 +173,7 @@ func (c *Commands) DeactivateUserGrant(ctx context.Context, grantID, resourceOwn func (c *Commands) ReactivateUserGrant(ctx context.Context, grantID, resourceOwner string) (objectDetails *domain.ObjectDetails, err error) { if grantID == "" || resourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-Qxy8v", "Errors.UserGrant.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Qxy8v", "Errors.UserGrant.IDMissing") } existingUserGrant, err := c.userGrantWriteModelByID(ctx, grantID, resourceOwner) @@ -181,10 +181,10 @@ func (c *Commands) ReactivateUserGrant(ctx context.Context, grantID, resourceOwn return nil, err } if existingUserGrant.State == domain.UserGrantStateUnspecified || existingUserGrant.State == domain.UserGrantStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Lp0gs", "Errors.UserGrant.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-Lp0gs", "Errors.UserGrant.NotFound") } if existingUserGrant.State != domain.UserGrantStateInactive { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-1ML0v", "Errors.UserGrant.NotInactive") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-1ML0v", "Errors.UserGrant.NotInactive") } err = checkExplicitProjectPermission(ctx, existingUserGrant.ProjectGrantID, existingUserGrant.ProjectID) if err != nil { @@ -222,7 +222,7 @@ func (c *Commands) RemoveUserGrant(ctx context.Context, grantID, resourceOwner s func (c *Commands) BulkRemoveUserGrant(ctx context.Context, grantIDs []string, resourceOwner string) (err error) { if len(grantIDs) == 0 { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-5M0sd", "Errors.UserGrant.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-5M0sd", "Errors.UserGrant.IDMissing") } events := make([]eventstore.Command, len(grantIDs)) for i, grantID := range grantIDs { @@ -238,7 +238,7 @@ func (c *Commands) BulkRemoveUserGrant(ctx context.Context, grantIDs []string, r func (c *Commands) removeUserGrant(ctx context.Context, grantID, resourceOwner string, cascade bool) (_ eventstore.Command, writeModel *UserGrantWriteModel, err error) { if grantID == "" { - return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-J9sc5", "Errors.UserGrant.IDMissing") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-J9sc5", "Errors.UserGrant.IDMissing") } existingUserGrant, err := c.userGrantWriteModelByID(ctx, grantID, resourceOwner) @@ -246,7 +246,7 @@ func (c *Commands) removeUserGrant(ctx context.Context, grantID, resourceOwner s return nil, nil, err } if existingUserGrant.State == domain.UserGrantStateUnspecified || existingUserGrant.State == domain.UserGrantStateRemoved { - return nil, nil, caos_errs.ThrowNotFound(nil, "COMMAND-1My0t", "Errors.UserGrant.NotFound") + return nil, nil, zerrors.ThrowNotFound(nil, "COMMAND-1My0t", "Errors.UserGrant.NotFound") } if !cascade { err = checkExplicitProjectPermission(ctx, existingUserGrant.ProjectGrantID, existingUserGrant.ProjectID) @@ -292,16 +292,16 @@ func (c *Commands) checkUserGrantPreCondition(ctx context.Context, usergrant *do return err } if !preConditions.UserExists { - return caos_errs.ThrowPreconditionFailed(err, "COMMAND-4f8sg", "Errors.User.NotFound") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-4f8sg", "Errors.User.NotFound") } if usergrant.ProjectGrantID == "" && !preConditions.ProjectExists { - return caos_errs.ThrowPreconditionFailed(err, "COMMAND-3n77S", "Errors.Project.NotFound") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-3n77S", "Errors.Project.NotFound") } if usergrant.ProjectGrantID != "" && !preConditions.ProjectGrantExists { - return caos_errs.ThrowPreconditionFailed(err, "COMMAND-4m9ff", "Errors.Project.Grant.NotFound") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-4m9ff", "Errors.Project.Grant.NotFound") } if usergrant.HasInvalidRoles(preConditions.ExistingRoleKeys) { - return caos_errs.ThrowPreconditionFailed(err, "COMMAND-mm9F4", "Errors.Project.Role.NotFound") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-mm9F4", "Errors.Project.Role.NotFound") } return nil } diff --git a/internal/command/user_grant_test.go b/internal/command/user_grant_test.go index 340c98dc2..a073c94e1 100644 --- a/internal/command/user_grant_test.go +++ b/internal/command/user_grant_test.go @@ -9,7 +9,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" @@ -17,6 +16,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddUserGrant(t *testing.T) { @@ -54,7 +54,7 @@ func TestCommandSide_AddUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -98,7 +98,7 @@ func TestCommandSide_AddUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -147,7 +147,7 @@ func TestCommandSide_AddUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -189,7 +189,7 @@ func TestCommandSide_AddUserGrant(t *testing.T) { resourceOwner: "org2", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -232,7 +232,7 @@ func TestCommandSide_AddUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -276,7 +276,7 @@ func TestCommandSide_AddUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -336,7 +336,7 @@ func TestCommandSide_AddUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -396,7 +396,7 @@ func TestCommandSide_AddUserGrant(t *testing.T) { resourceOwner: "org2", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -604,7 +604,7 @@ func TestCommandSide_ChangeUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -634,7 +634,7 @@ func TestCommandSide_ChangeUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPermissionDenied, + err: zerrors.IsPermissionDenied, }, }, { @@ -658,7 +658,7 @@ func TestCommandSide_ChangeUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -682,7 +682,7 @@ func TestCommandSide_ChangeUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -714,7 +714,7 @@ func TestCommandSide_ChangeUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -770,7 +770,7 @@ func TestCommandSide_ChangeUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -831,7 +831,7 @@ func TestCommandSide_ChangeUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -886,7 +886,7 @@ func TestCommandSide_ChangeUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -942,7 +942,7 @@ func TestCommandSide_ChangeUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1014,7 +1014,7 @@ func TestCommandSide_ChangeUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1250,7 +1250,7 @@ func TestCommandSide_DeactivateUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1265,7 +1265,7 @@ func TestCommandSide_DeactivateUserGrant(t *testing.T) { userGrantID: "usergrant1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1282,7 +1282,7 @@ func TestCommandSide_DeactivateUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1314,7 +1314,7 @@ func TestCommandSide_DeactivateUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1339,7 +1339,7 @@ func TestCommandSide_DeactivateUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPermissionDenied, + err: zerrors.IsPermissionDenied, }, }, { @@ -1368,7 +1368,7 @@ func TestCommandSide_DeactivateUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1454,7 +1454,7 @@ func TestCommandSide_ReactivateUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1469,7 +1469,7 @@ func TestCommandSide_ReactivateUserGrant(t *testing.T) { userGrantID: "usergrant1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1486,7 +1486,7 @@ func TestCommandSide_ReactivateUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1518,7 +1518,7 @@ func TestCommandSide_ReactivateUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1547,7 +1547,7 @@ func TestCommandSide_ReactivateUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPermissionDenied, + err: zerrors.IsPermissionDenied, }, }, { @@ -1572,7 +1572,7 @@ func TestCommandSide_ReactivateUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1662,7 +1662,7 @@ func TestCommandSide_RemoveUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1679,7 +1679,7 @@ func TestCommandSide_RemoveUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1711,7 +1711,7 @@ func TestCommandSide_RemoveUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1740,7 +1740,7 @@ func TestCommandSide_RemoveUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPermissionDenied, + err: zerrors.IsPermissionDenied, }, }, { @@ -1864,7 +1864,7 @@ func TestCommandSide_BulkRemoveUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1881,7 +1881,7 @@ func TestCommandSide_BulkRemoveUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1913,7 +1913,7 @@ func TestCommandSide_BulkRemoveUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1938,7 +1938,7 @@ func TestCommandSide_BulkRemoveUserGrant(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPermissionDenied, + err: zerrors.IsPermissionDenied, }, }, { diff --git a/internal/command/user_human.go b/internal/command/user_human.go index 13a553dbb..d4512fcc0 100644 --- a/internal/command/user_human.go +++ b/internal/command/user_human.go @@ -9,10 +9,10 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) getHuman(ctx context.Context, userID, resourceowner string) (*domain.Human, error) { @@ -21,7 +21,7 @@ func (c *Commands) getHuman(ctx context.Context, userID, resourceowner string) ( return nil, err } if !isUserStateExists(human.UserState) { - return nil, errors.ThrowNotFound(nil, "COMMAND-M9dsd", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-M9dsd", "Errors.User.NotFound") } return writeModelToHuman(human), nil } @@ -82,14 +82,14 @@ func (h *AddHuman) Validate(hasher *crypto.PasswordHasher) (err error) { return err } if h.Username = strings.TrimSpace(h.Username); h.Username == "" { - return errors.ThrowInvalidArgument(nil, "V2-zzad3", "Errors.Invalid.Argument") + return zerrors.ThrowInvalidArgument(nil, "V2-zzad3", "Errors.Invalid.Argument") } if h.FirstName = strings.TrimSpace(h.FirstName); h.FirstName == "" { - return errors.ThrowInvalidArgument(nil, "USER-UCej2", "Errors.User.Profile.FirstNameEmpty") + return zerrors.ThrowInvalidArgument(nil, "USER-UCej2", "Errors.User.Profile.FirstNameEmpty") } if h.LastName = strings.TrimSpace(h.LastName); h.LastName == "" { - return errors.ThrowInvalidArgument(nil, "USER-4hB7d", "Errors.User.Profile.LastNameEmpty") + return zerrors.ThrowInvalidArgument(nil, "USER-4hB7d", "Errors.User.Profile.LastNameEmpty") } h.ensureDisplayName() @@ -106,7 +106,7 @@ func (h *AddHuman) Validate(hasher *crypto.PasswordHasher) (err error) { } if h.EncodedPasswordHash != "" { if !hasher.EncodingSupported(h.EncodedPasswordHash) { - return errors.ThrowInvalidArgument(nil, "USER-JDk4t", "Errors.User.Password.NotSupported") + return zerrors.ThrowInvalidArgument(nil, "USER-JDk4t", "Errors.User.Password.NotSupported") } } return nil @@ -119,17 +119,17 @@ type AddMetadataEntry struct { func (m *AddMetadataEntry) Valid() error { if m.Key = strings.TrimSpace(m.Key); m.Key == "" { - return errors.ThrowInvalidArgument(nil, "USER-Drght", "Errors.User.Metadata.KeyEmpty") + return zerrors.ThrowInvalidArgument(nil, "USER-Drght", "Errors.User.Metadata.KeyEmpty") } if len(m.Value) == 0 { - return errors.ThrowInvalidArgument(nil, "USER-Dbgth", "Errors.User.Metadata.ValueEmpty") + return zerrors.ThrowInvalidArgument(nil, "USER-Dbgth", "Errors.User.Metadata.ValueEmpty") } return nil } func (c *Commands) AddHuman(ctx context.Context, resourceOwner string, human *AddHuman, allowInitMail bool) (err error) { if resourceOwner == "" { - return errors.ThrowInvalidArgument(nil, "COMMA-5Ky74", "Errors.Internal") + return zerrors.ThrowInvalidArgument(nil, "COMMA-5Ky74", "Errors.Internal") } cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, c.AddHumanCommand( @@ -288,7 +288,7 @@ func (c *Commands) addHumanCommandEmail(ctx context.Context, filter preparation. func addLink(ctx context.Context, filter preparation.FilterToQueryReducer, a *user.Aggregate, link *AddLink) (eventstore.Command, error) { exists, err := ExistsIDP(ctx, filter, link.IDPID, a.ResourceOwner) if !exists || err != nil { - return nil, errors.ThrowPreconditionFailed(err, "COMMAND-39nf2", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-39nf2", "Errors.IDPConfig.NotExisting") } return user.NewUserIDPLinkAddedEvent(ctx, &a.Aggregate, link.IDPID, link.DisplayName, link.IDPExternalID), nil } @@ -322,7 +322,7 @@ func (c *Commands) addHumanCommandCheckID(ctx context.Context, filter preparatio return err } if isUserStateExists(existingHuman.UserState) { - return errors.ThrowPreconditionFailed(nil, "COMMAND-k2unb", "Errors.User.AlreadyExisting") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-k2unb", "Errors.User.AlreadyExisting") } return nil } @@ -368,7 +368,7 @@ func userValidateDomain(ctx context.Context, a *user.Aggregate, username string, } if domainCheck.Verified && domainCheck.ResourceOwner != a.ResourceOwner { - return errors.ThrowInvalidArgument(nil, "COMMAND-SFd21", "Errors.User.DomainNotAllowedAsUsername") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-SFd21", "Errors.User.DomainNotAllowedAsUsername") } return nil @@ -413,15 +413,15 @@ func (h *AddHuman) shouldAddInitCode() bool { func (c *Commands) ImportHuman(ctx context.Context, orgID string, human *domain.Human, passwordless bool, links []*domain.UserIDPLink, initCodeGenerator, emailCodeGenerator, phoneCodeGenerator, passwordlessCodeGenerator crypto.Generator) (_ *domain.Human, passwordlessCode *domain.PasswordlessInitCode, err error) { if orgID == "" { - return nil, nil, errors.ThrowInvalidArgument(nil, "COMMAND-5N8fs", "Errors.ResourceOwnerMissing") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-5N8fs", "Errors.ResourceOwnerMissing") } domainPolicy, err := c.getOrgDomainPolicy(ctx, orgID) if err != nil { - return nil, nil, errors.ThrowPreconditionFailed(err, "COMMAND-2N9fs", "Errors.Org.DomainPolicy.NotFound") + return nil, nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-2N9fs", "Errors.Org.DomainPolicy.NotFound") } pwPolicy, err := c.getOrgPasswordComplexityPolicy(ctx, orgID) if err != nil { - return nil, nil, errors.ThrowPreconditionFailed(err, "COMMAND-4N8gs", "Errors.Org.PasswordComplexityPolicy.NotFound") + return nil, nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-4N8gs", "Errors.Org.PasswordComplexityPolicy.NotFound") } if human.AggregateID != "" { @@ -431,7 +431,7 @@ func (c *Commands) ImportHuman(ctx context.Context, orgID string, human *domain. } if existing.UserState != domain.UserStateUnspecified { - return nil, nil, errors.ThrowPreconditionFailed(nil, "COMMAND-ziuna", "Errors.User.AlreadyExisting") + return nil, nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-ziuna", "Errors.User.AlreadyExisting") } } @@ -461,23 +461,23 @@ func (c *Commands) ImportHuman(ctx context.Context, orgID string, human *domain. func (c *Commands) RegisterHuman(ctx context.Context, orgID string, human *domain.Human, link *domain.UserIDPLink, orgMemberRoles []string, initCodeGenerator, emailCodeGenerator, phoneCodeGenerator crypto.Generator) (*domain.Human, error) { if orgID == "" { - return nil, errors.ThrowInvalidArgument(nil, "COMMAND-GEdf2", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-GEdf2", "Errors.ResourceOwnerMissing") } domainPolicy, err := c.getOrgDomainPolicy(ctx, orgID) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "COMMAND-33M9f", "Errors.Org.DomainPolicy.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-33M9f", "Errors.Org.DomainPolicy.NotFound") } pwPolicy, err := c.getOrgPasswordComplexityPolicy(ctx, orgID) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "COMMAND-M5Fsd", "Errors.Org.PasswordComplexityPolicy.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-M5Fsd", "Errors.Org.PasswordComplexityPolicy.NotFound") } loginPolicy, err := c.getOrgLoginPolicy(ctx, orgID) if err != nil { - return nil, errors.ThrowPreconditionFailed(err, "COMMAND-Dfg3g", "Errors.Org.LoginPolicy.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-Dfg3g", "Errors.Org.LoginPolicy.NotFound") } // check only if local registration is allowed, the idp will be checked separately if !loginPolicy.AllowRegister && link == nil { - return nil, errors.ThrowPreconditionFailed(err, "COMMAND-SAbr3", "Errors.Org.LoginPolicy.RegistrationNotAllowed") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-SAbr3", "Errors.Org.LoginPolicy.RegistrationNotAllowed") } userEvents, registeredHuman, err := c.registerHuman(ctx, orgID, human, link, domainPolicy, pwPolicy, initCodeGenerator, emailCodeGenerator, phoneCodeGenerator) if err != nil { @@ -515,7 +515,7 @@ func (c *Commands) RegisterHuman(ctx context.Context, orgID string, human *domai func (c *Commands) importHuman(ctx context.Context, orgID string, human *domain.Human, passwordless bool, links []*domain.UserIDPLink, domainPolicy *domain.DomainPolicy, pwPolicy *domain.PasswordComplexityPolicy, initCodeGenerator, emailCodeGenerator, phoneCodeGenerator, passwordlessCodeGenerator crypto.Generator) (events []eventstore.Command, humanWriteModel *HumanWriteModel, passwordlessCodeWriteModel *HumanPasswordlessInitCodeWriteModel, code string, err error) { if orgID == "" { - return nil, nil, nil, "", errors.ThrowInvalidArgument(nil, "COMMAND-00p2b", "Errors.Org.Empty") + return nil, nil, nil, "", zerrors.ThrowInvalidArgument(nil, "COMMAND-00p2b", "Errors.Org.Empty") } if err := human.Normalize(); err != nil { return nil, nil, nil, "", err @@ -537,19 +537,19 @@ func (c *Commands) importHuman(ctx context.Context, orgID string, human *domain. func (c *Commands) registerHuman(ctx context.Context, orgID string, human *domain.Human, link *domain.UserIDPLink, domainPolicy *domain.DomainPolicy, pwPolicy *domain.PasswordComplexityPolicy, initCodeGenerator, emailCodeGenerator, phoneCodeGenerator crypto.Generator) ([]eventstore.Command, *HumanWriteModel, error) { if human == nil { - return nil, nil, errors.ThrowInvalidArgument(nil, "COMMAND-JKefw", "Errors.User.Invalid") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-JKefw", "Errors.User.Invalid") } if human.Username = strings.TrimSpace(human.Username); human.Username == "" { human.Username = string(human.EmailAddress) } if orgID == "" { - return nil, nil, errors.ThrowInvalidArgument(nil, "COMMAND-hYsVH", "Errors.Org.Empty") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-hYsVH", "Errors.Org.Empty") } if err := human.Normalize(); err != nil { return nil, nil, err } if link == nil && (human.Password == nil || human.Password.SecretString == "") { - return nil, nil, errors.ThrowInvalidArgument(nil, "COMMAND-X23na", "Errors.User.Password.Empty") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-X23na", "Errors.User.Password.Empty") } if human.Password != nil && human.Password.SecretString != "" { human.Password.ChangeRequired = false @@ -575,7 +575,7 @@ func (c *Commands) createHuman(ctx context.Context, orgID string, human *domain. return nil, nil, err } if domainCheck.Verified && domainCheck.ResourceOwner != orgID { - return nil, nil, errors.ThrowInvalidArgument(nil, "COMMAND-SFd21", "Errors.User.DomainNotAllowedAsUsername") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-SFd21", "Errors.User.DomainNotAllowedAsUsername") } } } @@ -646,7 +646,7 @@ func (c *Commands) createHuman(ctx context.Context, orgID string, human *domain. func (c *Commands) HumanSkipMFAInit(ctx context.Context, userID, resourceowner string) (err error) { if userID == "" { - return errors.ThrowInvalidArgument(nil, "COMMAND-2xpX9", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-2xpX9", "Errors.User.UserIDMissing") } existingHuman, err := c.getHumanWriteModelByID(ctx, userID, resourceowner) @@ -654,7 +654,7 @@ func (c *Commands) HumanSkipMFAInit(ctx context.Context, userID, resourceowner s return err } if !isUserStateExists(existingHuman.UserState) { - return errors.ThrowNotFound(nil, "COMMAND-m9cV8", "Errors.User.NotFound") + return zerrors.ThrowNotFound(nil, "COMMAND-m9cV8", "Errors.User.NotFound") } _, err = c.eventstore.Push(ctx, @@ -733,10 +733,10 @@ func createRegisterHumanEvent(ctx context.Context, aggregate *eventstore.Aggrega func (c *Commands) HumansSignOut(ctx context.Context, agentID string, userIDs []string) error { if agentID == "" { - return errors.ThrowInvalidArgument(nil, "COMMAND-2M0ds", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-2M0ds", "Errors.User.UserIDMissing") } if len(userIDs) == 0 { - return errors.ThrowInvalidArgument(nil, "COMMAND-M0od3", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-M0od3", "Errors.User.UserIDMissing") } events := make([]eventstore.Command, 0) for _, userID := range userIDs { diff --git a/internal/command/user_human_address.go b/internal/command/user_human_address.go index 61c92a806..2e1931567 100644 --- a/internal/command/user_human_address.go +++ b/internal/command/user_human_address.go @@ -4,8 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ChangeHumanAddress(ctx context.Context, address *domain.Address) (*domain.Address, error) { @@ -14,7 +14,7 @@ func (c *Commands) ChangeHumanAddress(ctx context.Context, address *domain.Addre return nil, err } if existingAddress.State == domain.AddressStateUnspecified || existingAddress.State == domain.AddressStateRemoved { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-0pLdo", "Errors.User.Address.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-0pLdo", "Errors.User.Address.NotFound") } userAgg := UserAggregateFromWriteModel(&existingAddress.WriteModel) changedEvent, hasChanged, err := existingAddress.NewChangedEvent(ctx, userAgg, address.Country, address.Locality, address.PostalCode, address.Region, address.StreetAddress) @@ -22,7 +22,7 @@ func (c *Commands) ChangeHumanAddress(ctx context.Context, address *domain.Addre return nil, err } if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3M0cs", "Errors.User.Address.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-3M0cs", "Errors.User.Address.NotChanged") } pushedEvents, err := c.eventstore.Push(ctx, changedEvent) if err != nil { diff --git a/internal/command/user_human_adress_test.go b/internal/command/user_human_adress_test.go index d3b3176e3..24a5397c8 100644 --- a/internal/command/user_human_adress_test.go +++ b/internal/command/user_human_adress_test.go @@ -8,10 +8,10 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ChangeHumanAddress(t *testing.T) { @@ -54,7 +54,7 @@ func TestCommandSide_ChangeHumanAddress(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -105,7 +105,7 @@ func TestCommandSide_ChangeHumanAddress(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/user_human_avatar.go b/internal/command/user_human_avatar.go index 8994bda94..2a1f67e6a 100644 --- a/internal/command/user_human_avatar.go +++ b/internal/command/user_human_avatar.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddHumanAvatar(ctx context.Context, orgID, userID string, upload *AssetUpload) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "USER-Ba5Ds", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "USER-Ba5Ds", "Errors.IDMissing") } existingUser, err := c.userWriteModelByID(ctx, userID, orgID) if err != nil { @@ -18,11 +18,11 @@ func (c *Commands) AddHumanAvatar(ctx context.Context, orgID, userID string, upl } if existingUser.UserState == domain.UserStateUnspecified || existingUser.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "USER-vJ3fS", "Errors.Users.NotFound") + return nil, zerrors.ThrowNotFound(nil, "USER-vJ3fS", "Errors.Users.NotFound") } asset, err := c.uploadAsset(ctx, upload) if err != nil { - return nil, caos_errs.ThrowInternal(err, "USER-1Xyud", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "USER-1Xyud", "Errors.Assets.Object.PutFailed") } userAgg := UserAggregateFromWriteModel(&existingUser.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanAvatarAddedEvent(ctx, userAgg, asset.VersionedName())) @@ -38,14 +38,14 @@ func (c *Commands) AddHumanAvatar(ctx context.Context, orgID, userID string, upl func (c *Commands) RemoveHumanAvatar(ctx context.Context, orgID, userID string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "USER-1B8sd", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "USER-1B8sd", "Errors.IDMissing") } existingUser, err := c.getHumanWriteModelByID(ctx, userID, orgID) if err != nil { return nil, err } if existingUser.UserState == domain.UserStateUnspecified || existingUser.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "USER-35N8f", "Errors.Users.NotFound") + return nil, zerrors.ThrowNotFound(nil, "USER-35N8f", "Errors.Users.NotFound") } err = c.removeAsset(ctx, orgID, existingUser.Avatar) if err != nil { diff --git a/internal/command/user_human_avatar_test.go b/internal/command/user_human_avatar_test.go index bac6659ae..70552e7e5 100644 --- a/internal/command/user_human_avatar_test.go +++ b/internal/command/user_human_avatar_test.go @@ -10,11 +10,11 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/static" "github.com/zitadel/zitadel/internal/static/mock" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddHumanAvatar(t *testing.T) { @@ -59,7 +59,7 @@ func TestCommandSide_AddHumanAvatar(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -84,7 +84,7 @@ func TestCommandSide_AddHumanAvatar(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -125,7 +125,7 @@ func TestCommandSide_AddHumanAvatar(t *testing.T) { }, }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -231,7 +231,7 @@ func TestCommandSide_RemoveHumanAvatar(t *testing.T) { storageKey: "key", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -249,7 +249,7 @@ func TestCommandSide_RemoveHumanAvatar(t *testing.T) { storageKey: "key", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -289,7 +289,7 @@ func TestCommandSide_RemoveHumanAvatar(t *testing.T) { storageKey: "key", }, res: res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { diff --git a/internal/command/user_human_email.go b/internal/command/user_human_email.go index cdc737a00..c98b396db 100644 --- a/internal/command/user_human_email.go +++ b/internal/command/user_human_email.go @@ -7,15 +7,15 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ChangeHumanEmail(ctx context.Context, email *domain.Email, emailCodeGenerator crypto.Generator) (*domain.Email, error) { if email.AggregateID == "" { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing") } if err := email.Validate(); err != nil { return nil, err @@ -26,17 +26,17 @@ func (c *Commands) ChangeHumanEmail(ctx context.Context, email *domain.Email, em return nil, err } if existingEmail.UserState == domain.UserStateUnspecified || existingEmail.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-0Pe4r", "Errors.User.Email.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-0Pe4r", "Errors.User.Email.NotFound") } if existingEmail.UserState == domain.UserStateInitial { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-J8dsk", "Errors.User.NotInitialised") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-J8dsk", "Errors.User.NotInitialised") } userAgg := UserAggregateFromWriteModel(&existingEmail.WriteModel) changedEvent, hasChanged := existingEmail.NewChangedEvent(ctx, userAgg, email.EmailAddress) // only continue if there were changes or there were no changes and the email should be set to verified if !hasChanged && !(email.IsEmailVerified && existingEmail.IsEmailVerified != email.IsEmailVerified) { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2b7fM", "Errors.User.Email.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-2b7fM", "Errors.User.Email.NotChanged") } events := make([]eventstore.Command, 0) @@ -66,10 +66,10 @@ func (c *Commands) ChangeHumanEmail(ctx context.Context, email *domain.Email, em func (c *Commands) VerifyHumanEmail(ctx context.Context, userID, code, resourceowner string, emailCodeGenerator crypto.Generator) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-4M0ds", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-4M0ds", "Errors.User.UserIDMissing") } if code == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-çm0ds", "Errors.User.Code.Empty") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-çm0ds", "Errors.User.Code.Empty") } existingCode, err := c.emailWriteModel(ctx, userID, resourceowner) @@ -77,7 +77,7 @@ func (c *Commands) VerifyHumanEmail(ctx context.Context, userID, code, resourceo return nil, err } if existingCode.Code == nil || existingCode.UserState == domain.UserStateUnspecified || existingCode.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-3n8ud", "Errors.User.Code.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-3n8ud", "Errors.User.Code.NotFound") } userAgg := UserAggregateFromWriteModel(&existingCode.WriteModel) @@ -96,12 +96,12 @@ func (c *Commands) VerifyHumanEmail(ctx context.Context, userID, code, resourceo _, err = c.eventstore.Push(ctx, user.NewHumanEmailVerificationFailedEvent(ctx, userAgg)) logging.LogWithFields("COMMAND-Dg2z5", "userID", userAgg.ID).OnError(err).Error("NewHumanEmailVerificationFailedEvent push failed") - return nil, caos_errs.ThrowInvalidArgument(err, "COMMAND-Gdsgs", "Errors.User.Code.Invalid") + return nil, zerrors.ThrowInvalidArgument(err, "COMMAND-Gdsgs", "Errors.User.Code.Invalid") } func (c *Commands) CreateHumanEmailVerificationCode(ctx context.Context, userID, resourceOwner string, emailCodeGenerator crypto.Generator) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-4M0ds", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-4M0ds", "Errors.User.UserIDMissing") } existingEmail, err := c.emailWriteModel(ctx, userID, resourceOwner) @@ -109,13 +109,13 @@ func (c *Commands) CreateHumanEmailVerificationCode(ctx context.Context, userID, return nil, err } if existingEmail.UserState == domain.UserStateUnspecified || existingEmail.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-0Pe4r", "Errors.User.Email.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-0Pe4r", "Errors.User.Email.NotFound") } if existingEmail.UserState == domain.UserStateInitial { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-E3fbw", "Errors.User.NotInitialised") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-E3fbw", "Errors.User.NotInitialised") } if existingEmail.IsEmailVerified { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3M9ds", "Errors.User.Email.AlreadyVerified") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-3M9ds", "Errors.User.Email.AlreadyVerified") } userAgg := UserAggregateFromWriteModel(&existingEmail.WriteModel) emailCode, _, err := domain.NewEmailCode(emailCodeGenerator) @@ -135,14 +135,14 @@ func (c *Commands) CreateHumanEmailVerificationCode(ctx context.Context, userID, func (c *Commands) HumanEmailVerificationCodeSent(ctx context.Context, orgID, userID string) (err error) { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-4m9fs", "Errors.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-4m9fs", "Errors.IDMissing") } existingEmail, err := c.emailWriteModel(ctx, userID, orgID) if err != nil { return err } if existingEmail.UserState == domain.UserStateUnspecified || existingEmail.UserState == domain.UserStateDeleted { - return caos_errs.ThrowNotFound(nil, "COMMAND-6n8uH", "Errors.User.Email.NotFound") + return zerrors.ThrowNotFound(nil, "COMMAND-6n8uH", "Errors.User.Email.NotFound") } userAgg := UserAggregateFromWriteModel(&existingEmail.WriteModel) _, err = c.eventstore.Push(ctx, user.NewHumanEmailCodeSentEvent(ctx, userAgg)) diff --git a/internal/command/user_human_email_test.go b/internal/command/user_human_email_test.go index d2861d90f..7abd65efe 100644 --- a/internal/command/user_human_email_test.go +++ b/internal/command/user_human_email_test.go @@ -10,10 +10,10 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ChangeHumanEmail(t *testing.T) { @@ -53,7 +53,7 @@ func TestCommandSide_ChangeHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -75,7 +75,7 @@ func TestCommandSide_ChangeHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -118,7 +118,7 @@ func TestCommandSide_ChangeHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -155,7 +155,7 @@ func TestCommandSide_ChangeHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -426,7 +426,7 @@ func TestCommandSide_VerifyHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -442,7 +442,7 @@ func TestCommandSide_VerifyHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -460,7 +460,7 @@ func TestCommandSide_VerifyHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -493,7 +493,7 @@ func TestCommandSide_VerifyHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -544,7 +544,7 @@ func TestCommandSide_VerifyHumanEmail(t *testing.T) { secretGenerator: GetMockSecretGenerator(t), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -652,7 +652,7 @@ func TestCommandSide_CreateVerificationCodeHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -669,7 +669,7 @@ func TestCommandSide_CreateVerificationCodeHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -707,7 +707,7 @@ func TestCommandSide_CreateVerificationCodeHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -744,7 +744,7 @@ func TestCommandSide_CreateVerificationCodeHumanEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -855,7 +855,7 @@ func TestCommandSide_EmailVerificationCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -872,7 +872,7 @@ func TestCommandSide_EmailVerificationCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/user_human_init.go b/internal/command/user_human_init.go index 5af8eb9a5..837bd3e90 100644 --- a/internal/command/user_human_init.go +++ b/internal/command/user_human_init.go @@ -7,15 +7,15 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) // ResendInitialMail resend initial mail and changes email if provided func (c *Commands) ResendInitialMail(ctx context.Context, userID string, email domain.EmailAddress, resourceOwner string, initCodeGenerator crypto.Generator) (objectDetails *domain.ObjectDetails, err error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-2n8vs", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-2n8vs", "Errors.User.UserIDMissing") } existingCode, err := c.getHumanInitWriteModelByID(ctx, userID, resourceOwner) @@ -23,10 +23,10 @@ func (c *Commands) ResendInitialMail(ctx context.Context, userID string, email d return nil, err } if existingCode.UserState == domain.UserStateUnspecified || existingCode.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-2M9df", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-2M9df", "Errors.User.NotFound") } if existingCode.UserState != domain.UserStateInitial { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2M9sd", "Errors.User.AlreadyInitialised") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-2M9sd", "Errors.User.AlreadyInitialised") } var events []eventstore.Command userAgg := UserAggregateFromWriteModel(&existingCode.WriteModel) @@ -52,10 +52,10 @@ func (c *Commands) ResendInitialMail(ctx context.Context, userID string, email d func (c *Commands) HumanVerifyInitCode(ctx context.Context, userID, resourceOwner, code, password string, initCodeGenerator crypto.Generator) error { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-mkM9f", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-mkM9f", "Errors.User.UserIDMissing") } if code == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-44G8s", "Errors.User.Code.Empty") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-44G8s", "Errors.User.Code.Empty") } existingCode, err := c.getHumanInitWriteModelByID(ctx, userID, resourceOwner) @@ -63,7 +63,7 @@ func (c *Commands) HumanVerifyInitCode(ctx context.Context, userID, resourceOwne return err } if existingCode.Code == nil || existingCode.UserState == domain.UserStateUnspecified || existingCode.UserState == domain.UserStateDeleted { - return caos_errs.ThrowNotFound(nil, "COMMAND-mmn5f", "Errors.User.Code.NotFound") + return zerrors.ThrowNotFound(nil, "COMMAND-mmn5f", "Errors.User.Code.NotFound") } userAgg := UserAggregateFromWriteModel(&existingCode.WriteModel) @@ -71,7 +71,7 @@ func (c *Commands) HumanVerifyInitCode(ctx context.Context, userID, resourceOwne if err != nil { _, err = c.eventstore.Push(ctx, user.NewHumanInitializedCheckFailedEvent(ctx, userAgg)) logging.WithFields("userID", userAgg.ID).OnError(err).Error("NewHumanInitializedCheckFailedEvent push failed") - return caos_errs.ThrowInvalidArgument(err, "COMMAND-11v6G", "Errors.User.Code.Invalid") + return zerrors.ThrowInvalidArgument(err, "COMMAND-11v6G", "Errors.User.Code.Invalid") } commands := []eventstore.Command{ user.NewHumanInitializedCheckSucceededEvent(ctx, userAgg), @@ -94,14 +94,14 @@ func (c *Commands) HumanVerifyInitCode(ctx context.Context, userID, resourceOwne func (c *Commands) HumanInitCodeSent(ctx context.Context, orgID, userID string) (err error) { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-3M9fs", "Errors.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-3M9fs", "Errors.IDMissing") } existingInitCode, err := c.getHumanInitWriteModelByID(ctx, userID, orgID) if err != nil { return err } if existingInitCode.UserState == domain.UserStateUnspecified || existingInitCode.UserState == domain.UserStateDeleted { - return caos_errs.ThrowNotFound(nil, "COMMAND-556zg", "Errors.User.Code.NotFound") + return zerrors.ThrowNotFound(nil, "COMMAND-556zg", "Errors.User.Code.NotFound") } userAgg := UserAggregateFromWriteModel(&existingInitCode.WriteModel) _, err = c.eventstore.Push(ctx, user.NewHumanInitialCodeSentEvent(ctx, userAgg)) diff --git a/internal/command/user_human_init_test.go b/internal/command/user_human_init_test.go index e221b8665..cc9dc21b0 100644 --- a/internal/command/user_human_init_test.go +++ b/internal/command/user_human_init_test.go @@ -10,10 +10,10 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ResendInitialMail(t *testing.T) { @@ -49,7 +49,7 @@ func TestCommandSide_ResendInitialMail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -66,7 +66,7 @@ func TestCommandSide_ResendInitialMail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -101,7 +101,7 @@ func TestCommandSide_ResendInitialMail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -325,7 +325,7 @@ func TestCommandSide_VerifyInitCode(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -341,7 +341,7 @@ func TestCommandSide_VerifyInitCode(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -359,7 +359,7 @@ func TestCommandSide_VerifyInitCode(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -392,7 +392,7 @@ func TestCommandSide_VerifyInitCode(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -443,7 +443,7 @@ func TestCommandSide_VerifyInitCode(t *testing.T) { secretGenerator: GetMockSecretGenerator(t), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -626,7 +626,7 @@ func TestCommandSide_InitCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -643,7 +643,7 @@ func TestCommandSide_InitCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/user_human_otp.go b/internal/command/user_human_otp.go index 103899e58..c6692526a 100644 --- a/internal/command/user_human_otp.go +++ b/internal/command/user_human_otp.go @@ -10,10 +10,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ImportHumanTOTP(ctx context.Context, userID, userAgentID, resourceOwner string, key string) error { @@ -30,7 +30,7 @@ func (c *Commands) ImportHumanTOTP(ctx context.Context, userID, userAgentID, res return err } if otpWriteModel.State == domain.MFAStateReady { - return caos_errs.ThrowAlreadyExists(nil, "COMMAND-do9se", "Errors.User.MFA.OTP.AlreadyReady") + return zerrors.ThrowAlreadyExists(nil, "COMMAND-do9se", "Errors.User.MFA.OTP.AlreadyReady") } userAgg := UserAggregateFromWriteModel(&otpWriteModel.WriteModel) @@ -43,7 +43,7 @@ func (c *Commands) ImportHumanTOTP(ctx context.Context, userID, userAgentID, res func (c *Commands) AddHumanTOTP(ctx context.Context, userID, resourceOwner string) (*domain.TOTP, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-5M0sd", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-5M0sd", "Errors.User.UserIDMissing") } prep, err := c.createHumanTOTP(ctx, userID, resourceOwner) if err != nil { @@ -71,17 +71,17 @@ func (c *Commands) createHumanTOTP(ctx context.Context, userID, resourceOwner st human, err := c.getHuman(ctx, userID, resourceOwner) if err != nil { logging.WithError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Debug("unable to get human for loginname") - return nil, caos_errs.ThrowPreconditionFailed(err, "COMMAND-SqyJz", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-SqyJz", "Errors.User.NotFound") } org, err := c.getOrg(ctx, human.ResourceOwner) if err != nil { logging.WithError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Debug("unable to get org for loginname") - return nil, caos_errs.ThrowPreconditionFailed(err, "COMMAND-55M9f", "Errors.Org.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-55M9f", "Errors.Org.NotFound") } orgPolicy, err := c.getOrgDomainPolicy(ctx, org.AggregateID) if err != nil { logging.WithError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Debug("unable to get org policy for loginname") - return nil, caos_errs.ThrowPreconditionFailed(err, "COMMAND-8ugTs", "Errors.Org.DomainPolicy.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-8ugTs", "Errors.Org.DomainPolicy.NotFound") } otpWriteModel, err := c.totpWriteModelByID(ctx, userID, resourceOwner) @@ -89,7 +89,7 @@ func (c *Commands) createHumanTOTP(ctx context.Context, userID, resourceOwner st return nil, err } if otpWriteModel.State == domain.MFAStateReady { - return nil, caos_errs.ThrowAlreadyExists(nil, "COMMAND-do9se", "Errors.User.MFA.OTP.AlreadyReady") + return nil, zerrors.ThrowAlreadyExists(nil, "COMMAND-do9se", "Errors.User.MFA.OTP.AlreadyReady") } userAgg := UserAggregateFromWriteModel(&otpWriteModel.WriteModel) @@ -117,7 +117,7 @@ func (c *Commands) createHumanTOTP(ctx context.Context, userID, resourceOwner st func (c *Commands) HumanCheckMFATOTPSetup(ctx context.Context, userID, code, userAgentID, resourceOwner string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-8N9ds", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-8N9ds", "Errors.User.UserIDMissing") } existingOTP, err := c.totpWriteModelByID(ctx, userID, resourceOwner) @@ -125,10 +125,10 @@ func (c *Commands) HumanCheckMFATOTPSetup(ctx context.Context, userID, code, use return nil, err } if existingOTP.State == domain.MFAStateUnspecified || existingOTP.State == domain.MFAStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-3Mif9s", "Errors.User.MFA.OTP.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-3Mif9s", "Errors.User.MFA.OTP.NotExisting") } if existingOTP.State == domain.MFAStateReady { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-qx4ls", "Errors.Users.MFA.OTP.AlreadyReady") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-qx4ls", "Errors.Users.MFA.OTP.AlreadyReady") } if err := domain.VerifyTOTP(code, existingOTP.Secret, c.multifactors.OTP.CryptoMFA); err != nil { return nil, err @@ -148,14 +148,14 @@ func (c *Commands) HumanCheckMFATOTPSetup(ctx context.Context, userID, code, use func (c *Commands) HumanCheckMFATOTP(ctx context.Context, userID, code, resourceOwner string, authRequest *domain.AuthRequest) error { if userID == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-8N9ds", "Errors.User.UserIDMissing") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-8N9ds", "Errors.User.UserIDMissing") } existingOTP, err := c.totpWriteModelByID(ctx, userID, resourceOwner) if err != nil { return err } if existingOTP.State != domain.MFAStateReady { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3Mif9s", "Errors.User.MFA.OTP.NotReady") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-3Mif9s", "Errors.User.MFA.OTP.NotReady") } userAgg := UserAggregateFromWriteModel(&existingOTP.WriteModel) err = domain.VerifyTOTP(code, existingOTP.Secret, c.multifactors.OTP.CryptoMFA) @@ -170,7 +170,7 @@ func (c *Commands) HumanCheckMFATOTP(ctx context.Context, userID, code, resource func (c *Commands) HumanRemoveTOTP(ctx context.Context, userID, resourceOwner string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-5M0sd", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-5M0sd", "Errors.User.UserIDMissing") } existingOTP, err := c.totpWriteModelByID(ctx, userID, resourceOwner) @@ -178,7 +178,7 @@ func (c *Commands) HumanRemoveTOTP(ctx context.Context, userID, resourceOwner st return nil, err } if existingOTP.State == domain.MFAStateUnspecified || existingOTP.State == domain.MFAStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Hd9sd", "Errors.User.MFA.OTP.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-Hd9sd", "Errors.User.MFA.OTP.NotExisting") } userAgg := UserAggregateFromWriteModel(&existingOTP.WriteModel) pushedEvents, err := c.eventstore.Push(ctx, user.NewHumanOTPRemovedEvent(ctx, userAgg)) @@ -213,7 +213,7 @@ func (c *Commands) AddHumanOTPSMSWithCheckSucceeded(ctx context.Context, userID, func (c *Commands) addHumanOTPSMS(ctx context.Context, userID, resourceOwner string, events ...eventCallback) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-QSF2s", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-QSF2s", "Errors.User.UserIDMissing") } if err := authz.UserIDInCTX(ctx, userID); err != nil { return nil, err @@ -223,10 +223,10 @@ func (c *Commands) addHumanOTPSMS(ctx context.Context, userID, resourceOwner str return nil, err } if otpWriteModel.otpAdded { - return nil, caos_errs.ThrowAlreadyExists(nil, "COMMAND-Ad3g2", "Errors.User.MFA.OTP.AlreadyReady") + return nil, zerrors.ThrowAlreadyExists(nil, "COMMAND-Ad3g2", "Errors.User.MFA.OTP.AlreadyReady") } if !otpWriteModel.phoneVerified { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Q54j2", "Errors.User.MFA.OTP.NotReady") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Q54j2", "Errors.User.MFA.OTP.NotReady") } userAgg := UserAggregateFromWriteModel(&otpWriteModel.WriteModel) cmds := make([]eventstore.Command, len(events)+1) @@ -242,7 +242,7 @@ func (c *Commands) addHumanOTPSMS(ctx context.Context, userID, resourceOwner str func (c *Commands) RemoveHumanOTPSMS(ctx context.Context, userID, resourceOwner string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-S3br2", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-S3br2", "Errors.User.UserIDMissing") } existingOTP, err := c.otpSMSWriteModelByID(ctx, userID, resourceOwner) @@ -255,7 +255,7 @@ func (c *Commands) RemoveHumanOTPSMS(ctx context.Context, userID, resourceOwner } } if !existingOTP.otpAdded { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Sr3h3", "Errors.User.MFA.OTP.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-Sr3h3", "Errors.User.MFA.OTP.NotExisting") } userAgg := UserAggregateFromWriteModel(&existingOTP.WriteModel) if err = c.pushAppendAndReduce(ctx, existingOTP, user.NewHumanOTPSMSRemovedEvent(ctx, userAgg)); err != nil { @@ -336,17 +336,17 @@ func (c *Commands) AddHumanOTPEmailWithCheckSucceeded(ctx context.Context, userI func (c *Commands) addHumanOTPEmail(ctx context.Context, userID, resourceOwner string, events ...eventCallback) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-Sg1hz", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Sg1hz", "Errors.User.UserIDMissing") } otpWriteModel, err := c.otpEmailWriteModelByID(ctx, userID, resourceOwner) if err != nil { return nil, err } if otpWriteModel.otpAdded { - return nil, caos_errs.ThrowAlreadyExists(nil, "COMMAND-MKL2s", "Errors.User.MFA.OTP.AlreadyReady") + return nil, zerrors.ThrowAlreadyExists(nil, "COMMAND-MKL2s", "Errors.User.MFA.OTP.AlreadyReady") } if !otpWriteModel.emailVerified { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-KLJ2d", "Errors.User.MFA.OTP.NotReady") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-KLJ2d", "Errors.User.MFA.OTP.NotReady") } userAgg := UserAggregateFromWriteModel(&otpWriteModel.WriteModel) cmds := make([]eventstore.Command, len(events)+1) @@ -362,7 +362,7 @@ func (c *Commands) addHumanOTPEmail(ctx context.Context, userID, resourceOwner s func (c *Commands) RemoveHumanOTPEmail(ctx context.Context, userID, resourceOwner string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-S2h11", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-S2h11", "Errors.User.UserIDMissing") } existingOTP, err := c.otpEmailWriteModelByID(ctx, userID, resourceOwner) @@ -375,7 +375,7 @@ func (c *Commands) RemoveHumanOTPEmail(ctx context.Context, userID, resourceOwne } } if !existingOTP.otpAdded { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-b312D", "Errors.User.MFA.OTP.NotExisting") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-b312D", "Errors.User.MFA.OTP.NotExisting") } userAgg := UserAggregateFromWriteModel(&existingOTP.WriteModel) if err = c.pushAppendAndReduce(ctx, existingOTP, user.NewHumanOTPEmailRemovedEvent(ctx, userAgg)); err != nil { @@ -446,14 +446,14 @@ func (c *Commands) sendHumanOTP( codeAddedEvent func(ctx context.Context, aggregate *eventstore.Aggregate, code *crypto.CryptoValue, expiry time.Duration, info *user.AuthRequestInfo) eventstore.Command, ) (err error) { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-S3SF1", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-S3SF1", "Errors.User.UserIDMissing") } existingOTP, err := writeModelByID(ctx, userID, resourceOwner) if err != nil { return err } if !existingOTP.OTPAdded() { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SFD52", "Errors.User.MFA.OTP.NotReady") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-SFD52", "Errors.User.MFA.OTP.NotReady") } config, err := secretGeneratorConfigWithDefault(ctx, c.eventstore.Filter, secretGeneratorType, defaultSecretGenerator) if err != nil { @@ -476,14 +476,14 @@ func (c *Commands) humanOTPSent( codeSentEvent func(ctx context.Context, aggregate *eventstore.Aggregate) eventstore.Command, ) (err error) { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-AE2h2", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-AE2h2", "Errors.User.UserIDMissing") } existingOTP, err := writeModelByID(ctx, userID, resourceOwner) if err != nil { return err } if !existingOTP.OTPAdded() { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SD3gh", "Errors.User.MFA.OTP.NotReady") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-SD3gh", "Errors.User.MFA.OTP.NotReady") } userAgg := &user.NewAggregate(userID, resourceOwner).Aggregate _, err = c.eventstore.Push(ctx, codeSentEvent(ctx, userAgg)) @@ -499,20 +499,20 @@ func (c *Commands) humanCheckOTP( checkFailedEvent func(ctx context.Context, aggregate *eventstore.Aggregate, info *user.AuthRequestInfo) eventstore.Command, ) error { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-S453v", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-S453v", "Errors.User.UserIDMissing") } if code == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-SJl2g", "Errors.User.Code.Empty") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-SJl2g", "Errors.User.Code.Empty") } existingOTP, err := writeModelByID(ctx, userID, resourceOwner) if err != nil { return err } if !existingOTP.OTPAdded() { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-d2r52", "Errors.User.MFA.OTP.NotReady") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-d2r52", "Errors.User.MFA.OTP.NotReady") } if existingOTP.Code() == nil { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-S34gh", "Errors.User.Code.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-S34gh", "Errors.User.Code.NotFound") } userAgg := &user.NewAggregate(userID, existingOTP.ResourceOwner()).Aggregate err = crypto.VerifyCodeWithAlgorithm(existingOTP.CodeCreationDate(), existingOTP.CodeExpiry(), existingOTP.Code(), code, c.userEncryption) diff --git a/internal/command/user_human_otp_test.go b/internal/command/user_human_otp_test.go index 080e9cb86..490751610 100644 --- a/internal/command/user_human_otp_test.go +++ b/internal/command/user_human_otp_test.go @@ -16,11 +16,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddHumanTOTP(t *testing.T) { @@ -57,7 +57,7 @@ func TestCommandSide_AddHumanTOTP(t *testing.T) { userID: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -74,7 +74,7 @@ func TestCommandSide_AddHumanTOTP(t *testing.T) { userID: "user1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -105,7 +105,7 @@ func TestCommandSide_AddHumanTOTP(t *testing.T) { userID: "user1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -143,7 +143,7 @@ func TestCommandSide_AddHumanTOTP(t *testing.T) { userID: "user1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -202,7 +202,7 @@ func TestCommandSide_AddHumanTOTP(t *testing.T) { userID: "user1", }, res: res{ - err: caos_errs.IsErrorAlreadyExists, + err: zerrors.IsErrorAlreadyExists, }, }, } @@ -254,7 +254,7 @@ func TestCommands_createHumanTOTP(t *testing.T) { resourceOwner: "org1", userID: "user1", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SqyJz", "Errors.User.NotFound"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-SqyJz", "Errors.User.NotFound"), }, { name: "org not existing, not found error", @@ -285,7 +285,7 @@ func TestCommands_createHumanTOTP(t *testing.T) { resourceOwner: "org1", userID: "user1", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-55M9f", "Errors.Org.NotFound"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-55M9f", "Errors.Org.NotFound"), }, { name: "org iam policy not existing, not found error", @@ -325,7 +325,7 @@ func TestCommands_createHumanTOTP(t *testing.T) { resourceOwner: "org1", userID: "user1", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-8ugTs", "Errors.Org.DomainPolicy.NotFound"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-8ugTs", "Errors.Org.DomainPolicy.NotFound"), }, { name: "otp already exists, already exists error", @@ -389,7 +389,7 @@ func TestCommands_createHumanTOTP(t *testing.T) { resourceOwner: "org1", userID: "user1", }, - wantErr: caos_errs.ThrowAlreadyExists(nil, "COMMAND-do9se", "Errors.User.MFA.OTP.AlreadyReady"), + wantErr: zerrors.ThrowAlreadyExists(nil, "COMMAND-do9se", "Errors.User.MFA.OTP.AlreadyReady"), }, { name: "issuer not in context", @@ -438,7 +438,7 @@ func TestCommands_createHumanTOTP(t *testing.T) { resourceOwner: "org1", userID: "user1", }, - wantErr: caos_errs.ThrowInternal(nil, "TOTP-ieY3o", "Errors.Internal"), + wantErr: zerrors.ThrowInternal(nil, "TOTP-ieY3o", "Errors.Internal"), }, { name: "success", @@ -544,7 +544,7 @@ func TestCommands_HumanCheckMFATOTPSetup(t *testing.T) { { name: "missing user id", args: args{}, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-8N9ds", "Errors.User.UserIDMissing"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-8N9ds", "Errors.User.UserIDMissing"), }, { name: "filter error", @@ -578,7 +578,7 @@ func TestCommands_HumanCheckMFATOTPSetup(t *testing.T) { resourceOwner: "org1", userID: "user1", }, - wantErr: caos_errs.ThrowNotFound(nil, "COMMAND-3Mif9s", "Errors.User.MFA.OTP.NotExisting"), + wantErr: zerrors.ThrowNotFound(nil, "COMMAND-3Mif9s", "Errors.User.MFA.OTP.NotExisting"), }, { name: "otp already ready error", @@ -602,7 +602,7 @@ func TestCommands_HumanCheckMFATOTPSetup(t *testing.T) { resourceOwner: "org1", userID: "user1", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-qx4ls", "Errors.Users.MFA.OTP.AlreadyReady"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-qx4ls", "Errors.Users.MFA.OTP.AlreadyReady"), }, { name: "wrong code", @@ -621,7 +621,7 @@ func TestCommands_HumanCheckMFATOTPSetup(t *testing.T) { code: "wrong", userID: "user1", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "EVENT-8isk2", "Errors.User.MFA.OTP.InvalidCode"), + wantErr: zerrors.ThrowInvalidArgument(nil, "EVENT-8isk2", "Errors.User.MFA.OTP.InvalidCode"), }, { name: "push error", @@ -727,7 +727,7 @@ func TestCommandSide_RemoveHumanTOTP(t *testing.T) { userID: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -744,7 +744,7 @@ func TestCommandSide_RemoveHumanTOTP(t *testing.T) { userID: "user1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -831,7 +831,7 @@ func TestCommandSide_AddHumanOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-QSF2s", "Errors.User.UserIDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-QSF2s", "Errors.User.UserIDMissing"), }, }, { @@ -845,7 +845,7 @@ func TestCommandSide_AddHumanOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong"), + err: zerrors.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong"), }, }, { @@ -867,7 +867,7 @@ func TestCommandSide_AddHumanOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowAlreadyExists(nil, "COMMAND-Ad3g2", "Errors.User.MFA.OTP.AlreadyReady"), + err: zerrors.ThrowAlreadyExists(nil, "COMMAND-Ad3g2", "Errors.User.MFA.OTP.AlreadyReady"), }, }, { @@ -883,7 +883,7 @@ func TestCommandSide_AddHumanOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Q54j2", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Q54j2", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -916,7 +916,7 @@ func TestCommandSide_AddHumanOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Q54j2", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Q54j2", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -1128,7 +1128,7 @@ func TestCommandSide_RemoveHumanOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-S3br2", "Errors.User.UserIDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-S3br2", "Errors.User.UserIDMissing"), }, }, { @@ -1145,7 +1145,7 @@ func TestCommandSide_RemoveHumanOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + err: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, }, { @@ -1162,7 +1162,7 @@ func TestCommandSide_RemoveHumanOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowNotFound(nil, "COMMAND-Sr3h3", "Errors.User.MFA.OTP.NotExisting"), + err: zerrors.ThrowNotFound(nil, "COMMAND-Sr3h3", "Errors.User.MFA.OTP.NotExisting"), }, }, { @@ -1256,7 +1256,7 @@ func TestCommandSide_HumanSendOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-S3SF1", "Errors.User.UserIDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-S3SF1", "Errors.User.UserIDMissing"), }, }, { @@ -1273,7 +1273,7 @@ func TestCommandSide_HumanSendOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SFD52", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-SFD52", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -1484,7 +1484,7 @@ func TestCommandSide_HumanOTPSMSCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-AE2h2", "Errors.User.UserIDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-AE2h2", "Errors.User.UserIDMissing"), }, }, { @@ -1500,7 +1500,7 @@ func TestCommandSide_HumanOTPSMSCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SD3gh", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-SD3gh", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -1581,7 +1581,7 @@ func TestCommandSide_HumanCheckOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-S453v", "Errors.User.UserIDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-S453v", "Errors.User.UserIDMissing"), }, }, { @@ -1596,7 +1596,7 @@ func TestCommandSide_HumanCheckOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-SJl2g", "Errors.User.Code.Empty"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-SJl2g", "Errors.User.Code.Empty"), }, }, { @@ -1613,7 +1613,7 @@ func TestCommandSide_HumanCheckOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-d2r52", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-d2r52", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -1636,7 +1636,7 @@ func TestCommandSide_HumanCheckOTPSMS(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-S34gh", "Errors.User.Code.NotFound"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-S34gh", "Errors.User.Code.NotFound"), }, }, { @@ -1704,7 +1704,7 @@ func TestCommandSide_HumanCheckOTPSMS(t *testing.T) { }, }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "CODE-woT0xc", "Errors.User.Code.Invalid"), + err: zerrors.ThrowInvalidArgument(nil, "CODE-woT0xc", "Errors.User.Code.Invalid"), }, }, { @@ -1823,7 +1823,7 @@ func TestCommandSide_AddHumanOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-Sg1hz", "Errors.User.UserIDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-Sg1hz", "Errors.User.UserIDMissing"), }, }, { @@ -1845,7 +1845,7 @@ func TestCommandSide_AddHumanOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowAlreadyExists(nil, "COMMAND-MKL2s", "Errors.User.MFA.OTP.AlreadyReady"), + err: zerrors.ThrowAlreadyExists(nil, "COMMAND-MKL2s", "Errors.User.MFA.OTP.AlreadyReady"), }, }, { @@ -1861,7 +1861,7 @@ func TestCommandSide_AddHumanOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-KLJ2d", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-KLJ2d", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -2073,7 +2073,7 @@ func TestCommandSide_RemoveHumanOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-S2h11", "Errors.User.UserIDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-S2h11", "Errors.User.UserIDMissing"), }, }, { @@ -2090,7 +2090,7 @@ func TestCommandSide_RemoveHumanOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + err: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, }, { @@ -2107,7 +2107,7 @@ func TestCommandSide_RemoveHumanOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowNotFound(nil, "COMMAND-b312D", "Errors.User.MFA.OTP.NotExisting"), + err: zerrors.ThrowNotFound(nil, "COMMAND-b312D", "Errors.User.MFA.OTP.NotExisting"), }, }, { @@ -2201,7 +2201,7 @@ func TestCommandSide_HumanSendOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-S3SF1", "Errors.User.UserIDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-S3SF1", "Errors.User.UserIDMissing"), }, }, { @@ -2218,7 +2218,7 @@ func TestCommandSide_HumanSendOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SFD52", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-SFD52", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -2429,7 +2429,7 @@ func TestCommandSide_HumanOTPEmailCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-AE2h2", "Errors.User.UserIDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-AE2h2", "Errors.User.UserIDMissing"), }, }, { @@ -2445,7 +2445,7 @@ func TestCommandSide_HumanOTPEmailCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SD3gh", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-SD3gh", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -2526,7 +2526,7 @@ func TestCommandSide_HumanCheckOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-S453v", "Errors.User.UserIDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-S453v", "Errors.User.UserIDMissing"), }, }, { @@ -2541,7 +2541,7 @@ func TestCommandSide_HumanCheckOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-SJl2g", "Errors.User.Code.Empty"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-SJl2g", "Errors.User.Code.Empty"), }, }, { @@ -2558,7 +2558,7 @@ func TestCommandSide_HumanCheckOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-d2r52", "Errors.User.MFA.OTP.NotReady"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-d2r52", "Errors.User.MFA.OTP.NotReady"), }, }, { @@ -2581,7 +2581,7 @@ func TestCommandSide_HumanCheckOTPEmail(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-S34gh", "Errors.User.Code.NotFound"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-S34gh", "Errors.User.Code.NotFound"), }, }, { @@ -2649,7 +2649,7 @@ func TestCommandSide_HumanCheckOTPEmail(t *testing.T) { }, }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "CODE-woT0xc", "Errors.User.Code.Invalid"), + err: zerrors.ThrowInvalidArgument(nil, "CODE-woT0xc", "Errors.User.Code.Invalid"), }, }, { diff --git a/internal/command/user_human_password.go b/internal/command/user_human_password.go index fa87770a5..1ccacabdf 100644 --- a/internal/command/user_human_password.go +++ b/internal/command/user_human_password.go @@ -9,24 +9,24 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) SetPassword(ctx context.Context, orgID, userID, password string, oneTime bool) (objectDetails *domain.ObjectDetails, err error) { ctx, span := tracing.NewSpan(ctx) defer func() { span.EndWithError(err) }() if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-3M0fs", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-3M0fs", "Errors.IDMissing") } wm, err := c.passwordWriteModel(ctx, userID, orgID) if err != nil { return nil, err } if !wm.UserState.Exists() { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3M0fs", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-3M0fs", "Errors.User.NotFound") } if err = c.checkPermission(ctx, domain.PermissionUserWrite, wm.ResourceOwner, userID); err != nil { return nil, err @@ -39,10 +39,10 @@ func (c *Commands) SetPasswordWithVerifyCode(ctx context.Context, orgID, userID, defer func() { span.EndWithError(err) }() if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-3M9fs", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-3M9fs", "Errors.IDMissing") } if password == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-Mf0sd", "Errors.User.Password.Empty") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Mf0sd", "Errors.User.Password.Empty") } wm, err := c.passwordWriteModel(ctx, userID, orgID) if err != nil { @@ -50,7 +50,7 @@ func (c *Commands) SetPasswordWithVerifyCode(ctx context.Context, orgID, userID, } if wm.Code == nil || wm.UserState == domain.UserStateUnspecified || wm.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2M9fs", "Errors.User.Code.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-2M9fs", "Errors.User.Code.NotFound") } err = crypto.VerifyCodeWithAlgorithm(wm.CodeCreationDate, wm.CodeExpiry, wm.Code, code, c.userEncryption) @@ -91,17 +91,17 @@ func (c *Commands) ChangePassword(ctx context.Context, orgID, userID, oldPasswor defer func() { span.EndWithError(err) }() if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-3M0fs", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-3M0fs", "Errors.IDMissing") } if oldPassword == "" || newPassword == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-3M0fs", "Errors.User.Password.Empty") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-3M0fs", "Errors.User.Password.Empty") } wm, err := c.passwordWriteModel(ctx, userID, orgID) if err != nil { return nil, err } if wm.EncodedHash == "" { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Fds3s", "Errors.User.Password.Empty") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Fds3s", "Errors.User.Password.Empty") } if err = c.canUpdatePassword(ctx, newPassword, wm); err != nil { return nil, err @@ -126,10 +126,10 @@ func (c *Commands) canUpdatePassword(ctx context.Context, newPassword string, wm defer func() { span.EndWithError(err) }() if wm.UserState == domain.UserStateUnspecified || wm.UserState == domain.UserStateDeleted { - return caos_errs.ThrowNotFound(nil, "COMMAND-G8dh3", "Errors.User.Password.NotFound") + return zerrors.ThrowNotFound(nil, "COMMAND-G8dh3", "Errors.User.Password.NotFound") } if wm.UserState == domain.UserStateInitial { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-M9dse", "Errors.User.NotInitialised") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-M9dse", "Errors.User.NotInitialised") } policy, err := c.getOrgPasswordComplexityPolicy(ctx, wm.ResourceOwner) if err != nil { @@ -144,7 +144,7 @@ func (c *Commands) canUpdatePassword(ctx context.Context, newPassword string, wm func (c *Commands) RequestSetPassword(ctx context.Context, userID, resourceOwner string, notifyType domain.NotificationType, passwordVerificationCode crypto.Generator) (objectDetails *domain.ObjectDetails, err error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-M00oL", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-M00oL", "Errors.User.UserIDMissing") } existingHuman, err := c.userWriteModelByID(ctx, userID, resourceOwner) @@ -152,10 +152,10 @@ func (c *Commands) RequestSetPassword(ctx context.Context, userID, resourceOwner return nil, err } if existingHuman.UserState == domain.UserStateUnspecified || existingHuman.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Hj9ds", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Hj9ds", "Errors.User.NotFound") } if existingHuman.UserState == domain.UserStateInitial { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2M9sd", "Errors.User.NotInitialised") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-2M9sd", "Errors.User.NotInitialised") } userAgg := UserAggregateFromWriteModel(&existingHuman.WriteModel) passwordCode, err := domain.NewPasswordCode(passwordVerificationCode) @@ -175,7 +175,7 @@ func (c *Commands) RequestSetPassword(ctx context.Context, userID, resourceOwner func (c *Commands) PasswordCodeSent(ctx context.Context, orgID, userID string) (err error) { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-meEfe", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-meEfe", "Errors.User.UserIDMissing") } existingPassword, err := c.passwordWriteModel(ctx, userID, orgID) @@ -183,7 +183,7 @@ func (c *Commands) PasswordCodeSent(ctx context.Context, orgID, userID string) ( return err } if existingPassword.UserState == domain.UserStateUnspecified || existingPassword.UserState == domain.UserStateDeleted { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3n77z", "Errors.User.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-3n77z", "Errors.User.NotFound") } userAgg := UserAggregateFromWriteModel(&existingPassword.WriteModel) _, err = c.eventstore.Push(ctx, user.NewHumanPasswordCodeSentEvent(ctx, userAgg)) @@ -192,7 +192,7 @@ func (c *Commands) PasswordCodeSent(ctx context.Context, orgID, userID string) ( func (c *Commands) PasswordChangeSent(ctx context.Context, orgID, userID string) (err error) { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-pqlm2n", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-pqlm2n", "Errors.User.UserIDMissing") } existingPassword, err := c.passwordWriteModel(ctx, userID, orgID) @@ -200,7 +200,7 @@ func (c *Commands) PasswordChangeSent(ctx context.Context, orgID, userID string) return err } if existingPassword.UserState == domain.UserStateUnspecified || existingPassword.UserState == domain.UserStateDeleted { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-x902b2v", "Errors.User.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-x902b2v", "Errors.User.NotFound") } userAgg := UserAggregateFromWriteModel(&existingPassword.WriteModel) _, err = c.eventstore.Push(ctx, user.NewHumanPasswordChangeSentEvent(ctx, userAgg)) @@ -212,18 +212,18 @@ func (c *Commands) HumanCheckPassword(ctx context.Context, orgID, userID, passwo defer func() { span.EndWithError(err) }() if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-4Mfsf", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-4Mfsf", "Errors.User.UserIDMissing") } if password == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-3n8fs", "Errors.User.Password.Empty") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-3n8fs", "Errors.User.Password.Empty") } loginPolicy, err := c.getOrgLoginPolicy(ctx, orgID) if err != nil { - return caos_errs.ThrowPreconditionFailed(err, "COMMAND-Edf3g", "Errors.Org.LoginPolicy.NotFound") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-Edf3g", "Errors.Org.LoginPolicy.NotFound") } if !loginPolicy.AllowUsernamePassword { - return caos_errs.ThrowPreconditionFailed(err, "COMMAND-Dft32", "Errors.Org.LoginPolicy.UsernamePasswordNotAllowed") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-Dft32", "Errors.Org.LoginPolicy.UsernamePasswordNotAllowed") } wm, err := c.passwordWriteModel(ctx, userID, orgID) @@ -231,14 +231,14 @@ func (c *Commands) HumanCheckPassword(ctx context.Context, orgID, userID, passwo return err } if wm.UserState == domain.UserStateUnspecified || wm.UserState == domain.UserStateDeleted { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3n77z", "Errors.User.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-3n77z", "Errors.User.NotFound") } if wm.UserState == domain.UserStateLocked { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-JLK35", "Errors.User.Locked") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-JLK35", "Errors.User.Locked") } if wm.EncodedHash == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3nJ4t", "Errors.User.Password.NotSet") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-3nJ4t", "Errors.User.Password.NotSet") } userAgg := UserAggregateFromWriteModel(&wm.WriteModel) @@ -254,7 +254,7 @@ func (c *Commands) HumanCheckPassword(ctx context.Context, orgID, userID, passwo return recheckErr } if wm.UserState == domain.UserStateLocked { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SFA3t", "Errors.User.Locked") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-SFA3t", "Errors.User.Locked") } if err == nil { @@ -294,10 +294,10 @@ func convertPasswapErr(err error) error { return nil } if errors.Is(err, passwap.ErrPasswordMismatch) { - return caos_errs.ThrowInvalidArgument(err, "COMMAND-3M0fs", "Errors.User.Password.Invalid") + return zerrors.ThrowInvalidArgument(err, "COMMAND-3M0fs", "Errors.User.Password.Invalid") } if errors.Is(err, passwap.ErrPasswordNoChange) { - return caos_errs.ThrowPreconditionFailed(err, "COMMAND-Aesh5", "Errors.User.Password.NotChanged") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-Aesh5", "Errors.User.Password.NotChanged") } - return caos_errs.ThrowInternal(err, "COMMAND-CahN2", "Errors.Internal") + return zerrors.ThrowInternal(err, "COMMAND-CahN2", "Errors.Internal") } diff --git a/internal/command/user_human_password_test.go b/internal/command/user_human_password_test.go index 3b72e85bf..d112cf7d9 100644 --- a/internal/command/user_human_password_test.go +++ b/internal/command/user_human_password_test.go @@ -14,10 +14,10 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_SetOneTimePassword(t *testing.T) { @@ -55,7 +55,7 @@ func TestCommandSide_SetOneTimePassword(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -72,7 +72,7 @@ func TestCommandSide_SetOneTimePassword(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -114,7 +114,7 @@ func TestCommandSide_SetOneTimePassword(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied")) + return errors.Is(err, zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied")) }, }, }, @@ -302,7 +302,7 @@ func TestCommandSide_SetPasswordWithVerifyCode(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -318,7 +318,7 @@ func TestCommandSide_SetPasswordWithVerifyCode(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -336,7 +336,7 @@ func TestCommandSide_SetPasswordWithVerifyCode(t *testing.T) { password: "password", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -370,7 +370,7 @@ func TestCommandSide_SetPasswordWithVerifyCode(t *testing.T) { password: "string", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -418,7 +418,7 @@ func TestCommandSide_SetPasswordWithVerifyCode(t *testing.T) { password: "password", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -553,7 +553,7 @@ func TestCommandSide_ChangePassword(t *testing.T) { }, expect: []expect{}, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -567,7 +567,7 @@ func TestCommandSide_ChangePassword(t *testing.T) { }, expect: []expect{}, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -581,7 +581,7 @@ func TestCommandSide_ChangePassword(t *testing.T) { }, expect: []expect{}, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -598,7 +598,7 @@ func TestCommandSide_ChangePassword(t *testing.T) { expectFilter(), }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -632,7 +632,7 @@ func TestCommandSide_ChangePassword(t *testing.T) { ), }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -689,7 +689,7 @@ func TestCommandSide_ChangePassword(t *testing.T) { ), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -813,7 +813,7 @@ func TestCommandSide_RequestSetPassword(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -830,7 +830,7 @@ func TestCommandSide_RequestSetPassword(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -879,7 +879,7 @@ func TestCommandSide_RequestSetPassword(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -988,7 +988,7 @@ func TestCommandSide_PasswordCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1005,7 +1005,7 @@ func TestCommandSide_PasswordCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1101,7 +1101,7 @@ func TestCommandSide_CheckPassword(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1117,7 +1117,7 @@ func TestCommandSide_CheckPassword(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1136,7 +1136,7 @@ func TestCommandSide_CheckPassword(t *testing.T) { password: "password", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1177,7 +1177,7 @@ func TestCommandSide_CheckPassword(t *testing.T) { password: "password", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1219,7 +1219,7 @@ func TestCommandSide_CheckPassword(t *testing.T) { password: "password", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1281,7 +1281,7 @@ func TestCommandSide_CheckPassword(t *testing.T) { password: "password", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1339,7 +1339,7 @@ func TestCommandSide_CheckPassword(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1423,7 +1423,7 @@ func TestCommandSide_CheckPassword(t *testing.T) { lockoutPolicy: &domain.LockoutPolicy{}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1513,7 +1513,7 @@ func TestCommandSide_CheckPassword(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1760,7 +1760,7 @@ func TestCommandSide_CheckPassword(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1893,17 +1893,17 @@ func Test_convertPasswapErr(t *testing.T) { { name: "mismatch", args: args{passwap.ErrPasswordMismatch}, - wantErr: caos_errs.ThrowInvalidArgument(passwap.ErrPasswordMismatch, "COMMAND-3M0fs", "Errors.User.Password.Invalid"), + wantErr: zerrors.ThrowInvalidArgument(passwap.ErrPasswordMismatch, "COMMAND-3M0fs", "Errors.User.Password.Invalid"), }, { name: "no change", args: args{passwap.ErrPasswordNoChange}, - wantErr: caos_errs.ThrowPreconditionFailed(passwap.ErrPasswordNoChange, "COMMAND-Aesh5", "Errors.User.Password.NotChanged"), + wantErr: zerrors.ThrowPreconditionFailed(passwap.ErrPasswordNoChange, "COMMAND-Aesh5", "Errors.User.Password.NotChanged"), }, { name: "other", args: args{io.ErrClosedPipe}, - wantErr: caos_errs.ThrowInternal(io.ErrClosedPipe, "COMMAND-CahN2", "Errors.Internal"), + wantErr: zerrors.ThrowInternal(io.ErrClosedPipe, "COMMAND-CahN2", "Errors.Internal"), }, } for _, tt := range tests { diff --git a/internal/command/user_human_phone.go b/internal/command/user_human_phone.go index 43395acd1..67a25f9bc 100644 --- a/internal/command/user_human_phone.go +++ b/internal/command/user_human_phone.go @@ -3,15 +3,14 @@ package command import ( "context" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ChangeHumanPhone(ctx context.Context, phone *domain.Phone, resourceOwner string, phoneCodeGenerator crypto.Generator) (*domain.Phone, error) { @@ -23,7 +22,7 @@ func (c *Commands) ChangeHumanPhone(ctx context.Context, phone *domain.Phone, re return nil, err } if !existingPhone.UserState.Exists() { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3M0fs", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-3M0fs", "Errors.User.NotFound") } userAgg := UserAggregateFromWriteModel(&existingPhone.WriteModel) @@ -31,7 +30,7 @@ func (c *Commands) ChangeHumanPhone(ctx context.Context, phone *domain.Phone, re // only continue if there were changes or there were no changes and the phone should be set to verified if !hasChanged && !(phone.IsPhoneVerified && existingPhone.IsPhoneVerified != phone.IsPhoneVerified) { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-wF94r", "Errors.User.Phone.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-wF94r", "Errors.User.Phone.NotChanged") } events := make([]eventstore.Command, 0) @@ -62,10 +61,10 @@ func (c *Commands) ChangeHumanPhone(ctx context.Context, phone *domain.Phone, re func (c *Commands) VerifyHumanPhone(ctx context.Context, userID, code, resourceowner string, phoneCodeGenerator crypto.Generator) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-Km9ds", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Km9ds", "Errors.User.UserIDMissing") } if code == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-wMe9f", "Errors.User.Code.Empty") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-wMe9f", "Errors.User.Code.Empty") } existingCode, err := c.phoneWriteModelByID(ctx, userID, resourceowner) @@ -73,10 +72,10 @@ func (c *Commands) VerifyHumanPhone(ctx context.Context, userID, code, resourceo return nil, err } if !existingCode.UserState.Exists() { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Rsj8c", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Rsj8c", "Errors.User.NotFound") } if !existingCode.State.Exists() || existingCode.Code == nil { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Rsj8c", "Errors.User.Code.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-Rsj8c", "Errors.User.Code.NotFound") } userAgg := UserAggregateFromWriteModel(&existingCode.WriteModel) @@ -94,12 +93,12 @@ func (c *Commands) VerifyHumanPhone(ctx context.Context, userID, code, resourceo } _, err = c.eventstore.Push(ctx, user.NewHumanPhoneVerificationFailedEvent(ctx, userAgg)) logging.LogWithFields("COMMAND-5M9ds", "userID", userAgg.ID).OnError(err).Error("NewHumanPhoneVerificationFailedEvent push failed") - return nil, caos_errs.ThrowInvalidArgument(err, "COMMAND-sM0cs", "Errors.User.Code.Invalid") + return nil, zerrors.ThrowInvalidArgument(err, "COMMAND-sM0cs", "Errors.User.Code.Invalid") } func (c *Commands) CreateHumanPhoneVerificationCode(ctx context.Context, userID, resourceowner string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-4M0ds", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-4M0ds", "Errors.User.UserIDMissing") } existingPhone, err := c.phoneWriteModelByID(ctx, userID, resourceowner) @@ -108,13 +107,13 @@ func (c *Commands) CreateHumanPhoneVerificationCode(ctx context.Context, userID, } if !existingPhone.UserState.Exists() { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2M0fs", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-2M0fs", "Errors.User.NotFound") } if !existingPhone.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-2b7Hf", "Errors.User.Phone.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-2b7Hf", "Errors.User.Phone.NotFound") } if existingPhone.IsPhoneVerified { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2M9sf", "Errors.User.Phone.AlreadyVerified") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-2M9sf", "Errors.User.Phone.AlreadyVerified") } config, err := secretGeneratorConfig(ctx, c.eventstore.Filter, domain.SecretGeneratorTypeVerifyPhoneCode) if err != nil { @@ -134,7 +133,7 @@ func (c *Commands) CreateHumanPhoneVerificationCode(ctx context.Context, userID, func (c *Commands) HumanPhoneVerificationCodeSent(ctx context.Context, orgID, userID string) (err error) { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-3m9Fs", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-3m9Fs", "Errors.User.UserIDMissing") } existingPhone, err := c.phoneWriteModelByID(ctx, userID, orgID) @@ -142,10 +141,10 @@ func (c *Commands) HumanPhoneVerificationCodeSent(ctx context.Context, orgID, us return err } if !existingPhone.UserState.Exists() { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3M9fs", "Errors.User.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-3M9fs", "Errors.User.NotFound") } if !existingPhone.State.Exists() { - return caos_errs.ThrowNotFound(nil, "COMMAND-66n8J", "Errors.User.Phone.NotFound") + return zerrors.ThrowNotFound(nil, "COMMAND-66n8J", "Errors.User.Phone.NotFound") } userAgg := UserAggregateFromWriteModel(&existingPhone.WriteModel) @@ -155,7 +154,7 @@ func (c *Commands) HumanPhoneVerificationCodeSent(ctx context.Context, orgID, us func (c *Commands) RemoveHumanPhone(ctx context.Context, userID, resourceOwner string) (*domain.ObjectDetails, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-6M0ds", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-6M0ds", "Errors.User.UserIDMissing") } existingPhone, err := c.phoneWriteModelByID(ctx, userID, resourceOwner) @@ -163,10 +162,10 @@ func (c *Commands) RemoveHumanPhone(ctx context.Context, userID, resourceOwner s return nil, err } if !existingPhone.UserState.Exists() { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3M9fs", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-3M9fs", "Errors.User.NotFound") } if !existingPhone.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-p6rsc", "Errors.User.Phone.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-p6rsc", "Errors.User.Phone.NotFound") } userAgg := UserAggregateFromWriteModel(&existingPhone.WriteModel) diff --git a/internal/command/user_human_phone_test.go b/internal/command/user_human_phone_test.go index 4755b479b..ae9784cc0 100644 --- a/internal/command/user_human_phone_test.go +++ b/internal/command/user_human_phone_test.go @@ -11,11 +11,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ChangeHumanPhone(t *testing.T) { @@ -55,7 +55,7 @@ func TestCommandSide_ChangeHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -77,7 +77,7 @@ func TestCommandSide_ChangeHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -120,7 +120,7 @@ func TestCommandSide_ChangeHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -409,7 +409,7 @@ func TestCommandSide_VerifyHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -425,7 +425,7 @@ func TestCommandSide_VerifyHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -443,7 +443,7 @@ func TestCommandSide_VerifyHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -476,7 +476,7 @@ func TestCommandSide_VerifyHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -533,7 +533,7 @@ func TestCommandSide_VerifyHumanPhone(t *testing.T) { secretGenerator: GetMockSecretGenerator(t), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -647,7 +647,7 @@ func TestCommandSide_CreateVerificationCodeHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -664,7 +664,7 @@ func TestCommandSide_CreateVerificationCodeHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -707,7 +707,7 @@ func TestCommandSide_CreateVerificationCodeHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -827,7 +827,7 @@ func TestCommandSide_PhoneVerificationCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -844,7 +844,7 @@ func TestCommandSide_PhoneVerificationCodeSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -936,7 +936,7 @@ func TestCommandSide_RemoveHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -953,7 +953,7 @@ func TestCommandSide_RemoveHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -985,7 +985,7 @@ func TestCommandSide_RemoveHumanPhone(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/user_human_profile.go b/internal/command/user_human_profile.go index e77f3288b..d518c2f14 100644 --- a/internal/command/user_human_profile.go +++ b/internal/command/user_human_profile.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) ChangeHumanProfile(ctx context.Context, profile *domain.Profile) (*domain.Profile, error) { if profile.AggregateID == "" { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-AwbEB", "Errors.User.Profile.IDMissing") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-AwbEB", "Errors.User.Profile.IDMissing") } if err := profile.Validate(); err != nil { return nil, err @@ -20,7 +20,7 @@ func (c *Commands) ChangeHumanProfile(ctx context.Context, profile *domain.Profi return nil, err } if existingProfile.UserState == domain.UserStateUnspecified || existingProfile.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3M9sd", "Errors.User.Profile.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-3M9sd", "Errors.User.Profile.NotFound") } userAgg := UserAggregateFromWriteModel(&existingProfile.WriteModel) changedEvent, hasChanged, err := existingProfile.NewChangedEvent(ctx, userAgg, profile.FirstName, profile.LastName, profile.NickName, profile.DisplayName, profile.PreferredLanguage, profile.Gender) @@ -28,7 +28,7 @@ func (c *Commands) ChangeHumanProfile(ctx context.Context, profile *domain.Profi return nil, err } if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2M0fs", "Errors.User.Profile.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-2M0fs", "Errors.User.Profile.NotChanged") } events, err := c.eventstore.Push(ctx, changedEvent) diff --git a/internal/command/user_human_profile_test.go b/internal/command/user_human_profile_test.go index e8849adf1..65075743d 100644 --- a/internal/command/user_human_profile_test.go +++ b/internal/command/user_human_profile_test.go @@ -8,10 +8,10 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - zitadel_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_ChangeHumanProfile(t *testing.T) { @@ -56,7 +56,7 @@ func TestCommandSide_ChangeHumanProfile(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: zitadel_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -98,7 +98,7 @@ func TestCommandSide_ChangeHumanProfile(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: zitadel_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/user_human_refresh_token.go b/internal/command/user_human_refresh_token.go index de7995d70..6c643f801 100644 --- a/internal/command/user_human_refresh_token.go +++ b/internal/command/user_human_refresh_token.go @@ -5,9 +5,9 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddAccessAndRefreshToken( @@ -46,7 +46,7 @@ func (c *Commands) AddNewRefreshTokenAndAccessToken( authTime time.Time, ) (accessToken *domain.Token, newRefreshToken string, err error) { if userID == "" || agentID == "" || clientID == "" { - return nil, "", caos_errs.ThrowInvalidArgument(nil, "COMMAND-adg4r", "Errors.IDMissing") + return nil, "", zerrors.ThrowInvalidArgument(nil, "COMMAND-adg4r", "Errors.IDMissing") } userWriteModel := NewUserWriteModel(userID, orgID) refreshTokenID, err := c.idGenerator.Next() @@ -114,7 +114,7 @@ func (c *Commands) RevokeRefreshToken(ctx context.Context, userID, orgID, tokenI func (c *Commands) RevokeRefreshTokens(ctx context.Context, userID, orgID string, tokenIDs []string) (err error) { if len(tokenIDs) == 0 { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-Gfj42", "Errors.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-Gfj42", "Errors.IDMissing") } events := make([]eventstore.Command, len(tokenIDs)) for i, tokenID := range tokenIDs { @@ -142,15 +142,15 @@ func (c *Commands) addRefreshToken(ctx context.Context, accessToken *domain.Toke func (c *Commands) renewRefreshToken(ctx context.Context, userID, orgID, refreshToken string, idleExpiration time.Duration) (event *user.HumanRefreshTokenRenewedEvent, refreshTokenID, newRefreshToken string, err error) { if refreshToken == "" { - return nil, "", "", caos_errs.ThrowInvalidArgument(nil, "COMMAND-DHrr3", "Errors.IDMissing") + return nil, "", "", zerrors.ThrowInvalidArgument(nil, "COMMAND-DHrr3", "Errors.IDMissing") } tokenUserID, tokenID, token, err := domain.FromRefreshToken(refreshToken, c.keyAlgorithm) if err != nil { - return nil, "", "", caos_errs.ThrowInvalidArgument(err, "COMMAND-Dbfe4", "Errors.User.RefreshToken.Invalid") + return nil, "", "", zerrors.ThrowInvalidArgument(err, "COMMAND-Dbfe4", "Errors.User.RefreshToken.Invalid") } if tokenUserID != userID { - return nil, "", "", caos_errs.ThrowInvalidArgument(nil, "COMMAND-Ht2g2", "Errors.User.RefreshToken.Invalid") + return nil, "", "", zerrors.ThrowInvalidArgument(nil, "COMMAND-Ht2g2", "Errors.User.RefreshToken.Invalid") } refreshTokenWriteModel := NewHumanRefreshTokenWriteModel(userID, orgID, tokenID) err = c.eventstore.FilterToQueryReducer(ctx, refreshTokenWriteModel) @@ -158,12 +158,12 @@ func (c *Commands) renewRefreshToken(ctx context.Context, userID, orgID, refresh return nil, "", "", err } if refreshTokenWriteModel.UserState != domain.UserStateActive { - return nil, "", "", caos_errs.ThrowInvalidArgument(nil, "COMMAND-BHnhs", "Errors.User.RefreshToken.Invalid") + return nil, "", "", zerrors.ThrowInvalidArgument(nil, "COMMAND-BHnhs", "Errors.User.RefreshToken.Invalid") } if refreshTokenWriteModel.RefreshToken != token || refreshTokenWriteModel.IdleExpiration.Before(time.Now()) || refreshTokenWriteModel.Expiration.Before(time.Now()) { - return nil, "", "", caos_errs.ThrowInvalidArgument(nil, "COMMAND-Vr43e", "Errors.User.RefreshToken.Invalid") + return nil, "", "", zerrors.ThrowInvalidArgument(nil, "COMMAND-Vr43e", "Errors.User.RefreshToken.Invalid") } newToken, err := c.idGenerator.Next() @@ -180,7 +180,7 @@ func (c *Commands) renewRefreshToken(ctx context.Context, userID, orgID, refresh func (c *Commands) removeRefreshToken(ctx context.Context, userID, orgID, tokenID string) (*user.HumanRefreshTokenRemovedEvent, *HumanRefreshTokenWriteModel, error) { if userID == "" || orgID == "" || tokenID == "" { - return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-GVDgf", "Errors.IDMissing") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-GVDgf", "Errors.IDMissing") } refreshTokenWriteModel := NewHumanRefreshTokenWriteModel(userID, orgID, tokenID) err := c.eventstore.FilterToQueryReducer(ctx, refreshTokenWriteModel) @@ -188,7 +188,7 @@ func (c *Commands) removeRefreshToken(ctx context.Context, userID, orgID, tokenI return nil, nil, err } if refreshTokenWriteModel.UserState != domain.UserStateActive { - return nil, nil, caos_errs.ThrowNotFound(nil, "COMMAND-BHt2w", "Errors.User.RefreshToken.NotFound") + return nil, nil, zerrors.ThrowNotFound(nil, "COMMAND-BHt2w", "Errors.User.RefreshToken.NotFound") } userAgg := UserAggregateFromWriteModel(&refreshTokenWriteModel.WriteModel) return user.NewHumanRefreshTokenRemovedEvent(ctx, userAgg, tokenID), refreshTokenWriteModel, nil diff --git a/internal/command/user_human_refresh_token_test.go b/internal/command/user_human_refresh_token_test.go index cee99c518..d3c310db7 100644 --- a/internal/command/user_human_refresh_token_test.go +++ b/internal/command/user_human_refresh_token_test.go @@ -12,12 +12,12 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_AddAccessAndRefreshToken(t *testing.T) { @@ -59,7 +59,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) { }, args: args{}, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -84,7 +84,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) { clientID: "clientID", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -98,7 +98,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) { refreshToken: "invalid", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -114,7 +114,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) { refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID2:tokenID:token")), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -152,7 +152,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) { refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID:tokenID:token")), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -185,7 +185,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) { refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID:tokenID:tokenID")), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, //fails because of timestamp equality @@ -240,7 +240,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) { // )), // ), // expectPushFailed( - // caos_errs.ThrowInternal(nil, "ERROR", "internal"), + // zerrors.ThrowInternal(nil, "ERROR", "internal"), // []*repository.Event{ // eventFromEventPusher(user.NewUserTokenAddedEvent( // context.Background(), @@ -280,7 +280,7 @@ func TestCommands_AddAccessAndRefreshToken(t *testing.T) { // authTime: time.Now(), // }, // res: res{ - // err: caos_errs.IsInternal, + // err: zerrors.IsInternal, // }, //}, } @@ -334,7 +334,7 @@ func TestCommands_RevokeRefreshToken(t *testing.T) { }, args{}, res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -351,7 +351,7 @@ func TestCommands_RevokeRefreshToken(t *testing.T) { "tokenID", }, res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -374,7 +374,7 @@ func TestCommands_RevokeRefreshToken(t *testing.T) { 10*time.Hour, )), ), - expectPushFailed(caos_errs.ThrowInternal(nil, "ERROR", "internal"), + expectPushFailed(zerrors.ThrowInternal(nil, "ERROR", "internal"), user.NewHumanRefreshTokenRemovedEvent( context.Background(), &user.NewAggregate("userID", "orgID").Aggregate, @@ -390,7 +390,7 @@ func TestCommands_RevokeRefreshToken(t *testing.T) { "tokenID", }, res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -485,7 +485,7 @@ func TestCommands_RevokeRefreshTokens(t *testing.T) { nil, }, res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -518,7 +518,7 @@ func TestCommands_RevokeRefreshTokens(t *testing.T) { []string{"tokenID", "tokenID2"}, }, res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -557,7 +557,7 @@ func TestCommands_RevokeRefreshTokens(t *testing.T) { 10*time.Hour, )), ), - expectPushFailed(caos_errs.ThrowInternal(nil, "ERROR", "internal"), + expectPushFailed(zerrors.ThrowInternal(nil, "ERROR", "internal"), user.NewHumanRefreshTokenRemovedEvent( context.Background(), &user.NewAggregate("userID", "orgID").Aggregate, @@ -578,7 +578,7 @@ func TestCommands_RevokeRefreshTokens(t *testing.T) { []string{"tokenID", "tokenID2"}, }, res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -670,7 +670,7 @@ func refreshTokenEncryptionAlgorithm(ctrl *gomock.Controller) crypto.EncryptionA mCrypto.EXPECT().Decrypt(gomock.Any(), gomock.Any()).AnyTimes().DoAndReturn( func(refrehToken []byte, keyID string) ([]byte, error) { if keyID != "id" { - return nil, caos_errs.ThrowInternal(nil, "id", "invalid key id") + return nil, zerrors.ThrowInternal(nil, "id", "invalid key id") } return refrehToken, nil }, @@ -805,7 +805,7 @@ func TestCommands_renewRefreshToken(t *testing.T) { ctx: context.Background(), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -819,7 +819,7 @@ func TestCommands_renewRefreshToken(t *testing.T) { refreshToken: "invalid", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -835,7 +835,7 @@ func TestCommands_renewRefreshToken(t *testing.T) { refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID2:tokenID:token")), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -873,7 +873,7 @@ func TestCommands_renewRefreshToken(t *testing.T) { refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID:tokenID:token")), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -906,7 +906,7 @@ func TestCommands_renewRefreshToken(t *testing.T) { refreshToken: base64.RawURLEncoding.EncodeToString([]byte("userID:tokenID:tokenID")), }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -946,7 +946,7 @@ func TestCommands_renewRefreshToken(t *testing.T) { idleExpiration: 1 * time.Hour, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -987,7 +987,7 @@ func TestCommands_renewRefreshToken(t *testing.T) { idleExpiration: 1 * time.Hour, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/user_human_test.go b/internal/command/user_human_test.go index d8ee4f133..fa0149404 100644 --- a/internal/command/user_human_test.go +++ b/internal/command/user_human_test.go @@ -14,7 +14,6 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - zitadel_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" @@ -22,6 +21,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/idp" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddHuman(t *testing.T) { @@ -74,7 +74,7 @@ func TestCommandSide_AddHuman(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, zitadel_errs.ThrowInvalidArgument(nil, "COMMA-5Ky74", "Errors.Internal")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "COMMA-5Ky74", "Errors.Internal")) }, }, }, @@ -94,7 +94,7 @@ func TestCommandSide_AddHuman(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, zitadel_errs.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty")) }, }, }, @@ -126,7 +126,7 @@ func TestCommandSide_AddHuman(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, zitadel_errs.ThrowPreconditionFailed(nil, "COMMAND-k2unb", "Errors.User.AlreadyExisting")) + return errors.Is(err, zerrors.ThrowPreconditionFailed(nil, "COMMAND-k2unb", "Errors.User.AlreadyExisting")) }, }, }, @@ -157,7 +157,7 @@ func TestCommandSide_AddHuman(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, zitadel_errs.ThrowInternal(nil, "USER-Ggk9n", "Errors.Internal")) + return errors.Is(err, zerrors.ThrowInternal(nil, "USER-Ggk9n", "Errors.Internal")) }, }, }, @@ -199,7 +199,7 @@ func TestCommandSide_AddHuman(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, zitadel_errs.ThrowInternal(nil, "USER-uQ96e", "Errors.Internal")) + return errors.Is(err, zerrors.ThrowInternal(nil, "USER-uQ96e", "Errors.Internal")) }, }, }, @@ -857,7 +857,7 @@ func TestCommandSide_AddHuman(t *testing.T) { }, res: res{ err: func(err error) bool { - return errors.Is(err, zitadel_errs.ThrowInvalidArgument(nil, "COMMAND-SFd21", "Errors.User.DomainNotAllowedAsUsername")) + return errors.Is(err, zerrors.ThrowInvalidArgument(nil, "COMMAND-SFd21", "Errors.User.DomainNotAllowedAsUsername")) }, }, }, @@ -1312,7 +1312,7 @@ func TestCommandSide_ImportHuman(t *testing.T) { } }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1342,7 +1342,7 @@ func TestCommandSide_ImportHuman(t *testing.T) { } }, res: res{ - err: zitadel_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1382,7 +1382,7 @@ func TestCommandSide_ImportHuman(t *testing.T) { } }, res: res{ - err: zitadel_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1428,7 +1428,7 @@ func TestCommandSide_ImportHuman(t *testing.T) { } }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { name: "add human (with password and initial code), ok", @@ -2452,7 +2452,7 @@ func TestCommandSide_ImportHuman(t *testing.T) { } }, res: res{ - err: zitadel_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, } @@ -2525,7 +2525,7 @@ func TestCommandSide_RegisterHuman(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -2555,7 +2555,7 @@ func TestCommandSide_RegisterHuman(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -2595,7 +2595,7 @@ func TestCommandSide_RegisterHuman(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -2643,7 +2643,7 @@ func TestCommandSide_RegisterHuman(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -2713,7 +2713,7 @@ func TestCommandSide_RegisterHuman(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -2783,7 +2783,7 @@ func TestCommandSide_RegisterHuman(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -2870,7 +2870,7 @@ func TestCommandSide_RegisterHuman(t *testing.T) { }, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -4005,7 +4005,7 @@ func TestCommandSide_HumanMFASkip(t *testing.T) { userID: "", }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -4022,7 +4022,7 @@ func TestCommandSide_HumanMFASkip(t *testing.T) { userID: "user1", }, res: res{ - err: zitadel_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -4115,7 +4115,7 @@ func TestCommandSide_HumanSignOut(t *testing.T) { userIDs: []string{"user1"}, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -4131,7 +4131,7 @@ func TestCommandSide_HumanSignOut(t *testing.T) { userIDs: []string{}, }, res: res{ - err: zitadel_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -4341,7 +4341,7 @@ func TestAddHumanCommand(t *testing.T) { orgID: "ro", }, want: Want{ - ValidationErr: zitadel_errs.ThrowInvalidArgument(nil, "EMAIL-599BI", "Errors.User.Email.Invalid"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "EMAIL-599BI", "Errors.User.Email.Invalid"), }, }, { @@ -4357,7 +4357,7 @@ func TestAddHumanCommand(t *testing.T) { orgID: "ro", }, want: Want{ - ValidationErr: zitadel_errs.ThrowInvalidArgument(nil, "USER-UCej2", "Errors.User.Profile.FirstNameEmpty"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "USER-UCej2", "Errors.User.Profile.FirstNameEmpty"), }, }, { @@ -4372,7 +4372,7 @@ func TestAddHumanCommand(t *testing.T) { orgID: "ro", }, want: Want{ - ValidationErr: zitadel_errs.ThrowInvalidArgument(nil, "USER-4hB7d", "Errors.User.Profile.LastNameEmpty"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "USER-4hB7d", "Errors.User.Profile.LastNameEmpty"), }, }, { @@ -4390,7 +4390,7 @@ func TestAddHumanCommand(t *testing.T) { hasher: mockPasswordHasher("x"), }, want: Want{ - ValidationErr: zitadel_errs.ThrowInvalidArgument(nil, "USER-JDk4t", "Errors.User.Password.NotSupported"), + ValidationErr: zerrors.ThrowInvalidArgument(nil, "USER-JDk4t", "Errors.User.Password.NotSupported"), }, }, { @@ -4441,7 +4441,7 @@ func TestAddHumanCommand(t *testing.T) { Filter(), }, want: Want{ - CreateErr: zitadel_errs.ThrowInvalidArgument(nil, "COMMA-HuJf6", "Errors.User.PasswordComplexityPolicy.MinLength"), + CreateErr: zerrors.ThrowInvalidArgument(nil, "COMMA-HuJf6", "Errors.User.PasswordComplexityPolicy.MinLength"), }, }, { diff --git a/internal/command/user_human_webauthn.go b/internal/command/user_human_webauthn.go index 70c012884..6bb61bfc5 100644 --- a/internal/command/user_human_webauthn.go +++ b/internal/command/user_human_webauthn.go @@ -8,11 +8,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" usr_repo "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) getHumanU2FTokens(ctx context.Context, userID, resourceowner string) ([]*domain.WebAuthNToken, error) { @@ -22,7 +22,7 @@ func (c *Commands) getHumanU2FTokens(ctx context.Context, userID, resourceowner return nil, err } if tokenReadModel.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-4M0ds", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-4M0ds", "Errors.User.NotFound") } return readModelToWebAuthNTokens(tokenReadModel), nil } @@ -34,7 +34,7 @@ func (c *Commands) getHumanPasswordlessTokens(ctx context.Context, userID, resou return nil, err } if tokenReadModel.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-Mv9sd", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-Mv9sd", "Errors.User.NotFound") } return readModelToWebAuthNTokens(tokenReadModel), nil } @@ -46,7 +46,7 @@ func (c *Commands) getHumanU2FLogin(ctx context.Context, userID, authReqID, reso return nil, err } if tokenReadModel.State == domain.UserStateUnspecified || tokenReadModel.State == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-5m88U", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-5m88U", "Errors.User.NotFound") } return &domain.WebAuthNLogin{ ObjectRoot: models.ObjectRoot{ @@ -65,7 +65,7 @@ func (c *Commands) getHumanPasswordlessLogin(ctx context.Context, userID, authRe return nil, err } if tokenReadModel.State == domain.UserStateUnspecified || tokenReadModel.State == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-fm84R", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-fm84R", "Errors.User.NotFound") } return &domain.WebAuthNLogin{ ObjectRoot: models.ObjectRoot{ @@ -139,7 +139,7 @@ func (c *Commands) HumanAddPasswordlessSetupInitCode(ctx context.Context, userID func (c *Commands) addHumanWebAuthN(ctx context.Context, userID, resourceowner, rpID string, tokens []*domain.WebAuthNToken, authenticatorPlatform domain.AuthenticatorAttachment, userVerification domain.UserVerificationRequirement) (*HumanWebAuthNWriteModel, *eventstore.Aggregate, *domain.WebAuthNToken, error) { if userID == "" { - return nil, nil, nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3M0od", "Errors.IDMissing") + return nil, nil, nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-3M0od", "Errors.IDMissing") } user, err := c.getHuman(ctx, userID, resourceowner) if err != nil { @@ -265,7 +265,7 @@ func (c *Commands) humanHumanPasswordlessSetup(ctx context.Context, userID, reso func (c *Commands) verifyHumanWebAuthN(ctx context.Context, userID, resourceowner, tokenName, userAgentID string, credentialData []byte, tokens []*domain.WebAuthNToken) (*eventstore.Aggregate, *domain.WebAuthNToken, *HumanWebAuthNWriteModel, error) { if userID == "" { - return nil, nil, nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3M0od", "Errors.IDMissing") + return nil, nil, nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-3M0od", "Errors.IDMissing") } user, err := c.getHuman(ctx, userID, resourceowner) if err != nil { @@ -336,7 +336,7 @@ func (c *Commands) HumanBeginPasswordlessLogin(ctx context.Context, userID, reso func (c *Commands) beginWebAuthNLogin(ctx context.Context, userID, resourceOwner string, tokens []*domain.WebAuthNToken, userVerification domain.UserVerificationRequirement) (*eventstore.Aggregate, *domain.WebAuthNLogin, error) { if userID == "" { - return nil, nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-hh8K9", "Errors.IDMissing") + return nil, nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-hh8K9", "Errors.IDMissing") } human, err := c.getHuman(ctx, userID, resourceOwner) @@ -447,7 +447,7 @@ func (c *Commands) HumanFinishPasswordlessLogin(ctx context.Context, userID, res func (c *Commands) finishWebAuthNLogin(ctx context.Context, userID, resourceOwner string, credentialData []byte, webAuthN *domain.WebAuthNLogin, tokens []*domain.WebAuthNToken) (*eventstore.Aggregate, *domain.WebAuthNToken, uint32, error) { if userID == "" { - return nil, nil, 0, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-hh8K9", "Errors.IDMissing") + return nil, nil, 0, zerrors.ThrowPreconditionFailed(nil, "COMMAND-hh8K9", "Errors.IDMissing") } human, err := c.getHuman(ctx, userID, resourceOwner) @@ -461,7 +461,7 @@ func (c *Commands) finishWebAuthNLogin(ctx context.Context, userID, resourceOwne _, token := domain.GetTokenByKeyID(tokens, credential.ID) if token == nil { - return nil, nil, 0, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-3b7zs", "Errors.User.WebAuthN.NotFound") + return nil, nil, 0, zerrors.ThrowPreconditionFailed(nil, "COMMAND-3b7zs", "Errors.User.WebAuthN.NotFound") } writeModel, err := c.webauthNWriteModelByID(ctx, userID, "", resourceOwner) @@ -517,7 +517,7 @@ func (c *Commands) HumanSendPasswordlessInitCode(ctx context.Context, userID, re func (c *Commands) humanAddPasswordlessInitCode(ctx context.Context, userID, resourceOwner string, direct bool, passwordlessCodeGenerator crypto.Generator) (eventstore.Command, *HumanPasswordlessInitCodeWriteModel, string, error) { if userID == "" { - return nil, nil, "", caos_errs.ThrowPreconditionFailed(nil, "COMMAND-GVfg3", "Errors.IDMissing") + return nil, nil, "", zerrors.ThrowPreconditionFailed(nil, "COMMAND-GVfg3", "Errors.IDMissing") } codeID, err := c.idGenerator.Next() @@ -548,7 +548,7 @@ func (c *Commands) humanAddPasswordlessInitCode(ctx context.Context, userID, res func (c *Commands) HumanPasswordlessInitCodeSent(ctx context.Context, userID, resourceOwner, codeID string) error { if userID == "" || codeID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-ADggh", "Errors.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-ADggh", "Errors.IDMissing") } initCode := NewHumanPasswordlessInitCodeWriteModel(userID, codeID, resourceOwner) err := c.eventstore.FilterToQueryReducer(ctx, initCode) @@ -557,7 +557,7 @@ func (c *Commands) HumanPasswordlessInitCodeSent(ctx context.Context, userID, re } if initCode.State != domain.PasswordlessInitCodeStateRequested { - return caos_errs.ThrowNotFound(nil, "COMMAND-Gdfg3", "Errors.User.Code.NotFound") + return zerrors.ThrowNotFound(nil, "COMMAND-Gdfg3", "Errors.User.Code.NotFound") } _, err = c.eventstore.Push(ctx, @@ -568,7 +568,7 @@ func (c *Commands) HumanPasswordlessInitCodeSent(ctx context.Context, userID, re func (c *Commands) humanVerifyPasswordlessInitCode(ctx context.Context, userID, resourceOwner, codeID, verificationCode string, passwordlessCodeGenerator crypto.Generator) error { if userID == "" || codeID == "" { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-GVfg3", "Errors.IDMissing") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-GVfg3", "Errors.IDMissing") } initCode := NewHumanPasswordlessInitCodeWriteModel(userID, codeID, resourceOwner) err := c.eventstore.FilterToQueryReducer(ctx, initCode) @@ -580,14 +580,14 @@ func (c *Commands) humanVerifyPasswordlessInitCode(ctx context.Context, userID, userAgg := UserAggregateFromWriteModel(&initCode.WriteModel) _, err = c.eventstore.Push(ctx, usr_repo.NewHumanPasswordlessInitCodeCheckFailedEvent(ctx, userAgg, codeID)) logging.WithFields("userID", userAgg.ID).OnError(err).Error("NewHumanPasswordlessInitCodeCheckFailedEvent push failed") - return caos_errs.ThrowInvalidArgument(err, "COMMAND-Dhz8i", "Errors.User.Code.Invalid") + return zerrors.ThrowInvalidArgument(err, "COMMAND-Dhz8i", "Errors.User.Code.Invalid") } return nil } func (c *Commands) removeHumanWebAuthN(ctx context.Context, userID, webAuthNID, resourceOwner string, preparedEvent func(*eventstore.Aggregate) eventstore.Command) (*domain.ObjectDetails, error) { if userID == "" || webAuthNID == "" { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-6M9de", "Errors.IDMissing") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-6M9de", "Errors.IDMissing") } existingWebAuthN, err := c.webauthNWriteModelByID(ctx, userID, webAuthNID, resourceOwner) @@ -595,7 +595,7 @@ func (c *Commands) removeHumanWebAuthN(ctx context.Context, userID, webAuthNID, return nil, err } if existingWebAuthN.State == domain.MFAStateUnspecified || existingWebAuthN.State == domain.MFAStateRemoved { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-DAfb2", "Errors.User.WebAuthN.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-DAfb2", "Errors.User.WebAuthN.NotFound") } userAgg := UserAggregateFromWriteModel(&existingWebAuthN.WriteModel) diff --git a/internal/command/user_idp_link.go b/internal/command/user_idp_link.go index a66140ec7..29bebd3bc 100644 --- a/internal/command/user_idp_link.go +++ b/internal/command/user_idp_link.go @@ -5,15 +5,15 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddUserIDPLink(ctx context.Context, userID, resourceOwner string, link *AddLink) (_ *domain.ObjectDetails, err error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-03j8f", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-03j8f", "Errors.IDMissing") } if err := c.checkUserExists(ctx, userID, resourceOwner); err != nil { return nil, err @@ -41,10 +41,10 @@ func (c *Commands) AddUserIDPLink(ctx context.Context, userID, resourceOwner str func (c *Commands) BulkAddedUserIDPLinks(ctx context.Context, userID, resourceOwner string, links []*domain.UserIDPLink) (err error) { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-03j8f", "Errors.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-03j8f", "Errors.IDMissing") } if len(links) == 0 { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-Ek9s", "Errors.User.ExternalIDP.MinimumExternalIDPNeeded") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-Ek9s", "Errors.User.ExternalIDP.MinimumExternalIDPNeeded") } if err := c.checkUserExists(ctx, userID, resourceOwner); err != nil { @@ -68,22 +68,22 @@ func (c *Commands) BulkAddedUserIDPLinks(ctx context.Context, userID, resourceOw func (c *Commands) addUserIDPLink(ctx context.Context, human *eventstore.Aggregate, link *domain.UserIDPLink, linkToExistingUser bool) (eventstore.Command, error) { if link.AggregateID != "" && human.ID != link.AggregateID { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-33M0g", "Errors.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-33M0g", "Errors.IDMissing") } if !link.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-6m9Kd", "Errors.User.ExternalIDP.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-6m9Kd", "Errors.User.ExternalIDP.Invalid") } idpWriteModel, err := IDPProviderWriteModel(ctx, c.eventstore.Filter, link.IDPConfigID) if err != nil { - return nil, caos_errs.ThrowPreconditionFailed(err, "COMMAND-39nfs", "Errors.IDPConfig.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-39nfs", "Errors.IDPConfig.NotExisting") } // IDP user will either be linked or created on a new user // Therefore we need to either check if linking is allowed or creation: if linkToExistingUser && !idpWriteModel.GetProviderOptions().IsLinkingAllowed { - return nil, caos_errs.ThrowPreconditionFailed(err, "COMMAND-Sfee2", "Errors.ExternalIDP.LinkingNotAllowed") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-Sfee2", "Errors.ExternalIDP.LinkingNotAllowed") } if !linkToExistingUser && !idpWriteModel.GetProviderOptions().IsCreationAllowed { - return nil, caos_errs.ThrowPreconditionFailed(err, "COMMAND-SJI3g", "Errors.ExternalIDP.CreationNotAllowed") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-SJI3g", "Errors.ExternalIDP.CreationNotAllowed") } return user.NewUserIDPLinkAddedEvent(ctx, human, link.IDPConfigID, link.DisplayName, link.ExternalUserID), nil @@ -107,7 +107,7 @@ func (c *Commands) RemoveUserIDPLink(ctx context.Context, link *domain.UserIDPLi func (c *Commands) removeUserIDPLink(ctx context.Context, link *domain.UserIDPLink, cascade bool) (eventstore.Command, *UserIDPLinkWriteModel, error) { if !link.IsValid() || link.AggregateID == "" { - return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-3M9ds", "Errors.IDMissing") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-3M9ds", "Errors.IDMissing") } existingLink, err := c.userIDPLinkWriteModelByID(ctx, link.AggregateID, link.IDPConfigID, link.ExternalUserID, link.ResourceOwner) @@ -115,7 +115,7 @@ func (c *Commands) removeUserIDPLink(ctx context.Context, link *domain.UserIDPLi return nil, nil, err } if existingLink.State == domain.UserIDPLinkStateUnspecified || existingLink.State == domain.UserIDPLinkStateRemoved { - return nil, nil, caos_errs.ThrowNotFound(nil, "COMMAND-1M9xR", "Errors.User.ExternalIDP.NotFound") + return nil, nil, zerrors.ThrowNotFound(nil, "COMMAND-1M9xR", "Errors.User.ExternalIDP.NotFound") } userAgg := UserAggregateFromWriteModel(&existingLink.WriteModel) if cascade { @@ -126,7 +126,7 @@ func (c *Commands) removeUserIDPLink(ctx context.Context, link *domain.UserIDPLi func (c *Commands) UserIDPLoginChecked(ctx context.Context, orgID, userID string, authRequest *domain.AuthRequest) (err error) { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-5n8sM", "Errors.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-5n8sM", "Errors.IDMissing") } existingHuman, err := c.getHumanWriteModelByID(ctx, userID, orgID) @@ -134,7 +134,7 @@ func (c *Commands) UserIDPLoginChecked(ctx context.Context, orgID, userID string return err } if existingHuman.UserState == domain.UserStateUnspecified || existingHuman.UserState == domain.UserStateDeleted { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-dn88J", "Errors.User.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-dn88J", "Errors.User.NotFound") } userAgg := UserAggregateFromWriteModel(&existingHuman.WriteModel) @@ -144,7 +144,7 @@ func (c *Commands) UserIDPLoginChecked(ctx context.Context, orgID, userID string func (c *Commands) MigrateUserIDP(ctx context.Context, userID, orgID, idpConfigID, previousID, newID string) (err error) { if userID == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-Sn3l1", "Errors.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-Sn3l1", "Errors.IDMissing") } writeModel, err := c.userIDPLinkWriteModelByID(ctx, userID, idpConfigID, previousID, orgID) @@ -152,7 +152,7 @@ func (c *Commands) MigrateUserIDP(ctx context.Context, userID, orgID, idpConfigI return err } if writeModel.State != domain.UserIDPLinkStateActive { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-KJH2o", "Errors.User.ExternalIDP.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-KJH2o", "Errors.User.ExternalIDP.NotFound") } userAgg := UserAggregateFromWriteModel(&writeModel.WriteModel) diff --git a/internal/command/user_idp_link_test.go b/internal/command/user_idp_link_test.go index f86ab12db..4fd8c1082 100644 --- a/internal/command/user_idp_link_test.go +++ b/internal/command/user_idp_link_test.go @@ -9,13 +9,13 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/idp" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_BulkAddUserIDPLinks(t *testing.T) { @@ -56,7 +56,7 @@ func TestCommandSide_BulkAddUserIDPLinks(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-03j8f", "Errors.IDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-03j8f", "Errors.IDMissing"), }, }, { @@ -72,7 +72,7 @@ func TestCommandSide_BulkAddUserIDPLinks(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-Ek9s", "Errors.User.ExternalIDP.MinimumExternalIDPNeeded"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-Ek9s", "Errors.User.ExternalIDP.MinimumExternalIDPNeeded"), }, }, { @@ -114,7 +114,7 @@ func TestCommandSide_BulkAddUserIDPLinks(t *testing.T) { }, }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-33M0g", "Errors.IDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-33M0g", "Errors.IDMissing"), }, }, { @@ -156,7 +156,7 @@ func TestCommandSide_BulkAddUserIDPLinks(t *testing.T) { }, }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-6m9Kd", "Errors.User.ExternalIDP.Invalid"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-6m9Kd", "Errors.User.ExternalIDP.Invalid"), }, }, { @@ -199,7 +199,7 @@ func TestCommandSide_BulkAddUserIDPLinks(t *testing.T) { }, }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-as02jin", "Errors.IDPConfig.NotExisting"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-as02jin", "Errors.IDPConfig.NotExisting"), }, }, { @@ -304,7 +304,7 @@ func TestCommandSide_BulkAddUserIDPLinks(t *testing.T) { }, }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sfee2", "Errors.ExternalIDP.LinkingNotAllowed"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sfee2", "Errors.ExternalIDP.LinkingNotAllowed"), }, }, { @@ -553,7 +553,7 @@ func TestCommandSide_RemoveUserIDPLink(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -571,7 +571,7 @@ func TestCommandSide_RemoveUserIDPLink(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -610,7 +610,7 @@ func TestCommandSide_RemoveUserIDPLink(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -632,7 +632,7 @@ func TestCommandSide_RemoveUserIDPLink(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -727,7 +727,7 @@ func TestCommandSide_ExternalLoginCheck(t *testing.T) { userID: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -761,7 +761,7 @@ func TestCommandSide_ExternalLoginCheck(t *testing.T) { userID: "user1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -861,7 +861,7 @@ func TestCommandSide_MigrateUserIDP(t *testing.T) { newID: "newID", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-Sn3l1", "Errors.IDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-Sn3l1", "Errors.IDMissing"), }, }, { @@ -889,7 +889,7 @@ func TestCommandSide_MigrateUserIDP(t *testing.T) { newID: "newID", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-KJH2o", "Errors.User.ExternalIDP.NotFound"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-KJH2o", "Errors.User.ExternalIDP.NotFound"), }, }, { diff --git a/internal/command/user_machine.go b/internal/command/user_machine.go index 700964f6b..77953010d 100644 --- a/internal/command/user_machine.go +++ b/internal/command/user_machine.go @@ -5,10 +5,10 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) type AddMachine struct { @@ -33,16 +33,16 @@ func (m *Machine) IsZero() bool { func AddMachineCommand(a *user.Aggregate, machine *Machine) preparation.Validation { return func() (_ preparation.CreateCommands, err error) { if a.ResourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-xiown2", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-xiown2", "Errors.ResourceOwnerMissing") } if a.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-p0p2mi", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-p0p2mi", "Errors.User.UserIDMissing") } if machine.Name == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-bs9Ds", "Errors.User.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-bs9Ds", "Errors.User.Invalid") } if machine.Username == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-bm9Ds", "Errors.User.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-bm9Ds", "Errors.User.Invalid") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel, err := getMachineWriteModel(ctx, a.ID, a.ResourceOwner, filter) @@ -50,11 +50,11 @@ func AddMachineCommand(a *user.Aggregate, machine *Machine) preparation.Validati return nil, err } if isUserStateExists(writeModel.UserState) { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-k2una", "Errors.User.AlreadyExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-k2una", "Errors.User.AlreadyExisting") } domainPolicy, err := domainPolicyWriteModel(ctx, filter, a.ResourceOwner) if err != nil { - return nil, caos_errs.ThrowPreconditionFailed(err, "COMMAND-3M9fs", "Errors.Org.DomainPolicy.NotFound") + return nil, zerrors.ThrowPreconditionFailed(err, "COMMAND-3M9fs", "Errors.Org.DomainPolicy.NotFound") } return []eventstore.Command{ user.NewMachineAddedEvent(ctx, &a.Aggregate, machine.Username, machine.Name, machine.Description, domainPolicy.UserLoginMustBeDomain, machine.AccessTokenType), @@ -112,10 +112,10 @@ func (c *Commands) ChangeMachine(ctx context.Context, machine *Machine) (*domain func changeMachineCommand(a *user.Aggregate, machine *Machine) preparation.Validation { return func() (_ preparation.CreateCommands, err error) { if a.ResourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-xiown3", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-xiown3", "Errors.ResourceOwnerMissing") } if a.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-p0p3mi", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-p0p3mi", "Errors.User.UserIDMissing") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel, err := getMachineWriteModel(ctx, a.ID, a.ResourceOwner, filter) @@ -123,14 +123,14 @@ func changeMachineCommand(a *user.Aggregate, machine *Machine) preparation.Valid return nil, err } if !isUserStateExists(writeModel.UserState) { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-5M0od", "Errors.User.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-5M0od", "Errors.User.NotFound") } changedEvent, hasChanged, err := writeModel.NewChangedEvent(ctx, &a.Aggregate, machine.Name, machine.Description, machine.AccessTokenType) if err != nil { return nil, err } if !hasChanged { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-2n8vs", "Errors.User.NotChanged") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-2n8vs", "Errors.User.NotChanged") } return []eventstore.Command{ diff --git a/internal/command/user_machine_key.go b/internal/command/user_machine_key.go index a3535770d..1e6ca56f2 100644 --- a/internal/command/user_machine_key.go +++ b/internal/command/user_machine_key.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) type AddMachineKey struct { @@ -53,23 +53,23 @@ func (key *MachineKey) SetExpirationDate(t time.Time) { func (key *MachineKey) Detail() ([]byte, error) { if len(key.PrivateKey) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "KEY-sp2l2m", "Errors.Internal") + return nil, zerrors.ThrowPreconditionFailed(nil, "KEY-sp2l2m", "Errors.Internal") } if key.Type == domain.AuthNKeyTypeJSON { return domain.MachineKeyMarshalJSON(key.KeyID, key.PrivateKey, key.AggregateID) } - return nil, errors.ThrowPreconditionFailed(nil, "KEY-dsg52", "Errors.Internal") + return nil, zerrors.ThrowPreconditionFailed(nil, "KEY-dsg52", "Errors.Internal") } func (key *MachineKey) content() error { if key.ResourceOwner == "" { - return errors.ThrowInvalidArgument(nil, "COMMAND-kqpoix", "Errors.ResourceOwnerMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-kqpoix", "Errors.ResourceOwnerMissing") } if key.AggregateID == "" { - return errors.ThrowInvalidArgument(nil, "COMMAND-xuiwk2", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-xuiwk2", "Errors.User.UserIDMissing") } if key.KeyID == "" { - return errors.ThrowInvalidArgument(nil, "COMMAND-0p2m1h", "Errors.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-0p2m1h", "Errors.IDMissing") } return nil } @@ -84,7 +84,7 @@ func (key *MachineKey) valid() (err error) { func (key *MachineKey) checkAggregate(ctx context.Context, filter preparation.FilterToQueryReducer) error { if exists, err := ExistsUser(ctx, filter, key.AggregateID, key.ResourceOwner); err != nil || !exists { - return errors.ThrowPreconditionFailed(err, "COMMAND-bnipwm1", "Errors.User.NotFound") + return zerrors.ThrowPreconditionFailed(err, "COMMAND-bnipwm1", "Errors.User.NotFound") } return nil } @@ -133,7 +133,7 @@ func prepareAddUserMachineKey(machineKey *MachineKey, keySize int) preparation.V return nil, err } if writeModel.Exists() { - return nil, errors.ThrowAlreadyExists(nil, "COMMAND-091mops", "Errors.User.Machine.Key.AlreadyExists") + return nil, zerrors.ThrowAlreadyExists(nil, "COMMAND-091mops", "Errors.User.Machine.Key.AlreadyExists") } return []eventstore.Command{ user.NewMachineKeyAddedEvent( @@ -177,7 +177,7 @@ func prepareRemoveUserMachineKey(machineKey *MachineKey) preparation.Validation return nil, err } if !writeModel.Exists() { - return nil, errors.ThrowNotFound(nil, "COMMAND-4m77G", "Errors.User.Machine.Key.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-4m77G", "Errors.User.Machine.Key.NotFound") } return []eventstore.Command{ user.NewMachineKeyRemovedEvent( diff --git a/internal/command/user_machine_key_test.go b/internal/command/user_machine_key_test.go index ffb974730..7e4a0f069 100644 --- a/internal/command/user_machine_key_test.go +++ b/internal/command/user_machine_key_test.go @@ -10,12 +10,12 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_AddMachineKey(t *testing.T) { @@ -59,7 +59,7 @@ func TestCommands_AddMachineKey(t *testing.T) { }, }, res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -79,7 +79,7 @@ func TestCommands_AddMachineKey(t *testing.T) { }, }, res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -99,7 +99,7 @@ func TestCommands_AddMachineKey(t *testing.T) { }, }, res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -119,7 +119,7 @@ func TestCommands_AddMachineKey(t *testing.T) { }, }, res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/user_machine_secret.go b/internal/command/user_machine_secret.go index 1be051c5e..fbfd63441 100644 --- a/internal/command/user_machine_secret.go +++ b/internal/command/user_machine_secret.go @@ -6,9 +6,9 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) type GenerateMachineSecret struct { @@ -37,10 +37,10 @@ func (c *Commands) GenerateMachineSecret(ctx context.Context, userID string, res func prepareGenerateMachineSecret(a *user.Aggregate, generator crypto.Generator, set *GenerateMachineSecret) preparation.Validation { return func() (_ preparation.CreateCommands, err error) { if a.ResourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-x0992n", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-x0992n", "Errors.ResourceOwnerMissing") } if a.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-bzoqjs", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-bzoqjs", "Errors.User.UserIDMissing") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel, err := getMachineWriteModel(ctx, a.ID, a.ResourceOwner, filter) @@ -48,7 +48,7 @@ func prepareGenerateMachineSecret(a *user.Aggregate, generator crypto.Generator, return nil, err } if !isUserStateExists(writeModel.UserState) { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-x8910n", "Errors.User.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-x8910n", "Errors.User.NotExisting") } clientSecret, secretString, err := domain.NewMachineClientSecret(generator) @@ -86,10 +86,10 @@ func (c *Commands) RemoveMachineSecret(ctx context.Context, userID string, resou func prepareRemoveMachineSecret(a *user.Aggregate) preparation.Validation { return func() (_ preparation.CreateCommands, err error) { if a.ResourceOwner == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-0qp2hus", "Errors.ResourceOwnerMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-0qp2hus", "Errors.ResourceOwnerMissing") } if a.ID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-bzosjs", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-bzosjs", "Errors.User.UserIDMissing") } return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { writeModel, err := getMachineWriteModel(ctx, a.ID, a.ResourceOwner, filter) @@ -97,10 +97,10 @@ func prepareRemoveMachineSecret(a *user.Aggregate) preparation.Validation { return nil, err } if !isUserStateExists(writeModel.UserState) { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-x7s802", "Errors.User.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-x7s802", "Errors.User.NotExisting") } if writeModel.ClientSecret == nil { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-coi82n", "Errors.User.Machine.Secret.NotExisting") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-coi82n", "Errors.User.Machine.Secret.NotExisting") } return []eventstore.Command{ user.NewMachineSecretRemovedEvent(ctx, &a.Aggregate), diff --git a/internal/command/user_machine_secret_test.go b/internal/command/user_machine_secret_test.go index 9f7ead959..ee3d86939 100644 --- a/internal/command/user_machine_secret_test.go +++ b/internal/command/user_machine_secret_test.go @@ -10,9 +10,9 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_GenerateMachineSecret(t *testing.T) { @@ -52,7 +52,7 @@ func TestCommandSide_GenerateMachineSecret(t *testing.T) { set: nil, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -70,7 +70,7 @@ func TestCommandSide_GenerateMachineSecret(t *testing.T) { set: nil, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -89,7 +89,7 @@ func TestCommandSide_GenerateMachineSecret(t *testing.T) { set: nil, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -191,7 +191,7 @@ func TestCommandSide_RemoveMachineSecret(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -207,7 +207,7 @@ func TestCommandSide_RemoveMachineSecret(t *testing.T) { resourceOwner: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -224,7 +224,7 @@ func TestCommandSide_RemoveMachineSecret(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -252,7 +252,7 @@ func TestCommandSide_RemoveMachineSecret(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/user_machine_test.go b/internal/command/user_machine_test.go index 9c91c17cc..e047c0b47 100644 --- a/internal/command/user_machine_test.go +++ b/internal/command/user_machine_test.go @@ -7,13 +7,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_AddMachine(t *testing.T) { @@ -53,7 +53,7 @@ func TestCommandSide_AddMachine(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -74,7 +74,7 @@ func TestCommandSide_AddMachine(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -99,7 +99,7 @@ func TestCommandSide_AddMachine(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -204,7 +204,7 @@ func TestCommandSide_ChangeMachine(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -224,7 +224,7 @@ func TestCommandSide_ChangeMachine(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -247,7 +247,7 @@ func TestCommandSide_ChangeMachine(t *testing.T) { }, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -282,7 +282,7 @@ func TestCommandSide_ChangeMachine(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { diff --git a/internal/command/user_metadata.go b/internal/command/user_metadata.go index dcc0c3cf9..e33da532c 100644 --- a/internal/command/user_metadata.go +++ b/internal/command/user_metadata.go @@ -4,9 +4,9 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) SetUserMetadata(ctx context.Context, metadata *domain.Metadata, userID, resourceOwner string) (_ *domain.Metadata, err error) { @@ -34,7 +34,7 @@ func (c *Commands) SetUserMetadata(ctx context.Context, metadata *domain.Metadat func (c *Commands) BulkSetUserMetadata(ctx context.Context, userID, resourceOwner string, metadatas ...*domain.Metadata) (_ *domain.ObjectDetails, err error) { if len(metadatas) == 0 { - return nil, caos_errs.ThrowPreconditionFailed(nil, "META-9mm2d", "Errors.Metadata.NoData") + return nil, zerrors.ThrowPreconditionFailed(nil, "META-9mm2d", "Errors.Metadata.NoData") } err = c.checkUserExists(ctx, userID, resourceOwner) if err != nil { @@ -66,7 +66,7 @@ func (c *Commands) BulkSetUserMetadata(ctx context.Context, userID, resourceOwne func (c *Commands) setUserMetadata(ctx context.Context, userAgg *eventstore.Aggregate, metadata *domain.Metadata) (command eventstore.Command, err error) { if !metadata.IsValid() { - return nil, caos_errs.ThrowInvalidArgument(nil, "META-2m00f", "Errors.Metadata.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "META-2m00f", "Errors.Metadata.Invalid") } return user.NewMetadataSetEvent( ctx, @@ -78,7 +78,7 @@ func (c *Commands) setUserMetadata(ctx context.Context, userAgg *eventstore.Aggr func (c *Commands) RemoveUserMetadata(ctx context.Context, metadataKey, userID, resourceOwner string) (_ *domain.ObjectDetails, err error) { if metadataKey == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "META-2n0fs", "Errors.Metadata.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "META-2n0fs", "Errors.Metadata.Invalid") } err = c.checkUserExists(ctx, userID, resourceOwner) if err != nil { @@ -89,7 +89,7 @@ func (c *Commands) RemoveUserMetadata(ctx context.Context, metadataKey, userID, return nil, err } if !removeMetadata.State.Exists() { - return nil, caos_errs.ThrowNotFound(nil, "META-ncnw3", "Errors.Metadata.NotFound") + return nil, zerrors.ThrowNotFound(nil, "META-ncnw3", "Errors.Metadata.NotFound") } userAgg := UserAggregateFromWriteModel(&removeMetadata.WriteModel) event, err := c.removeUserMetadata(ctx, userAgg, metadataKey) @@ -110,7 +110,7 @@ func (c *Commands) RemoveUserMetadata(ctx context.Context, metadataKey, userID, func (c *Commands) BulkRemoveUserMetadata(ctx context.Context, userID, resourceOwner string, metadataKeys ...string) (_ *domain.ObjectDetails, err error) { if len(metadataKeys) == 0 { - return nil, caos_errs.ThrowPreconditionFailed(nil, "META-9mm2d", "Errors.Metadata.NoData") + return nil, zerrors.ThrowPreconditionFailed(nil, "META-9mm2d", "Errors.Metadata.NoData") } err = c.checkUserExists(ctx, userID, resourceOwner) if err != nil { @@ -125,10 +125,10 @@ func (c *Commands) BulkRemoveUserMetadata(ctx context.Context, userID, resourceO userAgg := UserAggregateFromWriteModel(&removeMetadata.WriteModel) for i, key := range metadataKeys { if key == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-m29ds", "Errors.Metadata.Invalid") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-m29ds", "Errors.Metadata.Invalid") } if _, found := removeMetadata.metadataList[key]; !found { - return nil, caos_errs.ThrowNotFound(nil, "META-2nnds", "Errors.Metadata.KeyNotExisting") + return nil, zerrors.ThrowNotFound(nil, "META-2nnds", "Errors.Metadata.KeyNotExisting") } event, err := c.removeUserMetadata(ctx, userAgg, key) if err != nil { diff --git a/internal/command/user_metadata_test.go b/internal/command/user_metadata_test.go index f2ef90cf6..812ef529d 100644 --- a/internal/command/user_metadata_test.go +++ b/internal/command/user_metadata_test.go @@ -8,10 +8,10 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_SetUserMetadata(t *testing.T) { @@ -54,7 +54,7 @@ func TestCommandSide_SetUserMetadata(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -89,7 +89,7 @@ func TestCommandSide_SetUserMetadata(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -198,7 +198,7 @@ func TestCommandSide_BulkSetUserMetadata(t *testing.T) { userID: "user1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -219,7 +219,7 @@ func TestCommandSide_BulkSetUserMetadata(t *testing.T) { }, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -255,7 +255,7 @@ func TestCommandSide_BulkSetUserMetadata(t *testing.T) { }, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -365,7 +365,7 @@ func TestCommandSide_UserRemoveMetadata(t *testing.T) { metadataKey: "key", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -382,7 +382,7 @@ func TestCommandSide_UserRemoveMetadata(t *testing.T) { metadataKey: "", }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -416,7 +416,7 @@ func TestCommandSide_UserRemoveMetadata(t *testing.T) { metadataKey: "key", }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -524,7 +524,7 @@ func TestCommandSide_BulkRemoveUserMetadata(t *testing.T) { userID: "user1", }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -542,7 +542,7 @@ func TestCommandSide_BulkRemoveUserMetadata(t *testing.T) { metadataList: []string{"key", "key1"}, }, res: res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -584,7 +584,7 @@ func TestCommandSide_BulkRemoveUserMetadata(t *testing.T) { metadataList: []string{"key", "key1"}, }, res: res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -633,7 +633,7 @@ func TestCommandSide_BulkRemoveUserMetadata(t *testing.T) { metadataList: []string{""}, }, res: res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { diff --git a/internal/command/user_password_complexity_policy.go b/internal/command/user_password_complexity_policy.go index 9b3d22dc6..877421a9a 100644 --- a/internal/command/user_password_complexity_policy.go +++ b/internal/command/user_password_complexity_policy.go @@ -5,7 +5,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func passwordComplexityPolicyWriteModel(ctx context.Context, filter preparation.FilterToQueryReducer) (*PasswordComplexityPolicyWriteModel, error) { @@ -17,7 +17,7 @@ func passwordComplexityPolicyWriteModel(ctx context.Context, filter preparation. if err != nil || wm != nil { return wm, err } - return nil, errors.ThrowInternal(nil, "USER-uQ96e", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-uQ96e", "Errors.Internal") } func customPasswordComplexityPolicy(ctx context.Context, filter preparation.FilterToQueryReducer) (*PasswordComplexityPolicyWriteModel, error) { diff --git a/internal/command/user_password_complexity_policy_test.go b/internal/command/user_password_complexity_policy_test.go index e4d79ab74..92dc18f5d 100644 --- a/internal/command/user_password_complexity_policy_test.go +++ b/internal/command/user_password_complexity_policy_test.go @@ -8,10 +8,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func Test_customPasswordComplexityPolicy(t *testing.T) { @@ -28,7 +28,7 @@ func Test_customPasswordComplexityPolicy(t *testing.T) { name: "err from filter", args: args{ filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") }, }, want: nil, @@ -105,7 +105,7 @@ func Test_defaultPasswordComplexityPolicy(t *testing.T) { name: "err from filter", args: args{ filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") }, }, want: nil, @@ -183,7 +183,7 @@ func Test_passwordComplexityPolicy(t *testing.T) { name: "err from filter custom", args: args{ filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-IgYlN", "Errors.Internal") }, }, want: nil, @@ -229,7 +229,7 @@ func Test_passwordComplexityPolicy(t *testing.T) { return nil, nil }). Append(func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "USER-6HnsD", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-6HnsD", "Errors.Internal") }). Filter(), }, diff --git a/internal/command/user_personal_access_token.go b/internal/command/user_personal_access_token.go index fb8d01c82..0faf85d5e 100644 --- a/internal/command/user_personal_access_token.go +++ b/internal/command/user_personal_access_token.go @@ -8,10 +8,10 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) type AddPat struct { @@ -44,13 +44,13 @@ func NewPersonalAccessToken(resourceOwner string, userID string, expirationDate func (pat *PersonalAccessToken) content() error { if pat.ResourceOwner == "" { - return errors.ThrowInvalidArgument(nil, "COMMAND-xs0k2n", "Errors.ResourceOwnerMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-xs0k2n", "Errors.ResourceOwnerMissing") } if pat.AggregateID == "" { - return errors.ThrowInvalidArgument(nil, "COMMAND-0pzb1", "Errors.User.UserIDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-0pzb1", "Errors.User.UserIDMissing") } if pat.TokenID == "" { - return errors.ThrowInvalidArgument(nil, "COMMAND-68xm2o", "Errors.IDMissing") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-68xm2o", "Errors.IDMissing") } return nil } @@ -69,10 +69,10 @@ func (pat *PersonalAccessToken) checkAggregate(ctx context.Context, filter prepa return err } if !isUserStateExists(userWriteModel.UserState) { - return errors.ThrowPreconditionFailed(nil, "COMMAND-Dggw2", "Errors.User.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Dggw2", "Errors.User.NotFound") } if pat.AllowedUserType != domain.UserTypeUnspecified && userWriteModel.UserType != pat.AllowedUserType { - return errors.ThrowPreconditionFailed(nil, "COMMAND-Df2f1", "Errors.User.WrongType") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Df2f1", "Errors.User.WrongType") } return nil } @@ -160,7 +160,7 @@ func prepareRemovePersonalAccessToken(pat *PersonalAccessToken) preparation.Vali return nil, err } if !writeModel.Exists() { - return nil, errors.ThrowNotFound(nil, "COMMAND-4m77G", "Errors.User.PAT.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-4m77G", "Errors.User.PAT.NotFound") } return []eventstore.Command{ user.NewPersonalAccessTokenRemovedEvent( diff --git a/internal/command/user_personal_access_token_test.go b/internal/command/user_personal_access_token_test.go index b8748ca41..335a59e70 100644 --- a/internal/command/user_personal_access_token_test.go +++ b/internal/command/user_personal_access_token_test.go @@ -11,12 +11,12 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_AddPersonalAccessToken(t *testing.T) { @@ -60,7 +60,7 @@ func TestCommands_AddPersonalAccessToken(t *testing.T) { }, }, res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -95,7 +95,7 @@ func TestCommands_AddPersonalAccessToken(t *testing.T) { }, }, res{ - err: caos_errs.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -115,7 +115,7 @@ func TestCommands_AddPersonalAccessToken(t *testing.T) { }, }, res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -135,7 +135,7 @@ func TestCommands_AddPersonalAccessToken(t *testing.T) { }, }, res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -155,7 +155,7 @@ func TestCommands_AddPersonalAccessToken(t *testing.T) { }, }, res{ - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -313,7 +313,7 @@ func TestCommands_RemovePersonalAccessToken(t *testing.T) { }, }, res{ - err: caos_errs.IsNotFound, + err: zerrors.IsNotFound, }, }, { diff --git a/internal/command/user_test.go b/internal/command/user_test.go index 7073071cf..9f2244a45 100644 --- a/internal/command/user_test.go +++ b/internal/command/user_test.go @@ -10,13 +10,13 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommandSide_UsernameChange(t *testing.T) { @@ -53,7 +53,7 @@ func TestCommandSide_UsernameChange(t *testing.T) { username: "username", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -68,7 +68,7 @@ func TestCommandSide_UsernameChange(t *testing.T) { username: "username", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -83,7 +83,7 @@ func TestCommandSide_UsernameChange(t *testing.T) { username: "", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -98,7 +98,7 @@ func TestCommandSide_UsernameChange(t *testing.T) { username: " ", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -115,7 +115,7 @@ func TestCommandSide_UsernameChange(t *testing.T) { username: "username", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -147,7 +147,7 @@ func TestCommandSide_UsernameChange(t *testing.T) { username: "username", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -179,7 +179,7 @@ func TestCommandSide_UsernameChange(t *testing.T) { username: "username ", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -211,7 +211,7 @@ func TestCommandSide_UsernameChange(t *testing.T) { username: "username", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -262,7 +262,7 @@ func TestCommandSide_UsernameChange(t *testing.T) { username: "test@test.ch", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -539,7 +539,7 @@ func TestCommandSide_DeactivateUser(t *testing.T) { userID: "", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -556,7 +556,7 @@ func TestCommandSide_DeactivateUser(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -593,7 +593,7 @@ func TestCommandSide_DeactivateUser(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -689,7 +689,7 @@ func TestCommandSide_ReactivateUser(t *testing.T) { userID: "", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -706,7 +706,7 @@ func TestCommandSide_ReactivateUser(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -738,7 +738,7 @@ func TestCommandSide_ReactivateUser(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -838,7 +838,7 @@ func TestCommandSide_LockUser(t *testing.T) { userID: "", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -855,7 +855,7 @@ func TestCommandSide_LockUser(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -892,7 +892,7 @@ func TestCommandSide_LockUser(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -988,7 +988,7 @@ func TestCommandSide_UnlockUser(t *testing.T) { userID: "", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1005,7 +1005,7 @@ func TestCommandSide_UnlockUser(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1037,7 +1037,7 @@ func TestCommandSide_UnlockUser(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1140,7 +1140,7 @@ func TestCommandSide_RemoveUser(t *testing.T) { userID: "", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1157,7 +1157,7 @@ func TestCommandSide_RemoveUser(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1191,7 +1191,7 @@ func TestCommandSide_RemoveUser(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsPreconditionFailed, + err: zerrors.IsPreconditionFailed, }, }, { @@ -1473,7 +1473,7 @@ func TestCommandSide_AddUserToken(t *testing.T) { userID: "", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1490,7 +1490,7 @@ func TestCommandSide_AddUserToken(t *testing.T) { userID: "user1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, } @@ -1547,7 +1547,7 @@ func TestCommands_RevokeAccessToken(t *testing.T) { }, res{ nil, - errors.IsErrorInvalidArgument, + zerrors.IsErrorInvalidArgument, }, }, { @@ -1579,7 +1579,7 @@ func TestCommands_RevokeAccessToken(t *testing.T) { }, res{ nil, - errors.IsNotFound, + zerrors.IsNotFound, }, }, { @@ -1672,7 +1672,7 @@ func TestCommandSide_UserDomainClaimedSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, { @@ -1689,7 +1689,7 @@ func TestCommandSide_UserDomainClaimedSent(t *testing.T) { resourceOwner: "org1", }, res: res{ - err: errors.IsNotFound, + err: zerrors.IsNotFound, }, }, { @@ -1875,7 +1875,7 @@ func TestExistsUser(t *testing.T) { name: "error durring filter", args: args{ filter: func(_ context.Context, _ *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { - return nil, errors.ThrowInternal(nil, "USER-Drebn", "Errors.Internal") + return nil, zerrors.ThrowInternal(nil, "USER-Drebn", "Errors.Internal") }, id: "id", resourceOwner: "ro", diff --git a/internal/command/user_v2_email.go b/internal/command/user_v2_email.go index d00eb0f04..e1c30063a 100644 --- a/internal/command/user_v2_email.go +++ b/internal/command/user_v2_email.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) // ChangeUserEmail sets a user's email address, generates a code @@ -125,7 +125,7 @@ type UserEmailEvents struct { // If a model cannot be found, or it's state is invalid and error is returned. func (c *Commands) NewUserEmailEvents(ctx context.Context, userID, resourceOwner string) (*UserEmailEvents, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing") } model, err := c.emailWriteModel(ctx, userID, resourceOwner) @@ -133,10 +133,10 @@ func (c *Commands) NewUserEmailEvents(ctx context.Context, userID, resourceOwner return nil, err } if model.UserState == domain.UserStateUnspecified || model.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-ieJ2e", "Errors.User.Email.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-ieJ2e", "Errors.User.Email.NotFound") } if model.UserState == domain.UserStateInitial { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-uz0Uu", "Errors.User.NotInitialised") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-uz0Uu", "Errors.User.NotInitialised") } return &UserEmailEvents{ eventstore: c.eventstore, @@ -153,7 +153,7 @@ func (c *UserEmailEvents) Change(ctx context.Context, email domain.EmailAddress) } event, hasChanged := c.model.NewChangedEvent(ctx, c.aggregate, email) if !hasChanged { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Email.NotChanged") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Email.NotChanged") } c.events = append(c.events, event) return nil @@ -181,7 +181,7 @@ func (c *UserEmailEvents) AddGeneratedCode(ctx context.Context, gen crypto.Gener func (c *UserEmailEvents) VerifyCode(ctx context.Context, code string, gen crypto.Generator) error { if code == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-Fia4a", "Errors.User.Code.Empty") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-Fia4a", "Errors.User.Code.Empty") } err := crypto.VerifyCode(c.model.CodeCreationDate, c.model.CodeExpiry, c.model.Code, code, gen) @@ -191,7 +191,7 @@ func (c *UserEmailEvents) VerifyCode(ctx context.Context, code string, gen crypt } _, err = c.eventstore.Push(ctx, user.NewHumanEmailVerificationFailedEvent(ctx, c.aggregate)) logging.WithFields("id", "COMMAND-Zoo6b", "userID", c.aggregate.ID).OnError(err).Error("NewHumanEmailVerificationFailedEvent push failed") - return caos_errs.ThrowInvalidArgument(err, "COMMAND-eis9R", "Errors.User.Code.Invalid") + return zerrors.ThrowInvalidArgument(err, "COMMAND-eis9R", "Errors.User.Code.Invalid") } // Push all events to the eventstore and Reduce them into the Model. diff --git a/internal/command/user_v2_email_test.go b/internal/command/user_v2_email_test.go index e768f68c9..262e672d0 100644 --- a/internal/command/user_v2_email_test.go +++ b/internal/command/user_v2_email_test.go @@ -13,11 +13,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_ChangeUserEmail(t *testing.T) { @@ -74,7 +74,7 @@ func TestCommands_ChangeUserEmail(t *testing.T) { resourceOwner: "org1", email: "", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, { name: "missing email", @@ -114,7 +114,7 @@ func TestCommands_ChangeUserEmail(t *testing.T) { resourceOwner: "org1", email: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty"), + wantErr: zerrors.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty"), }, { name: "not changed", @@ -154,7 +154,7 @@ func TestCommands_ChangeUserEmail(t *testing.T) { resourceOwner: "org1", email: "email@test.ch", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Email.NotChanged"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Email.NotChanged"), }, } for _, tt := range tests { @@ -198,7 +198,7 @@ func TestCommands_ChangeUserEmailURLTemplate(t *testing.T) { email: "email-changed@test.ch", urlTmpl: "{{", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), + wantErr: zerrors.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), }, { name: "permission missing", @@ -239,7 +239,7 @@ func TestCommands_ChangeUserEmailURLTemplate(t *testing.T) { email: "email@test.ch", urlTmpl: "https://example.com/email/verify?userID={{.UserID}}&code={{.Code}}&orgID={{.OrgID}}", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, { name: "not changed", @@ -280,7 +280,7 @@ func TestCommands_ChangeUserEmailURLTemplate(t *testing.T) { email: "email@test.ch", urlTmpl: "https://example.com/email/verify?userID={{.UserID}}&code={{.Code}}&orgID={{.OrgID}}", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Email.NotChanged"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Email.NotChanged"), }, } for _, tt := range tests { @@ -350,7 +350,7 @@ func TestCommands_ChangeUserEmailReturnCode(t *testing.T) { resourceOwner: "org1", email: "email@test.ch", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, { name: "missing email", @@ -390,7 +390,7 @@ func TestCommands_ChangeUserEmailReturnCode(t *testing.T) { resourceOwner: "org1", email: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty"), + wantErr: zerrors.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty"), }, } for _, tt := range tests { @@ -434,7 +434,7 @@ func TestCommands_ChangeUserEmailVerified(t *testing.T) { resourceOwner: "org1", email: "email@test.ch", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing"), }, { name: "missing permission", @@ -465,7 +465,7 @@ func TestCommands_ChangeUserEmailVerified(t *testing.T) { resourceOwner: "org1", email: "email-changed@test.ch", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, { name: "missing email", @@ -496,7 +496,7 @@ func TestCommands_ChangeUserEmailVerified(t *testing.T) { resourceOwner: "org1", email: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty"), + wantErr: zerrors.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty"), }, { name: "email changed", @@ -590,7 +590,7 @@ func TestCommands_changeUserEmailWithGenerator(t *testing.T) { returnCode: false, urlTmpl: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing"), }, { name: "missing permission", @@ -623,7 +623,7 @@ func TestCommands_changeUserEmailWithGenerator(t *testing.T) { returnCode: false, urlTmpl: "", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, { name: "missing email", @@ -656,7 +656,7 @@ func TestCommands_changeUserEmailWithGenerator(t *testing.T) { returnCode: false, urlTmpl: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty"), + wantErr: zerrors.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty"), }, { name: "not changed", @@ -689,7 +689,7 @@ func TestCommands_changeUserEmailWithGenerator(t *testing.T) { returnCode: false, urlTmpl: "", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Email.NotChanged"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Email.NotChanged"), }, { name: "email changed", @@ -913,7 +913,7 @@ func TestCommands_VerifyUserEmail(t *testing.T) { resourceOwner: "org1", code: "a", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing"), }, { name: "missing code", @@ -952,7 +952,7 @@ func TestCommands_VerifyUserEmail(t *testing.T) { resourceOwner: "org1", code: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-Fia4a", "Errors.User.Code.Empty"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-Fia4a", "Errors.User.Code.Empty"), }, { name: "wrong code", @@ -1009,7 +1009,7 @@ func TestCommands_VerifyUserEmail(t *testing.T) { resourceOwner: "org1", code: "wrong", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-eis9R", "Errors.User.Code.Invalid"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-eis9R", "Errors.User.Code.Invalid"), }, } for _, tt := range tests { @@ -1050,7 +1050,7 @@ func TestCommands_verifyUserEmailWithGenerator(t *testing.T) { resourceOwner: "org1", code: "a", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing"), }, { name: "missing code", @@ -1080,7 +1080,7 @@ func TestCommands_verifyUserEmailWithGenerator(t *testing.T) { resourceOwner: "org1", code: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-Fia4a", "Errors.User.Code.Empty"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-Fia4a", "Errors.User.Code.Empty"), }, { name: "good code", @@ -1128,7 +1128,7 @@ func TestCommands_verifyUserEmailWithGenerator(t *testing.T) { resourceOwner: "org1", code: "wrong", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-eis9R", "Errors.User.Code.Invalid"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-eis9R", "Errors.User.Code.Invalid"), }, { name: "wrong code", @@ -1216,7 +1216,7 @@ func TestCommands_NewUserEmailEvents(t *testing.T) { userID: "", resourceOwner: "org1", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-0Gzs3", "Errors.User.Email.IDMissing"), }, { name: "not found", @@ -1227,7 +1227,7 @@ func TestCommands_NewUserEmailEvents(t *testing.T) { userID: "user1", resourceOwner: "org1", }, - wantErr: caos_errs.ThrowNotFound(nil, "COMMAND-ieJ2e", "Errors.User.Email.NotFound"), + wantErr: zerrors.ThrowNotFound(nil, "COMMAND-ieJ2e", "Errors.User.Email.NotFound"), }, { name: "user not initialized", @@ -1262,7 +1262,7 @@ func TestCommands_NewUserEmailEvents(t *testing.T) { userID: "user1", resourceOwner: "org1", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-uz0Uu", "Errors.User.NotInitialised"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-uz0Uu", "Errors.User.NotInitialised"), }, } for _, tt := range tests { diff --git a/internal/command/user_v2_passkey.go b/internal/command/user_v2_passkey.go index 47af8c134..698b805d7 100644 --- a/internal/command/user_v2_passkey.go +++ b/internal/command/user_v2_passkey.go @@ -10,9 +10,9 @@ import ( "github.com/zitadel/zitadel/internal/command/preparation" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) // RegisterUserPasskey creates a passkey registration for the current authenticated user. @@ -51,7 +51,7 @@ func (c *Commands) verifyUserPasskeyCode(ctx context.Context, userID, resourceOw err = verifyCryptoCode(ctx, c.eventstore.Filter, domain.SecretGeneratorTypePasswordlessInitCode, alg, wm.ChangeDate, wm.Expiration, wm.CryptoCode, code) if err != nil || wm.State != domain.PasswordlessInitCodeStateActive { c.verifyUserPasskeyCodeFailed(ctx, wm) - return nil, caos_errs.ThrowInvalidArgument(err, "COMMAND-Eeb2a", "Errors.User.Code.Invalid") + return nil, zerrors.ThrowInvalidArgument(err, "COMMAND-Eeb2a", "Errors.User.Code.Invalid") } return func(ctx context.Context, userAgg *eventstore.Aggregate) eventstore.Command { return user.NewHumanPasswordlessInitCodeCheckSucceededEvent(ctx, userAgg, codeID) diff --git a/internal/command/user_v2_passkey_test.go b/internal/command/user_v2_passkey_test.go index 52c5fea7f..1e972bbfd 100644 --- a/internal/command/user_v2_passkey_test.go +++ b/internal/command/user_v2_passkey_test.go @@ -14,13 +14,13 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" webauthn_helper "github.com/zitadel/zitadel/internal/webauthn" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_RegisterUserPasskey(t *testing.T) { @@ -56,7 +56,7 @@ func TestCommands_RegisterUserPasskey(t *testing.T) { resourceOwner: "org1", authenticator: domain.AuthenticatorAttachmentCrossPlattform, }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong"), }, { name: "get human passwordless error", @@ -186,7 +186,7 @@ func TestCommands_RegisterUserPasskeyWithCode(t *testing.T) { codeID: "123", code: "wrong", }, - wantErr: caos_errs.ThrowInvalidArgument(err, "COMMAND-Eeb2a", "Errors.User.Code.Invalid"), + wantErr: zerrors.ThrowInvalidArgument(err, "COMMAND-Eeb2a", "Errors.User.Code.Invalid"), }, { name: "code verification ok, get human passwordless error", @@ -296,7 +296,7 @@ func TestCommands_verifyUserPasskeyCode(t *testing.T) { codeID: "123", code: "wrong", }, - wantErr: caos_errs.ThrowInvalidArgument(err, "COMMAND-Eeb2a", "Errors.User.Code.Invalid"), + wantErr: zerrors.ThrowInvalidArgument(err, "COMMAND-Eeb2a", "Errors.User.Code.Invalid"), }, { name: "success", @@ -573,7 +573,7 @@ func TestCommands_AddUserPasskeyCodeURLTemplate(t *testing.T) { resourceOwner: "org1", urlTmpl: "{{", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), + wantErr: zerrors.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), }, { name: "id generator error", diff --git a/internal/command/user_v2_password.go b/internal/command/user_v2_password.go index 53b25c5e4..d94bc0286 100644 --- a/internal/command/user_v2_password.go +++ b/internal/command/user_v2_password.go @@ -6,8 +6,8 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) // RequestPasswordReset generates a code @@ -38,17 +38,17 @@ func (c *Commands) RequestPasswordResetReturnCode(ctx context.Context, userID st // urlTmpl allows changing the target URL that is used by the e-mail and should be a validated Go template, if used. func (c *Commands) requestPasswordReset(ctx context.Context, userID string, returnCode bool, urlTmpl string, notificationType domain.NotificationType) (_ *domain.ObjectDetails, plainCode *string, err error) { if userID == "" { - return nil, nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-SAFdda", "Errors.User.IDMissing") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-SAFdda", "Errors.User.IDMissing") } model, err := c.getHumanWriteModelByID(ctx, userID, "") if err != nil { return nil, nil, err } if !model.UserState.Exists() { - return nil, nil, caos_errs.ThrowNotFound(nil, "COMMAND-SAF4f", "Errors.User.NotFound") + return nil, nil, zerrors.ThrowNotFound(nil, "COMMAND-SAF4f", "Errors.User.NotFound") } if model.UserState == domain.UserStateInitial { - return nil, nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sfe4g", "Errors.User.NotInitialised") + return nil, nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sfe4g", "Errors.User.NotInitialised") } if authz.GetCtxData(ctx).UserID != userID { if err = c.checkPermission(ctx, domain.PermissionUserWrite, model.ResourceOwner, userID); err != nil { diff --git a/internal/command/user_v2_password_test.go b/internal/command/user_v2_password_test.go index a88fd6e6a..0b72c4922 100644 --- a/internal/command/user_v2_password_test.go +++ b/internal/command/user_v2_password_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/require" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_RequestPasswordReset(t *testing.T) { @@ -42,7 +42,7 @@ func TestCommands_RequestPasswordReset(t *testing.T) { ctx: context.Background(), userID: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-SAFdda", "Errors.User.IDMissing"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-SAFdda", "Errors.User.IDMissing"), }, { name: "user not existing", @@ -55,7 +55,7 @@ func TestCommands_RequestPasswordReset(t *testing.T) { ctx: context.Background(), userID: "userID", }, - wantErr: caos_errs.ThrowNotFound(nil, "COMMAND-SAF4f", "Errors.User.NotFound"), + wantErr: zerrors.ThrowNotFound(nil, "COMMAND-SAF4f", "Errors.User.NotFound"), }, { name: "user not initialized", @@ -78,7 +78,7 @@ func TestCommands_RequestPasswordReset(t *testing.T) { ctx: context.Background(), userID: "userID", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sfe4g", "Errors.User.NotInitialised"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sfe4g", "Errors.User.NotInitialised"), }, { name: "missing permission", @@ -98,7 +98,7 @@ func TestCommands_RequestPasswordReset(t *testing.T) { ctx: context.Background(), userID: "userID", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, } for _, tt := range tests { @@ -140,7 +140,7 @@ func TestCommands_RequestPasswordResetReturnCode(t *testing.T) { ctx: context.Background(), userID: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-SAFdda", "Errors.User.IDMissing"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-SAFdda", "Errors.User.IDMissing"), }, { name: "user not existing", @@ -153,7 +153,7 @@ func TestCommands_RequestPasswordResetReturnCode(t *testing.T) { ctx: context.Background(), userID: "userID", }, - wantErr: caos_errs.ThrowNotFound(nil, "COMMAND-SAF4f", "Errors.User.NotFound"), + wantErr: zerrors.ThrowNotFound(nil, "COMMAND-SAF4f", "Errors.User.NotFound"), }, { name: "user not initialized", @@ -176,7 +176,7 @@ func TestCommands_RequestPasswordResetReturnCode(t *testing.T) { ctx: context.Background(), userID: "userID", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sfe4g", "Errors.User.NotInitialised"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sfe4g", "Errors.User.NotInitialised"), }, { name: "missing permission", @@ -196,7 +196,7 @@ func TestCommands_RequestPasswordResetReturnCode(t *testing.T) { ctx: context.Background(), userID: "userID", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, } for _, tt := range tests { @@ -240,7 +240,7 @@ func TestCommands_RequestPasswordResetURLTemplate(t *testing.T) { userID: "user1", urlTmpl: "{{", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), + wantErr: zerrors.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), }, { @@ -252,7 +252,7 @@ func TestCommands_RequestPasswordResetURLTemplate(t *testing.T) { ctx: context.Background(), userID: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-SAFdda", "Errors.User.IDMissing"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-SAFdda", "Errors.User.IDMissing"), }, { name: "user not existing", @@ -265,7 +265,7 @@ func TestCommands_RequestPasswordResetURLTemplate(t *testing.T) { ctx: context.Background(), userID: "userID", }, - wantErr: caos_errs.ThrowNotFound(nil, "COMMAND-SAF4f", "Errors.User.NotFound"), + wantErr: zerrors.ThrowNotFound(nil, "COMMAND-SAF4f", "Errors.User.NotFound"), }, { name: "user not initialized", @@ -288,7 +288,7 @@ func TestCommands_RequestPasswordResetURLTemplate(t *testing.T) { ctx: context.Background(), userID: "userID", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sfe4g", "Errors.User.NotInitialised"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sfe4g", "Errors.User.NotInitialised"), }, { name: "missing permission", @@ -308,7 +308,7 @@ func TestCommands_RequestPasswordResetURLTemplate(t *testing.T) { ctx: context.Background(), userID: "userID", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, } for _, tt := range tests { @@ -360,7 +360,7 @@ func TestCommands_requestPasswordReset(t *testing.T) { userID: "", }, res: res{ - err: caos_errs.ThrowInvalidArgument(nil, "COMMAND-SAFdda", "Errors.User.IDMissing"), + err: zerrors.ThrowInvalidArgument(nil, "COMMAND-SAFdda", "Errors.User.IDMissing"), }, }, { @@ -375,7 +375,7 @@ func TestCommands_requestPasswordReset(t *testing.T) { userID: "userID", }, res: res{ - err: caos_errs.ThrowNotFound(nil, "COMMAND-SAF4f", "Errors.User.NotFound"), + err: zerrors.ThrowNotFound(nil, "COMMAND-SAF4f", "Errors.User.NotFound"), }, }, { @@ -400,7 +400,7 @@ func TestCommands_requestPasswordReset(t *testing.T) { userID: "userID", }, res: res{ - err: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Sfe4g", "Errors.User.NotInitialised"), + err: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Sfe4g", "Errors.User.NotInitialised"), }, }, { @@ -422,7 +422,7 @@ func TestCommands_requestPasswordReset(t *testing.T) { userID: "userID", }, res: res{ - err: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + err: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, }, { diff --git a/internal/command/user_v2_phone.go b/internal/command/user_v2_phone.go index b8e117469..e501b3e3f 100644 --- a/internal/command/user_v2_phone.go +++ b/internal/command/user_v2_phone.go @@ -8,9 +8,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) // ChangeUserPhone sets a user's phone number, generates a code @@ -113,7 +113,7 @@ type UserPhoneEvents struct { // If a model cannot be found, or it's state is invalid and error is returned. func (c *Commands) NewUserPhoneEvents(ctx context.Context, userID, resourceOwner string) (*UserPhoneEvents, error) { if userID == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "COMMAND-xP292j", "Errors.User.Phone.IDMissing") + return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-xP292j", "Errors.User.Phone.IDMissing") } model, err := c.phoneWriteModelByID(ctx, userID, resourceOwner) @@ -121,10 +121,10 @@ func (c *Commands) NewUserPhoneEvents(ctx context.Context, userID, resourceOwner return nil, err } if model.UserState == domain.UserStateUnspecified || model.UserState == domain.UserStateDeleted { - return nil, caos_errs.ThrowNotFound(nil, "COMMAND-ieJ2e", "Errors.User.Phone.NotFound") + return nil, zerrors.ThrowNotFound(nil, "COMMAND-ieJ2e", "Errors.User.Phone.NotFound") } if model.UserState == domain.UserStateInitial { - return nil, caos_errs.ThrowPreconditionFailed(nil, "COMMAND-uz0Uu", "Errors.User.NotInitialised") + return nil, zerrors.ThrowPreconditionFailed(nil, "COMMAND-uz0Uu", "Errors.User.NotInitialised") } return &UserPhoneEvents{ eventstore: c.eventstore, @@ -142,7 +142,7 @@ func (c *UserPhoneEvents) Change(ctx context.Context, phone domain.PhoneNumber) } event, hasChanged := c.model.NewChangedEvent(ctx, c.aggregate, phone) if !hasChanged { - return caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Phone.NotChanged") + return zerrors.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Phone.NotChanged") } c.events = append(c.events, event) return nil @@ -170,7 +170,7 @@ func (c *UserPhoneEvents) AddGeneratedCode(ctx context.Context, gen crypto.Gener func (c *UserPhoneEvents) VerifyCode(ctx context.Context, code string, gen crypto.Generator) error { if code == "" { - return caos_errs.ThrowInvalidArgument(nil, "COMMAND-Fia4a", "Errors.User.Code.Empty") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-Fia4a", "Errors.User.Code.Empty") } err := crypto.VerifyCode(c.model.CodeCreationDate, c.model.CodeExpiry, c.model.Code, code, gen) @@ -180,7 +180,7 @@ func (c *UserPhoneEvents) VerifyCode(ctx context.Context, code string, gen crypt } _, err = c.eventstore.Push(ctx, user.NewHumanPhoneVerificationFailedEvent(ctx, c.aggregate)) logging.WithFields("id", "COMMAND-Zoo6b", "userID", c.aggregate.ID).OnError(err).Error("NewHumanPhoneVerificationFailedEvent push failed") - return caos_errs.ThrowInvalidArgument(err, "COMMAND-eis9R", "Errors.User.Code.Invalid") + return zerrors.ThrowInvalidArgument(err, "COMMAND-eis9R", "Errors.User.Code.Invalid") } // Push all events to the eventstore and Reduce them into the Model. diff --git a/internal/command/user_v2_phone_test.go b/internal/command/user_v2_phone_test.go index 5e8ac63a9..fe0c9f636 100644 --- a/internal/command/user_v2_phone_test.go +++ b/internal/command/user_v2_phone_test.go @@ -13,11 +13,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_ChangeUserPhone(t *testing.T) { @@ -78,7 +78,7 @@ func TestCommands_ChangeUserPhone(t *testing.T) { resourceOwner: "org1", phone: "", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, { name: "missing phone", @@ -122,7 +122,7 @@ func TestCommands_ChangeUserPhone(t *testing.T) { resourceOwner: "org1", phone: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "PHONE-Zt0NV", "Errors.User.Phone.Empty"), + wantErr: zerrors.ThrowInvalidArgument(nil, "PHONE-Zt0NV", "Errors.User.Phone.Empty"), }, { name: "not changed", @@ -166,7 +166,7 @@ func TestCommands_ChangeUserPhone(t *testing.T) { resourceOwner: "org1", phone: "+41791234567", }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Phone.NotChanged"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Phone.NotChanged"), }, } for _, tt := range tests { @@ -240,7 +240,7 @@ func TestCommands_ChangeUserPhoneReturnCode(t *testing.T) { resourceOwner: "org1", phone: "+41791234567", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, { name: "missing phone", @@ -284,7 +284,7 @@ func TestCommands_ChangeUserPhoneReturnCode(t *testing.T) { resourceOwner: "org1", phone: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "PHONE-Zt0NV", "Errors.User.Phone.Empty"), + wantErr: zerrors.ThrowInvalidArgument(nil, "PHONE-Zt0NV", "Errors.User.Phone.Empty"), }, } for _, tt := range tests { @@ -328,7 +328,7 @@ func TestCommands_ChangeUserPhoneVerified(t *testing.T) { resourceOwner: "org1", phone: "+41791234567", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-xP292j", "Errors.User.Phone.IDMissing"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-xP292j", "Errors.User.Phone.IDMissing"), }, { name: "missing permission", @@ -363,7 +363,7 @@ func TestCommands_ChangeUserPhoneVerified(t *testing.T) { resourceOwner: "org1", phone: "+41791234567", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, { name: "missing phone", @@ -398,7 +398,7 @@ func TestCommands_ChangeUserPhoneVerified(t *testing.T) { resourceOwner: "org1", phone: "", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "PHONE-Zt0NV", "Errors.User.Phone.Empty"), + wantErr: zerrors.ThrowInvalidArgument(nil, "PHONE-Zt0NV", "Errors.User.Phone.Empty"), }, { name: "phone changed", @@ -494,7 +494,7 @@ func TestCommands_changeUserPhoneWithGenerator(t *testing.T) { phone: "+41791234567", returnCode: false, }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "COMMAND-xP292j", "Errors.User.Phone.IDMissing"), + wantErr: zerrors.ThrowInvalidArgument(nil, "COMMAND-xP292j", "Errors.User.Phone.IDMissing"), }, { name: "missing permission", @@ -530,7 +530,7 @@ func TestCommands_changeUserPhoneWithGenerator(t *testing.T) { phone: "+41791234567", returnCode: false, }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTHZ-HKJD33", "Errors.PermissionDenied"), }, { name: "missing phone", @@ -566,7 +566,7 @@ func TestCommands_changeUserPhoneWithGenerator(t *testing.T) { phone: "", returnCode: false, }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "PHONE-Zt0NV", "Errors.User.Phone.Empty"), + wantErr: zerrors.ThrowInvalidArgument(nil, "PHONE-Zt0NV", "Errors.User.Phone.Empty"), }, { name: "not changed", @@ -602,7 +602,7 @@ func TestCommands_changeUserPhoneWithGenerator(t *testing.T) { phone: "+41791234567", returnCode: false, }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Phone.NotChanged"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-Uch5e", "Errors.User.Phone.NotChanged"), }, { name: "phone changed", diff --git a/internal/command/user_v2_totp_test.go b/internal/command/user_v2_totp_test.go index 206686d42..4e1df191d 100644 --- a/internal/command/user_v2_totp_test.go +++ b/internal/command/user_v2_totp_test.go @@ -14,10 +14,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_AddUserTOTP(t *testing.T) { @@ -44,7 +44,7 @@ func TestCommands_AddUserTOTP(t *testing.T) { userID: "foo", resourceowner: "org1", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong"), }, { name: "create otp error", @@ -58,7 +58,7 @@ func TestCommands_AddUserTOTP(t *testing.T) { expectFilter(), ), }, - wantErr: caos_errs.ThrowPreconditionFailed(nil, "COMMAND-SqyJz", "Errors.User.NotFound"), + wantErr: zerrors.ThrowPreconditionFailed(nil, "COMMAND-SqyJz", "Errors.User.NotFound"), }, { name: "push error", @@ -217,7 +217,7 @@ func TestCommands_CheckUserTOTP(t *testing.T) { args: args{ userID: "foo", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong"), }, { name: "success", diff --git a/internal/command/user_v2_u2f_test.go b/internal/command/user_v2_u2f_test.go index 9eb850004..a69dac062 100644 --- a/internal/command/user_v2_u2f_test.go +++ b/internal/command/user_v2_u2f_test.go @@ -11,13 +11,13 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/id" id_mock "github.com/zitadel/zitadel/internal/id/mock" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" webauthn_helper "github.com/zitadel/zitadel/internal/webauthn" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCommands_RegisterUserU2F(t *testing.T) { @@ -51,7 +51,7 @@ func TestCommands_RegisterUserU2F(t *testing.T) { userID: "foo", resourceOwner: "org1", }, - wantErr: caos_errs.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong"), + wantErr: zerrors.ThrowPermissionDenied(nil, "AUTH-Bohd2", "Errors.User.UserIDWrong"), }, { name: "get human passwordless error", diff --git a/internal/config/config.go b/internal/config/config.go index 0f60aa227..b454cea41 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -9,7 +9,7 @@ import ( "github.com/BurntSushi/toml" "sigs.k8s.io/yaml" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type ValidatableConfiguration interface { @@ -52,13 +52,13 @@ func readConfigFile(readerFunc ReaderFunc, configFile string, obj interface{}) e configStr, err := ioutil.ReadFile(configFile) if err != nil { - return errors.ThrowInternalf(err, "CONFI-nJk2a", "failed to read config file %s", configFile) + return zerrors.ThrowInternalf(err, "CONFI-nJk2a", "failed to read config file %s", configFile) } configStr = []byte(os.ExpandEnv(string(configStr))) if err := readerFunc(configStr, obj); err != nil { - return errors.ThrowInternalf(err, "CONFI-2Mc3c", "error parse config file %s", configFile) + return zerrors.ThrowInternalf(err, "CONFI-2Mc3c", "error parse config file %s", configFile) } return nil @@ -74,5 +74,5 @@ func readerFuncForFile(configFile string) (ReaderFunc, error) { case ".toml": return TOMLReader, nil } - return nil, errors.ThrowUnimplementedf(nil, "CONFI-ZLk4u", "file extension (%s) not supported", ext) + return nil, zerrors.ThrowUnimplementedf(nil, "CONFI-ZLk4u", "file extension (%s) not supported", ext) } diff --git a/internal/crypto/aes.go b/internal/crypto/aes.go index 15c89e7f9..e943c2ca8 100644 --- a/internal/crypto/aes.go +++ b/internal/crypto/aes.go @@ -7,7 +7,7 @@ import ( "encoding/base64" "io" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var _ EncryptionAlgorithm = (*AESCrypto)(nil) @@ -73,7 +73,7 @@ func (a *AESCrypto) encryptionKey() string { func (a *AESCrypto) decryptionKey(keyID string) (string, error) { key, ok := a.keys[keyID] if !ok { - return "", errors.ThrowNotFound(nil, "CRYPT-nkj1s", "unknown key id") + return "", zerrors.ThrowNotFound(nil, "CRYPT-nkj1s", "unknown key id") } return key, nil } @@ -94,7 +94,7 @@ func EncryptAES(plainText []byte, key string) ([]byte, error) { maxSize := 64 * 1024 * 1024 if len(plainText) > maxSize { - return nil, errors.ThrowPreconditionFailedf(nil, "CRYPT-AGg4t3", "data too large, max bytes: %v", maxSize) + return nil, zerrors.ThrowPreconditionFailedf(nil, "CRYPT-AGg4t3", "data too large, max bytes: %v", maxSize) } cipherText := make([]byte, aes.BlockSize+len(plainText)) iv := cipherText[:aes.BlockSize] @@ -130,7 +130,7 @@ func DecryptAES(text []byte, key string) ([]byte, error) { } if len(cipherText) < aes.BlockSize { - err = errors.ThrowPreconditionFailed(nil, "CRYPT-23kH1", "cipher text block too short") + err = zerrors.ThrowPreconditionFailed(nil, "CRYPT-23kH1", "cipher text block too short") return nil, err } iv := cipherText[:aes.BlockSize] diff --git a/internal/crypto/code.go b/internal/crypto/code.go index 60d1496ec..2c67c39cd 100644 --- a/internal/crypto/code.go +++ b/internal/crypto/code.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "time" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -126,7 +126,7 @@ func VerifyCode(creationDate time.Time, expiry time.Duration, cryptoCode *Crypto func VerifyCodeWithAlgorithm(creationDate time.Time, expiry time.Duration, cryptoCode *CryptoValue, verificationCode string, algorithm Crypto) error { if IsCodeExpired(creationDate, expiry) { - return errors.ThrowPreconditionFailed(nil, "CODE-QvUQ4P", "Errors.User.Code.Expired") + return zerrors.ThrowPreconditionFailed(nil, "CODE-QvUQ4P", "Errors.User.Code.Expired") } switch alg := algorithm.(type) { case EncryptionAlgorithm: @@ -134,7 +134,7 @@ func VerifyCodeWithAlgorithm(creationDate time.Time, expiry time.Duration, crypt case HashAlgorithm: return verifyHashedCode(cryptoCode, verificationCode, alg) } - return errors.ThrowInvalidArgument(nil, "CODE-fW2gNa", "Errors.User.Code.GeneratorAlgNotSupported") + return zerrors.ThrowInvalidArgument(nil, "CODE-fW2gNa", "Errors.User.Code.GeneratorAlgNotSupported") } func GenerateRandomString(length uint, chars []rune) (string, error) { @@ -161,7 +161,7 @@ func GenerateRandomString(length uint, chars []rune) (string, error) { func verifyEncryptedCode(cryptoCode *CryptoValue, verificationCode string, alg EncryptionAlgorithm) error { if cryptoCode == nil { - return errors.ThrowInvalidArgument(nil, "CRYPT-aqrFV", "Errors.User.Code.CryptoCodeNil") + return zerrors.ThrowInvalidArgument(nil, "CRYPT-aqrFV", "Errors.User.Code.CryptoCodeNil") } code, err := DecryptString(cryptoCode, alg) if err != nil { @@ -169,14 +169,14 @@ func verifyEncryptedCode(cryptoCode *CryptoValue, verificationCode string, alg E } if code != verificationCode { - return errors.ThrowInvalidArgument(nil, "CODE-woT0xc", "Errors.User.Code.Invalid") + return zerrors.ThrowInvalidArgument(nil, "CODE-woT0xc", "Errors.User.Code.Invalid") } return nil } func verifyHashedCode(cryptoCode *CryptoValue, verificationCode string, alg HashAlgorithm) error { if cryptoCode == nil { - return errors.ThrowInvalidArgument(nil, "CRYPT-2q3r", "cryptoCode must not be nil") + return zerrors.ThrowInvalidArgument(nil, "CRYPT-2q3r", "cryptoCode must not be nil") } return CompareHash(cryptoCode, []byte(verificationCode), alg) } diff --git a/internal/crypto/code_mocker.go b/internal/crypto/code_mocker.go index 9cd208f6d..66071ccab 100644 --- a/internal/crypto/code_mocker.go +++ b/internal/crypto/code_mocker.go @@ -5,7 +5,7 @@ import ( "go.uber.org/mock/gomock" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func CreateMockEncryptionAlg(ctrl *gomock.Controller) EncryptionAlgorithm { @@ -26,7 +26,7 @@ func CreateMockEncryptionAlgWithCode(ctrl *gomock.Controller, code string) Encry ctrl, func(c []byte) ([]byte, error) { if len(c) != len(code) { - return nil, errors.ThrowInvalidArgumentf(nil, "id", "invalid code length - expected %d, got %d", len(code), len(c)) + return nil, zerrors.ThrowInvalidArgumentf(nil, "id", "invalid code length - expected %d, got %d", len(code), len(c)) } return []byte(code), nil }, @@ -44,7 +44,7 @@ func createMockEncryptionAlgorithm(ctrl *gomock.Controller, encryptFunction func mCrypto.EXPECT().DecryptString(gomock.Any(), gomock.Any()).AnyTimes().DoAndReturn( func(code []byte, keyID string) (string, error) { if keyID != "id" { - return "", errors.ThrowInternal(nil, "id", "invalid key id") + return "", zerrors.ThrowInternal(nil, "id", "invalid key id") } return string(code), nil }, @@ -52,7 +52,7 @@ func createMockEncryptionAlgorithm(ctrl *gomock.Controller, encryptFunction func mCrypto.EXPECT().Decrypt(gomock.Any(), gomock.Any()).AnyTimes().DoAndReturn( func(code []byte, keyID string) ([]byte, error) { if keyID != "id" { - return nil, errors.ThrowInternal(nil, "id", "invalid key id") + return nil, zerrors.ThrowInternal(nil, "id", "invalid key id") } return code, nil }, @@ -71,7 +71,7 @@ func CreateMockHashAlg(ctrl *gomock.Controller) HashAlgorithm { mCrypto.EXPECT().CompareHash(gomock.Any(), gomock.Any()).AnyTimes().DoAndReturn( func(hashed, comparer []byte) error { if string(hashed) != string(comparer) { - return errors.ThrowInternal(nil, "id", "invalid") + return zerrors.ThrowInternal(nil, "id", "invalid") } return nil }, diff --git a/internal/crypto/crypto.go b/internal/crypto/crypto.go index 5cc057590..14c249e98 100644 --- a/internal/crypto/crypto.go +++ b/internal/crypto/crypto.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "encoding/json" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -66,13 +66,13 @@ func Crypt(value []byte, c Crypto) (*CryptoValue, error) { case HashAlgorithm: return Hash(value, alg) } - return nil, errors.ThrowInternal(nil, "CRYPT-r4IaHZ", "algorithm not supported") + return nil, zerrors.ThrowInternal(nil, "CRYPT-r4IaHZ", "algorithm not supported") } func Encrypt(value []byte, alg EncryptionAlgorithm) (*CryptoValue, error) { encrypted, err := alg.Encrypt(value) if err != nil { - return nil, errors.ThrowInternal(err, "CRYPT-qCD0JB", "error encrypting value") + return nil, zerrors.ThrowInternal(err, "CRYPT-qCD0JB", "error encrypting value") } return &CryptoValue{ CryptoType: TypeEncryption, @@ -98,20 +98,20 @@ func DecryptString(value *CryptoValue, alg EncryptionAlgorithm) (string, error) func checkEncryptionAlgorithm(value *CryptoValue, alg EncryptionAlgorithm) error { if value.Algorithm != alg.Algorithm() { - return errors.ThrowInvalidArgument(nil, "CRYPT-Nx7XlT", "value was encrypted with a different key") + return zerrors.ThrowInvalidArgument(nil, "CRYPT-Nx7XlT", "value was encrypted with a different key") } for _, id := range alg.DecryptionKeyIDs() { if id == value.KeyID { return nil } } - return errors.ThrowInvalidArgument(nil, "CRYPT-Kq12vn", "value was encrypted with a different key") + return zerrors.ThrowInvalidArgument(nil, "CRYPT-Kq12vn", "value was encrypted with a different key") } func Hash(value []byte, alg HashAlgorithm) (*CryptoValue, error) { hashed, err := alg.Hash(value) if err != nil { - return nil, errors.ThrowInternal(err, "CRYPT-rBVaJU", "error hashing value") + return nil, zerrors.ThrowInternal(err, "CRYPT-rBVaJU", "error hashing value") } return &CryptoValue{ CryptoType: TypeHash, @@ -122,7 +122,7 @@ func Hash(value []byte, alg HashAlgorithm) (*CryptoValue, error) { func CompareHash(value *CryptoValue, comparer []byte, alg HashAlgorithm) error { if value.Algorithm != alg.Algorithm() { - return errors.ThrowInvalidArgument(nil, "CRYPT-HF32f", "value was hashed with a different algorithm") + return zerrors.ThrowInvalidArgument(nil, "CRYPT-HF32f", "value was hashed with a different algorithm") } return alg.CompareHash(value.Crypted, comparer) } @@ -137,18 +137,18 @@ func FillHash(value []byte, alg HashAlgorithm) *CryptoValue { func CheckToken(alg EncryptionAlgorithm, token string, content string) error { if token == "" { - return errors.ThrowPermissionDenied(nil, "CRYPTO-Sfefs", "Errors.Intent.InvalidToken") + return zerrors.ThrowPermissionDenied(nil, "CRYPTO-Sfefs", "Errors.Intent.InvalidToken") } data, err := base64.RawURLEncoding.DecodeString(token) if err != nil { - return errors.ThrowPermissionDenied(err, "CRYPTO-Swg31", "Errors.Intent.InvalidToken") + return zerrors.ThrowPermissionDenied(err, "CRYPTO-Swg31", "Errors.Intent.InvalidToken") } decryptedToken, err := alg.DecryptString(data, alg.EncryptionKeyID()) if err != nil { - return errors.ThrowPermissionDenied(err, "CRYPTO-Sf4gt", "Errors.Intent.InvalidToken") + return zerrors.ThrowPermissionDenied(err, "CRYPTO-Sf4gt", "Errors.Intent.InvalidToken") } if decryptedToken != content { - return errors.ThrowPermissionDenied(nil, "CRYPTO-CRYPTO", "Errors.Intent.InvalidToken") + return zerrors.ThrowPermissionDenied(nil, "CRYPTO-CRYPTO", "Errors.Intent.InvalidToken") } return nil } diff --git a/internal/crypto/database/database.go b/internal/crypto/database/database.go index 7cbf46dc5..8fac222d9 100644 --- a/internal/crypto/database/database.go +++ b/internal/crypto/database/database.go @@ -7,7 +7,7 @@ import ( "github.com/zitadel/zitadel/internal/crypto" z_db "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type database struct { @@ -41,18 +41,18 @@ func (d *database) ReadKeys() (crypto.Keys, error) { From(EncryptionKeysTable). ToSql() if err != nil { - return nil, caos_errs.ThrowInternal(err, "", "unable to read keys") + return nil, zerrors.ThrowInternal(err, "", "unable to read keys") } err = d.client.Query(func(rows *sql.Rows) error { for rows.Next() { var id, encryptionKey string err = rows.Scan(&id, &encryptionKey) if err != nil { - return caos_errs.ThrowInternal(err, "", "unable to read keys") + return zerrors.ThrowInternal(err, "", "unable to read keys") } key, err := d.decrypt(encryptionKey, d.masterKey) if err != nil { - return caos_errs.ThrowInternal(err, "", "unable to decrypt key") + return zerrors.ThrowInternal(err, "", "unable to decrypt key") } keys[id] = key } @@ -60,7 +60,7 @@ func (d *database) ReadKeys() (crypto.Keys, error) { }, stmt, args...) if err != nil { - return nil, caos_errs.ThrowInternal(err, "", "unable to read keys") + return nil, zerrors.ThrowInternal(err, "", "unable to read keys") } return keys, nil @@ -73,23 +73,23 @@ func (d *database) ReadKey(id string) (_ *crypto.Key, err error) { PlaceholderFormat(sq.Dollar). ToSql() if err != nil { - return nil, caos_errs.ThrowInternal(err, "", "unable to read key") + return nil, zerrors.ThrowInternal(err, "", "unable to read key") } var key string err = d.client.QueryRow(func(row *sql.Row) error { var encryptionKey string err = row.Scan(&encryptionKey) if err != nil { - return caos_errs.ThrowInternal(err, "", "unable to read key") + return zerrors.ThrowInternal(err, "", "unable to read key") } key, err = d.decrypt(encryptionKey, d.masterKey) if err != nil { - return caos_errs.ThrowInternal(err, "", "unable to decrypt key") + return zerrors.ThrowInternal(err, "", "unable to decrypt key") } return nil }, stmt, args...) if err != nil { - return nil, caos_errs.ThrowInternal(err, "", "unable to read key") + return nil, zerrors.ThrowInternal(err, "", "unable to read key") } return &crypto.Key{ @@ -104,33 +104,33 @@ func (d *database) CreateKeys(keys ...*crypto.Key) error { for _, key := range keys { encryptionKey, err := d.encrypt(key.Value, d.masterKey) if err != nil { - return caos_errs.ThrowInternal(err, "", "unable to encrypt key") + return zerrors.ThrowInternal(err, "", "unable to encrypt key") } insert = insert.Values(key.ID, encryptionKey) } stmt, args, err := insert.ToSql() if err != nil { - return caos_errs.ThrowInternal(err, "", "unable to insert new keys") + return zerrors.ThrowInternal(err, "", "unable to insert new keys") } tx, err := d.client.Begin() if err != nil { - return caos_errs.ThrowInternal(err, "", "unable to insert new keys") + return zerrors.ThrowInternal(err, "", "unable to insert new keys") } _, err = tx.Exec(stmt, args...) if err != nil { tx.Rollback() - return caos_errs.ThrowInternal(err, "", "unable to insert new keys") + return zerrors.ThrowInternal(err, "", "unable to insert new keys") } err = tx.Commit() if err != nil { - return caos_errs.ThrowInternal(err, "", "unable to insert new keys") + return zerrors.ThrowInternal(err, "", "unable to insert new keys") } return nil } func checkMasterKeyLength(masterKey string) error { if length := len([]byte(masterKey)); length != 32 { - return caos_errs.ThrowInternalf(nil, "", "masterkey must be 32 bytes, but is %d", length) + return zerrors.ThrowInternalf(nil, "", "masterkey must be 32 bytes, but is %d", length) } return nil } diff --git a/internal/crypto/database/database_test.go b/internal/crypto/database/database_test.go index 62a089ab3..f7c831335 100644 --- a/internal/crypto/database/database_test.go +++ b/internal/crypto/database/database_test.go @@ -13,7 +13,7 @@ import ( "github.com/zitadel/zitadel/internal/crypto" z_db "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func Test_database_ReadKeys(t *testing.T) { @@ -62,7 +62,7 @@ func Test_database_ReadKeys(t *testing.T) { }, }, res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -187,7 +187,7 @@ func Test_database_ReadKey(t *testing.T) { id: "id1", }, res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -212,7 +212,7 @@ func Test_database_ReadKey(t *testing.T) { id: "id1", }, res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -303,7 +303,7 @@ func Test_database_CreateKeys(t *testing.T) { }, }, res{ - err: caos_errs.IsInternal, + err: zerrors.IsInternal, }, }, { @@ -422,7 +422,7 @@ func Test_checkMasterKeyLength(t *testing.T) { args{ masterKey: "", }, - caos_errs.IsInternal, + zerrors.IsInternal, }, { "valid length", diff --git a/internal/crypto/key.go b/internal/crypto/key.go index 8730f4ed2..5b4a22f69 100644 --- a/internal/crypto/key.go +++ b/internal/crypto/key.go @@ -5,7 +5,7 @@ import ( "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type KeyConfig struct { @@ -41,7 +41,7 @@ func LoadKey(id string, keyStorage KeyStorage) (string, error) { func LoadKeys(config *KeyConfig, keyStorage KeyStorage) (Keys, []string, error) { if config == nil { - return nil, nil, errors.ThrowInvalidArgument(nil, "CRYPT-dJK8s", "config must not be nil") + return nil, nil, zerrors.ThrowInvalidArgument(nil, "CRYPT-dJK8s", "config must not be nil") } readKeys, err := keyStorage.ReadKeys() if err != nil { @@ -52,7 +52,7 @@ func LoadKeys(config *KeyConfig, keyStorage KeyStorage) (Keys, []string, error) if config.EncryptionKeyID != "" { key, ok := readKeys[config.EncryptionKeyID] if !ok { - return nil, nil, errors.ThrowInternalf(nil, "CRYPT-v2Kas", "encryption key %s not found", config.EncryptionKeyID) + return nil, nil, zerrors.ThrowInternalf(nil, "CRYPT-v2Kas", "encryption key %s not found", config.EncryptionKeyID) } keys[config.EncryptionKeyID] = key ids = append(ids, config.EncryptionKeyID) diff --git a/internal/crypto/passwap.go b/internal/crypto/passwap.go index 479d5731e..1d9fb6752 100644 --- a/internal/crypto/passwap.go +++ b/internal/crypto/passwap.go @@ -13,7 +13,7 @@ import ( "github.com/zitadel/passwap/scrypt" "github.com/zitadel/passwap/verifier" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type PasswordHasher struct { @@ -62,11 +62,11 @@ type PasswordHashConfig struct { func (c *PasswordHashConfig) PasswordHasher() (*PasswordHasher, error) { verifiers, vPrefixes, err := c.buildVerifiers() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "CRYPT-sahW9", "password hash config invalid") + return nil, zerrors.ThrowInvalidArgument(err, "CRYPT-sahW9", "password hash config invalid") } hasher, hPrefixes, err := c.Hasher.buildHasher() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "CRYPT-Que4r", "password hash config invalid") + return nil, zerrors.ThrowInvalidArgument(err, "CRYPT-Que4r", "password hash config invalid") } return &PasswordHasher{ Swapper: passwap.NewSwapper(hasher, verifiers...), diff --git a/internal/database/database.go b/internal/database/database.go index d88a5f7e0..ce48b89af 100644 --- a/internal/database/database.go +++ b/internal/database/database.go @@ -13,7 +13,7 @@ import ( _ "github.com/zitadel/zitadel/internal/database/cockroach" "github.com/zitadel/zitadel/internal/database/dialect" _ "github.com/zitadel/zitadel/internal/database/postgres" - zerrors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type Config struct { diff --git a/internal/database/database_test.go b/internal/database/database_test.go index f7d63d6d6..38c76e698 100644 --- a/internal/database/database_test.go +++ b/internal/database/database_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "github.com/zitadel/zitadel/internal/database/mock" - zerrors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestQueryJSONObject(t *testing.T) { diff --git a/internal/domain/application_key.go b/internal/domain/application_key.go index 7d6407ee5..329c3ab1a 100644 --- a/internal/domain/application_key.go +++ b/internal/domain/application_key.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type ApplicationKey struct { @@ -40,7 +40,7 @@ func (k *ApplicationKey) Detail() ([]byte, error) { if k.Type == AuthNKeyTypeJSON { return k.MarshalJSON() } - return nil, errors.ThrowPreconditionFailed(nil, "KEY-dsg52", "Errors.Internal") + return nil, zerrors.ThrowPreconditionFailed(nil, "KEY-dsg52", "Errors.Internal") } func (k *ApplicationKey) MarshalJSON() ([]byte, error) { diff --git a/internal/domain/application_oauth.go b/internal/domain/application_oauth.go index 9bcb675d1..816eba4fd 100644 --- a/internal/domain/application_oauth.go +++ b/internal/domain/application_oauth.go @@ -7,8 +7,8 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/zerrors" ) type oAuthApplication interface { @@ -17,7 +17,7 @@ type oAuthApplication interface { requiresClientSecret() bool } -//ClientID random_number@projectname (eg. 495894098234@zitadel) +// ClientID random_number@projectname (eg. 495894098234@zitadel) func SetNewClientID(a oAuthApplication, idGenerator id.Generator, project *Project) error { clientID, err := NewClientID(idGenerator, project.Name) if err != nil { @@ -53,7 +53,7 @@ func NewClientSecret(generator crypto.Generator) (*crypto.CryptoValue, string, e cryptoValue, stringSecret, err := crypto.NewCode(generator) if err != nil { logging.Log("MODEL-UpnTI").OnError(err).Error("unable to create client secret") - return nil, "", errors.ThrowInternal(err, "MODEL-gH2Wl", "Errors.Project.CouldNotGenerateClientSecret") + return nil, "", zerrors.ThrowInternal(err, "MODEL-gH2Wl", "Errors.Project.CouldNotGenerateClientSecret") } return cryptoValue, stringSecret, nil } diff --git a/internal/domain/auth_request.go b/internal/domain/auth_request.go index 7d776b6d3..7607495d8 100644 --- a/internal/domain/auth_request.go +++ b/internal/domain/auth_request.go @@ -6,7 +6,7 @@ import ( "golang.org/x/text/language" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type AuthRequest struct { @@ -139,7 +139,7 @@ func NewAuthRequestFromType(requestType AuthRequestType) (*AuthRequest, error) { case AuthRequestTypeDevice: return &AuthRequest{Request: &AuthRequestDevice{}}, nil } - return nil, errors.ThrowInvalidArgument(nil, "DOMAIN-ds2kl", "invalid request type") + return nil, zerrors.ThrowInvalidArgument(nil, "DOMAIN-ds2kl", "invalid request type") } func (a *AuthRequest) WithCurrentInfo(info *BrowserInfo) *AuthRequest { diff --git a/internal/domain/authn_key.go b/internal/domain/authn_key.go index eb45e359e..6e0f113d3 100644 --- a/internal/domain/authn_key.go +++ b/internal/domain/authn_key.go @@ -4,7 +4,7 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type authNKey interface { @@ -53,12 +53,12 @@ func NewAuthNKeyPair(keySize int) (privateKey, publicKey []byte, err error) { private, public, err := crypto.GenerateKeyPair(keySize) if err != nil { logging.Log("AUTHN-Ud51I").WithError(err).Error("unable to create authn key pair") - return nil, nil, errors.ThrowInternal(err, "AUTHN-gdg2l", "Errors.Project.CouldNotGenerateClientSecret") + return nil, nil, zerrors.ThrowInternal(err, "AUTHN-gdg2l", "Errors.Project.CouldNotGenerateClientSecret") } publicKey, err = crypto.PublicKeyToBytes(public) if err != nil { logging.Log("AUTHN-Dbb35").WithError(err).Error("unable to convert public key") - return nil, nil, errors.ThrowInternal(err, "AUTHN-Bne3f", "Errors.Project.CouldNotGenerateClientSecret") + return nil, nil, zerrors.ThrowInternal(err, "AUTHN-Bne3f", "Errors.Project.CouldNotGenerateClientSecret") } privateKey = crypto.PrivateKeyToBytes(private) return privateKey, publicKey, nil diff --git a/internal/domain/custom_message_text.go b/internal/domain/custom_message_text.go index dbfbb5625..4ae0a3925 100644 --- a/internal/domain/custom_message_text.go +++ b/internal/domain/custom_message_text.go @@ -3,8 +3,8 @@ package domain import ( "golang.org/x/text/language" - zitadel_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -54,7 +54,7 @@ type CustomMessageText struct { func (m *CustomMessageText) IsValid(supportedLanguages []language.Tag) error { if m.MessageTextType == "" { - return zitadel_errs.ThrowInvalidArgument(nil, "INSTANCE-kd9fs", "Errors.CustomMessageText.Invalid") + return zerrors.ThrowInvalidArgument(nil, "INSTANCE-kd9fs", "Errors.CustomMessageText.Invalid") } if err := LanguageIsDefined(m.Language); err != nil { return err diff --git a/internal/domain/expiration.go b/internal/domain/expiration.go index 9b74702d1..bea1b5df8 100644 --- a/internal/domain/expiration.go +++ b/internal/domain/expiration.go @@ -3,7 +3,7 @@ package domain import ( "time" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -30,7 +30,7 @@ func ValidateExpirationDate(date time.Time) (time.Time, error) { return defaultExpDate, nil } if date.Before(time.Now()) { - return time.Time{}, errors.ThrowInvalidArgument(nil, "DOMAIN-dv3t5", "Errors.AuthNKey.ExpireBeforeNow") + return time.Time{}, zerrors.ThrowInvalidArgument(nil, "DOMAIN-dv3t5", "Errors.AuthNKey.ExpireBeforeNow") } return date, nil } diff --git a/internal/domain/human.go b/internal/domain/human.go index 0454a3665..6c2ec4daa 100644 --- a/internal/domain/human.go +++ b/internal/domain/human.go @@ -5,9 +5,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" - caos_errors "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type Human struct { @@ -59,7 +58,7 @@ func (f Gender) Specified() bool { func (u *Human) Normalize() error { if u.Username == "" { - return errors.ThrowInvalidArgument(nil, "COMMAND-00p2b", "Errors.User.Username.Empty") + return zerrors.ThrowInvalidArgument(nil, "COMMAND-00p2b", "Errors.User.Username.Empty") } if err := u.Profile.Validate(); err != nil { return err @@ -77,7 +76,7 @@ func (u *Human) Normalize() error { func (u *Human) CheckDomainPolicy(policy *DomainPolicy) error { if policy == nil { - return caos_errors.ThrowPreconditionFailed(nil, "DOMAIN-zSH7j", "Errors.Users.DomainPolicyNil") + return zerrors.ThrowPreconditionFailed(nil, "DOMAIN-zSH7j", "Errors.Users.DomainPolicyNil") } if !policy.UserLoginMustBeDomain && u.Profile != nil && u.Username == "" && u.Email != nil { u.Username = string(u.EmailAddress) diff --git a/internal/domain/human_email.go b/internal/domain/human_email.go index 86fd2f9e1..489787c6c 100644 --- a/internal/domain/human_email.go +++ b/internal/domain/human_email.go @@ -7,8 +7,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -19,10 +19,10 @@ type EmailAddress string func (e EmailAddress) Validate() error { if e == "" { - return errors.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty") + return zerrors.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty") } if !emailRegex.MatchString(string(e)) { - return errors.ThrowInvalidArgument(nil, "EMAIL-599BI", "Errors.User.Email.Invalid") + return zerrors.ThrowInvalidArgument(nil, "EMAIL-599BI", "Errors.User.Email.Invalid") } return nil } @@ -49,7 +49,7 @@ type EmailCode struct { func (e *Email) Validate() error { if e == nil { - return errors.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty") + return zerrors.ThrowInvalidArgument(nil, "EMAIL-spblu", "Errors.User.Email.Empty") } return e.EmailAddress.Validate() } diff --git a/internal/domain/human_email_test.go b/internal/domain/human_email_test.go index 4b30dd667..42aa77fd7 100644 --- a/internal/domain/human_email_test.go +++ b/internal/domain/human_email_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestEmailValid(t *testing.T) { @@ -100,7 +100,7 @@ func TestRenderConfirmURLTemplate(t *testing.T) { code: "123", orgID: "org1", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), + wantErr: zerrors.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), }, { name: "execution error", @@ -110,7 +110,7 @@ func TestRenderConfirmURLTemplate(t *testing.T) { code: "123", orgID: "org1", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-ieYa7", "Errors.User.InvalidURLTemplate"), + wantErr: zerrors.ThrowInvalidArgument(nil, "DOMAIN-ieYa7", "Errors.User.InvalidURLTemplate"), }, { name: "success", diff --git a/internal/domain/human_otp.go b/internal/domain/human_otp.go index 8dd9ddcb3..68b4b4ca0 100644 --- a/internal/domain/human_otp.go +++ b/internal/domain/human_otp.go @@ -5,7 +5,7 @@ import ( "github.com/pquerna/otp/totp" "github.com/zitadel/zitadel/internal/crypto" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type TOTP struct { @@ -18,7 +18,7 @@ type TOTP struct { func NewTOTPKey(issuer, accountName string, cryptoAlg crypto.EncryptionAlgorithm) (*otp.Key, *crypto.CryptoValue, error) { key, err := totp.Generate(totp.GenerateOpts{Issuer: issuer, AccountName: accountName}) if err != nil { - return nil, nil, caos_errs.ThrowInternal(err, "TOTP-ieY3o", "Errors.Internal") + return nil, nil, zerrors.ThrowInternal(err, "TOTP-ieY3o", "Errors.Internal") } encryptedSecret, err := crypto.Encrypt([]byte(key.Secret()), cryptoAlg) if err != nil { @@ -35,7 +35,7 @@ func VerifyTOTP(code string, secret *crypto.CryptoValue, cryptoAlg crypto.Encryp valid := totp.Validate(code, decrypt) if !valid { - return caos_errs.ThrowInvalidArgument(nil, "EVENT-8isk2", "Errors.User.MFA.OTP.InvalidCode") + return zerrors.ThrowInvalidArgument(nil, "EVENT-8isk2", "Errors.User.MFA.OTP.InvalidCode") } return nil } diff --git a/internal/domain/human_password.go b/internal/domain/human_password.go index 35bcbeaf2..779ed4dba 100644 --- a/internal/domain/human_password.go +++ b/internal/domain/human_password.go @@ -4,8 +4,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/crypto" - caos_errs "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type Password struct { @@ -35,7 +35,7 @@ func (p *Password) HashPasswordIfExisting(policy *PasswordComplexityPolicy, hash return nil } if policy == nil { - return caos_errs.ThrowPreconditionFailed(nil, "DOMAIN-s8ifS", "Errors.User.PasswordComplexityPolicy.NotFound") + return zerrors.ThrowPreconditionFailed(nil, "DOMAIN-s8ifS", "Errors.User.PasswordComplexityPolicy.NotFound") } if err := policy.Check(p.SecretString); err != nil { return err diff --git a/internal/domain/human_phone.go b/internal/domain/human_phone.go index 44eb5fe96..f350ea72a 100644 --- a/internal/domain/human_phone.go +++ b/internal/domain/human_phone.go @@ -6,8 +6,8 @@ import ( "github.com/ttacon/libphonenumber" "github.com/zitadel/zitadel/internal/crypto" - caos_errs "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) const defaultRegion = "CH" @@ -16,11 +16,11 @@ type PhoneNumber string func (p PhoneNumber) Normalize() (PhoneNumber, error) { if p == "" { - return p, caos_errs.ThrowInvalidArgument(nil, "PHONE-Zt0NV", "Errors.User.Phone.Empty") + return p, zerrors.ThrowInvalidArgument(nil, "PHONE-Zt0NV", "Errors.User.Phone.Empty") } phoneNr, err := libphonenumber.Parse(string(p), defaultRegion) if err != nil { - return p, caos_errs.ThrowInvalidArgument(err, "PHONE-so0wa", "Errors.User.Phone.Invalid") + return p, zerrors.ThrowInvalidArgument(err, "PHONE-so0wa", "Errors.User.Phone.Invalid") } return PhoneNumber(libphonenumber.Format(phoneNr, libphonenumber.E164)), nil } @@ -43,7 +43,7 @@ type PhoneCode struct { func (p *Phone) Normalize() error { if p == nil { - return caos_errs.ThrowInvalidArgument(nil, "PHONE-YlbwO", "Errors.User.Phone.Empty") + return zerrors.ThrowInvalidArgument(nil, "PHONE-YlbwO", "Errors.User.Phone.Empty") } normalizedNumber, err := p.PhoneNumber.Normalize() if err != nil { diff --git a/internal/domain/human_phone_test.go b/internal/domain/human_phone_test.go index c16680de4..1bcd2ee87 100644 --- a/internal/domain/human_phone_test.go +++ b/internal/domain/human_phone_test.go @@ -3,7 +3,7 @@ package domain import ( "testing" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestFormatPhoneNumber(t *testing.T) { @@ -23,7 +23,7 @@ func TestFormatPhoneNumber(t *testing.T) { PhoneNumber: "PhoneNumber", }, }, - errFunc: caos_errs.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, { name: "format phone 071...", diff --git a/internal/domain/human_profile.go b/internal/domain/human_profile.go index ac220c775..02b68ebe9 100644 --- a/internal/domain/human_profile.go +++ b/internal/domain/human_profile.go @@ -3,8 +3,8 @@ package domain import ( "golang.org/x/text/language" - "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type Profile struct { @@ -22,13 +22,13 @@ type Profile struct { func (p *Profile) Validate() error { if p == nil { - return errors.ThrowInvalidArgument(nil, "PROFILE-GPY3p", "Errors.User.Profile.Empty") + return zerrors.ThrowInvalidArgument(nil, "PROFILE-GPY3p", "Errors.User.Profile.Empty") } if p.FirstName == "" { - return errors.ThrowInvalidArgument(nil, "PROFILE-RF5z2", "Errors.User.Profile.FirstNameEmpty") + return zerrors.ThrowInvalidArgument(nil, "PROFILE-RF5z2", "Errors.User.Profile.FirstNameEmpty") } if p.LastName == "" { - return errors.ThrowInvalidArgument(nil, "PROFILE-DSUkN", "Errors.User.Profile.LastNameEmpty") + return zerrors.ThrowInvalidArgument(nil, "PROFILE-DSUkN", "Errors.User.Profile.LastNameEmpty") } return nil } diff --git a/internal/domain/language.go b/internal/domain/language.go index ffb00b20e..555104f50 100644 --- a/internal/domain/language.go +++ b/internal/domain/language.go @@ -5,7 +5,7 @@ import ( "golang.org/x/text/language" - z_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func StringsToLanguages(langs []string) []language.Tag { @@ -47,7 +47,7 @@ func LanguageIsAllowed(allowUndefined bool, allowedLanguages []language.Tag, lan return err } if len(allowedLanguages) > 0 && !languageIsContained(allowedLanguages, lang) { - return z_errors.ThrowPreconditionFailed(nil, "LANG-2M9fs", "Errors.Language.NotAllowed") + return zerrors.ThrowPreconditionFailed(nil, "LANG-2M9fs", "Errors.Language.NotAllowed") } return nil } @@ -66,14 +66,14 @@ func LanguagesAreSupported(supportedLanguages []language.Tag, lang ...language.T return nil } if len(unsupported) == 1 { - return z_errors.ThrowInvalidArgument(nil, "LANG-lg4DP", "Errors.Language.NotSupported") + return zerrors.ThrowInvalidArgument(nil, "LANG-lg4DP", "Errors.Language.NotSupported") } - return z_errors.ThrowInvalidArgumentf(nil, "LANG-XHiK5", "Errors.Languages.NotSupported: %s", LanguagesToStrings(unsupported)) + return zerrors.ThrowInvalidArgumentf(nil, "LANG-XHiK5", "Errors.Languages.NotSupported: %s", LanguagesToStrings(unsupported)) } func LanguageIsDefined(lang language.Tag) error { if lang.IsRoot() { - return z_errors.ThrowInvalidArgument(nil, "LANG-3M9f2", "Errors.Language.Undefined") + return zerrors.ThrowInvalidArgument(nil, "LANG-3M9f2", "Errors.Language.Undefined") } return nil } @@ -93,9 +93,9 @@ func LanguagesHaveDuplicates(langs []language.Tag) error { return nil } if len(duplicates) > 1 { - return z_errors.ThrowInvalidArgument(nil, "LANG-3M9f2", "Errors.Language.Duplicate") + return zerrors.ThrowInvalidArgument(nil, "LANG-3M9f2", "Errors.Language.Duplicate") } - return z_errors.ThrowInvalidArgumentf(nil, "LANG-XHiK5", "Errors.Languages.Duplicate: %s", LanguagesToStrings(duplicates)) + return zerrors.ThrowInvalidArgumentf(nil, "LANG-XHiK5", "Errors.Languages.Duplicate: %s", LanguagesToStrings(duplicates)) } func ParseLanguage(lang ...string) (tags []language.Tag, err error) { @@ -106,7 +106,7 @@ func ParseLanguage(lang ...string) (tags []language.Tag, err error) { err = errors.Join(err, parseErr) } if err != nil { - err = z_errors.ThrowInvalidArgument(err, "LANG-jc8Sq", "Errors.Language.NotParsed") + err = zerrors.ThrowInvalidArgument(err, "LANG-jc8Sq", "Errors.Language.NotParsed") } return tags, err } diff --git a/internal/domain/machine_key.go b/internal/domain/machine_key.go index 43abfd83b..ea7777d6d 100644 --- a/internal/domain/machine_key.go +++ b/internal/domain/machine_key.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type MachineKey struct { @@ -38,7 +38,7 @@ func (key *MachineKey) Detail() ([]byte, error) { if key.Type == AuthNKeyTypeJSON { return key.MarshalJSON() } - return nil, errors.ThrowPreconditionFailed(nil, "KEY-dsg52", "Errors.Internal") + return nil, zerrors.ThrowPreconditionFailed(nil, "KEY-dsg52", "Errors.Internal") } func (key *MachineKey) MarshalJSON() ([]byte, error) { diff --git a/internal/domain/machine_secret.go b/internal/domain/machine_secret.go index d8b0633b4..ba9bfe7b9 100644 --- a/internal/domain/machine_secret.go +++ b/internal/domain/machine_secret.go @@ -2,13 +2,13 @@ package domain import ( "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func NewMachineClientSecret(generator crypto.Generator) (*crypto.CryptoValue, string, error) { cryptoValue, stringSecret, err := crypto.NewCode(generator) if err != nil { - return nil, "", errors.ThrowInternal(err, "MODEL-57cjsiw", "Errors.User.Machine.Secret.CouldNotGenerate") + return nil, "", zerrors.ThrowInternal(err, "MODEL-57cjsiw", "Errors.User.Machine.Secret.CouldNotGenerate") } return cryptoValue, stringSecret, nil } diff --git a/internal/domain/metadata.go b/internal/domain/metadata.go index f0db03c88..357a20d23 100644 --- a/internal/domain/metadata.go +++ b/internal/domain/metadata.go @@ -3,8 +3,8 @@ package domain import ( "time" - caos_errors "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type Metadata struct { @@ -66,7 +66,7 @@ type MetadataSearchResponse struct { func (r *MetadataSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-0ds32", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-0ds32", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/domain/org_domain.go b/internal/domain/org_domain.go index bbd2e664e..ff3ca4db0 100644 --- a/internal/domain/org_domain.go +++ b/internal/domain/org_domain.go @@ -6,8 +6,8 @@ import ( http_util "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type OrgDomain struct { @@ -73,7 +73,7 @@ func NewIAMDomainName(orgName, iamDomain string) (string, error) { return strings.ToLower(label + "." + iamDomain), nil } - return "", errors.ThrowInvalidArgument(nil, "ORG-RrfXY", "Errors.Org.Domain.EmptyString") + return "", zerrors.ThrowInvalidArgument(nil, "ORG-RrfXY", "Errors.Org.Domain.EmptyString") } type OrgDomainValidationType int32 diff --git a/internal/domain/policy_label.go b/internal/domain/policy_label.go index b5517bc54..323f45c67 100644 --- a/internal/domain/policy_label.go +++ b/internal/domain/policy_label.go @@ -3,8 +3,8 @@ package domain import ( "regexp" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) var colorRegex = regexp.MustCompile("^$|^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$") @@ -58,28 +58,28 @@ const ( func (f LabelPolicy) IsValid() error { if !colorRegex.MatchString(f.PrimaryColor) { - return caos_errs.ThrowInvalidArgument(nil, "POLICY-391dG", "Errors.Policy.Label.Invalid.PrimaryColor") + return zerrors.ThrowInvalidArgument(nil, "POLICY-391dG", "Errors.Policy.Label.Invalid.PrimaryColor") } if !colorRegex.MatchString(f.BackgroundColor) { - return caos_errs.ThrowInvalidArgument(nil, "POLICY-502F1", "Errors.Policy.Label.Invalid.BackgroundColor") + return zerrors.ThrowInvalidArgument(nil, "POLICY-502F1", "Errors.Policy.Label.Invalid.BackgroundColor") } if !colorRegex.MatchString(f.WarnColor) { - return caos_errs.ThrowInvalidArgument(nil, "POLICY-nvw33", "Errors.Policy.Label.Invalid.WarnColor") + return zerrors.ThrowInvalidArgument(nil, "POLICY-nvw33", "Errors.Policy.Label.Invalid.WarnColor") } if !colorRegex.MatchString(f.FontColor) { - return caos_errs.ThrowInvalidArgument(nil, "POLICY-93mSf", "Errors.Policy.Label.Invalid.FontColor") + return zerrors.ThrowInvalidArgument(nil, "POLICY-93mSf", "Errors.Policy.Label.Invalid.FontColor") } if !colorRegex.MatchString(f.PrimaryColorDark) { - return caos_errs.ThrowInvalidArgument(nil, "POLICY-391dG", "Errors.Policy.Label.Invalid.PrimaryColorDark") + return zerrors.ThrowInvalidArgument(nil, "POLICY-391dG", "Errors.Policy.Label.Invalid.PrimaryColorDark") } if !colorRegex.MatchString(f.BackgroundColorDark) { - return caos_errs.ThrowInvalidArgument(nil, "POLICY-llsp2", "Errors.Policy.Label.Invalid.BackgroundColorDark") + return zerrors.ThrowInvalidArgument(nil, "POLICY-llsp2", "Errors.Policy.Label.Invalid.BackgroundColorDark") } if !colorRegex.MatchString(f.WarnColorDark) { - return caos_errs.ThrowInvalidArgument(nil, "POLICY-2b6sf", "Errors.Policy.Label.Invalid.WarnColorDark") + return zerrors.ThrowInvalidArgument(nil, "POLICY-2b6sf", "Errors.Policy.Label.Invalid.WarnColorDark") } if !colorRegex.MatchString(f.FontColorDark) { - return caos_errs.ThrowInvalidArgument(nil, "POLICY-3M0fs", "Errors.Policy.Label.Invalid.FontColorDark") + return zerrors.ThrowInvalidArgument(nil, "POLICY-3M0fs", "Errors.Policy.Label.Invalid.FontColorDark") } return nil } diff --git a/internal/domain/policy_label_test.go b/internal/domain/policy_label_test.go index 9e84669e1..e120bbb46 100644 --- a/internal/domain/policy_label_test.go +++ b/internal/domain/policy_label_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestLabelPolicyPrimaryColorValid(t *testing.T) { @@ -40,21 +40,21 @@ func TestLabelPolicyPrimaryColorValid(t *testing.T) { args: args{ policy: &LabelPolicy{PrimaryColor: "#0f9wfm"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with wrong count of characters, invalid", args: args{ policy: &LabelPolicy{PrimaryColor: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with no #, invalid", args: args{ policy: &LabelPolicy{PrimaryColor: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, } for _, tt := range tests { @@ -102,21 +102,21 @@ func TestLabelPolicyBackgroundColorValid(t *testing.T) { args: args{ policy: &LabelPolicy{BackgroundColor: "#0f9wfm"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with wrong count of characters, invalid", args: args{ policy: &LabelPolicy{BackgroundColor: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with no #, invalid", args: args{ policy: &LabelPolicy{BackgroundColor: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, } for _, tt := range tests { @@ -164,21 +164,21 @@ func TestLabelPolicyWarnColorValid(t *testing.T) { args: args{ policy: &LabelPolicy{WarnColor: "#0f9wfm"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with wrong count of characters, invalid", args: args{ policy: &LabelPolicy{WarnColor: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with no #, invalid", args: args{ policy: &LabelPolicy{WarnColor: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, } for _, tt := range tests { @@ -226,21 +226,21 @@ func TestLabelPolicyFontColorValid(t *testing.T) { args: args{ policy: &LabelPolicy{FontColor: "#0f9wfm"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with wrong count of characters, invalid", args: args{ policy: &LabelPolicy{FontColor: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with no #, invalid", args: args{ policy: &LabelPolicy{FontColor: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, } for _, tt := range tests { @@ -288,21 +288,21 @@ func TestLabelPolicyPrimaryColorDarkValid(t *testing.T) { args: args{ policy: &LabelPolicy{PrimaryColorDark: "#0f9wfm"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with wrong count of characters, invalid", args: args{ policy: &LabelPolicy{PrimaryColorDark: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with no #, invalid", args: args{ policy: &LabelPolicy{PrimaryColorDark: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, } for _, tt := range tests { @@ -350,21 +350,21 @@ func TestLabelPolicyBackgroundColorDarkValid(t *testing.T) { args: args{ policy: &LabelPolicy{BackgroundColorDark: "#0f9wfm"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with wrong count of characters, invalid", args: args{ policy: &LabelPolicy{BackgroundColorDark: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with no #, invalid", args: args{ policy: &LabelPolicy{BackgroundColorDark: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, } for _, tt := range tests { @@ -412,21 +412,21 @@ func TestLabelPolicyWarnColorDarkValid(t *testing.T) { args: args{ policy: &LabelPolicy{WarnColorDark: "#0f9wfm"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with wrong count of characters, invalid", args: args{ policy: &LabelPolicy{WarnColorDark: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with no #, invalid", args: args{ policy: &LabelPolicy{WarnColorDark: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, } for _, tt := range tests { @@ -474,21 +474,21 @@ func TestLabelPolicyFontColorDarkValid(t *testing.T) { args: args{ policy: &LabelPolicy{FontColorDark: "#0f9wfm"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with wrong count of characters, invalid", args: args{ policy: &LabelPolicy{FontColorDark: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, { name: "color code with no #, invalid", args: args{ policy: &LabelPolicy{FontColorDark: "#00"}, }, - err: caos_errs.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, } for _, tt := range tests { diff --git a/internal/domain/policy_password_complexity.go b/internal/domain/policy_password_complexity.go index 99549477c..e5280508c 100644 --- a/internal/domain/policy_password_complexity.go +++ b/internal/domain/policy_password_complexity.go @@ -3,8 +3,8 @@ package domain import ( "regexp" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -28,30 +28,30 @@ type PasswordComplexityPolicy struct { func (p *PasswordComplexityPolicy) IsValid() error { if p.MinLength == 0 || p.MinLength > 72 { - return caos_errs.ThrowInvalidArgument(nil, "MODEL-Lsp0e", "Errors.User.PasswordComplexityPolicy.MinLengthNotAllowed") + return zerrors.ThrowInvalidArgument(nil, "MODEL-Lsp0e", "Errors.User.PasswordComplexityPolicy.MinLengthNotAllowed") } return nil } func (p *PasswordComplexityPolicy) Check(password string) error { if p.MinLength != 0 && uint64(len(password)) < p.MinLength { - return caos_errs.ThrowInvalidArgument(nil, "DOMAIN-HuJf6", "Errors.User.PasswordComplexityPolicy.MinLength") + return zerrors.ThrowInvalidArgument(nil, "DOMAIN-HuJf6", "Errors.User.PasswordComplexityPolicy.MinLength") } if p.HasLowercase && !hasStringLowerCase(password) { - return caos_errs.ThrowInvalidArgument(nil, "DOMAIN-co3Xw", "Errors.User.PasswordComplexityPolicy.HasLower") + return zerrors.ThrowInvalidArgument(nil, "DOMAIN-co3Xw", "Errors.User.PasswordComplexityPolicy.HasLower") } if p.HasUppercase && !hasStringUpperCase(password) { - return caos_errs.ThrowInvalidArgument(nil, "DOMAIN-VoaRj", "Errors.User.PasswordComplexityPolicy.HasUpper") + return zerrors.ThrowInvalidArgument(nil, "DOMAIN-VoaRj", "Errors.User.PasswordComplexityPolicy.HasUpper") } if p.HasNumber && !hasNumber(password) { - return caos_errs.ThrowInvalidArgument(nil, "DOMAIN-ZBv4H", "Errors.User.PasswordComplexityPolicy.HasNumber") + return zerrors.ThrowInvalidArgument(nil, "DOMAIN-ZBv4H", "Errors.User.PasswordComplexityPolicy.HasNumber") } if p.HasSymbol && !hasSymbol(password) { - return caos_errs.ThrowInvalidArgument(nil, "DOMAIN-ZDLwA", "Errors.User.PasswordComplexityPolicy.HasSymbol") + return zerrors.ThrowInvalidArgument(nil, "DOMAIN-ZDLwA", "Errors.User.PasswordComplexityPolicy.HasSymbol") } return nil } diff --git a/internal/domain/refresh_token.go b/internal/domain/refresh_token.go index 84567897e..31f342c35 100644 --- a/internal/domain/refresh_token.go +++ b/internal/domain/refresh_token.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/zitadel/zitadel/internal/crypto" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func NewRefreshToken(userID, tokenID string, algorithm crypto.EncryptionAlgorithm) (string, error) { @@ -31,7 +31,7 @@ func FromRefreshToken(refreshToken string, algorithm crypto.EncryptionAlgorithm) } split := strings.Split(string(decrypted), ":") if len(split) != 3 { - return "", "", "", caos_errors.ThrowInternal(nil, "DOMAIN-BGDhn", "Errors.User.RefreshToken.Invalid") + return "", "", "", zerrors.ThrowInternal(nil, "DOMAIN-BGDhn", "Errors.User.RefreshToken.Invalid") } return split[0], split[1], split[2], nil } diff --git a/internal/domain/url_template.go b/internal/domain/url_template.go index 172de3496..ed39a8257 100644 --- a/internal/domain/url_template.go +++ b/internal/domain/url_template.go @@ -4,16 +4,16 @@ import ( "io" "text/template" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func renderURLTemplate(w io.Writer, tmpl string, data any) error { parsed, err := template.New("").Parse(tmpl) if err != nil { - return caos_errs.ThrowInvalidArgument(err, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate") + return zerrors.ThrowInvalidArgument(err, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate") } if err = parsed.Execute(w, data); err != nil { - return caos_errs.ThrowInvalidArgument(err, "DOMAIN-ieYa7", "Errors.User.InvalidURLTemplate") + return zerrors.ThrowInvalidArgument(err, "DOMAIN-ieYa7", "Errors.User.InvalidURLTemplate") } return nil } diff --git a/internal/domain/url_template_test.go b/internal/domain/url_template_test.go index 1140d1424..dbd3e19ab 100644 --- a/internal/domain/url_template_test.go +++ b/internal/domain/url_template_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func Test_renderURLTemplate(t *testing.T) { @@ -26,7 +26,7 @@ func Test_renderURLTemplate(t *testing.T) { args: args{ tmpl: "{{", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), + wantErr: zerrors.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), }, { name: "execution error", @@ -34,7 +34,7 @@ func Test_renderURLTemplate(t *testing.T) { tmpl: "{{.Some}}", data: struct{ Foo int }{Foo: 1}, }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-ieYa7", "Errors.User.InvalidURLTemplate"), + wantErr: zerrors.ThrowInvalidArgument(nil, "DOMAIN-ieYa7", "Errors.User.InvalidURLTemplate"), }, { name: "success", diff --git a/internal/domain/user_v2_passkey_test.go b/internal/domain/user_v2_passkey_test.go index 74cb1695e..7eb0b289a 100644 --- a/internal/domain/user_v2_passkey_test.go +++ b/internal/domain/user_v2_passkey_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestRenderPasskeyURLTemplate(t *testing.T) { @@ -29,7 +29,7 @@ func TestRenderPasskeyURLTemplate(t *testing.T) { args: args{ tmpl: "{{", }, - wantErr: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), + wantErr: zerrors.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), }, { name: "success", diff --git a/internal/errors/already_exists_test.go b/internal/errors/already_exists_test.go deleted file mode 100644 index 549d0af0a..000000000 --- a/internal/errors/already_exists_test.go +++ /dev/null @@ -1,34 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestAlreadyExistsError(t *testing.T) { - var alreadyExistsError interface{} - alreadyExistsError = new(caos_errs.AlreadyExistsError) - _, ok := alreadyExistsError.(caos_errs.AlreadyExists) - assert.True(t, ok) -} - -func TestThrowAlreadyExistsf(t *testing.T) { - err := caos_errs.ThrowAlreadyExistsf(nil, "id", "msg") - - _, ok := err.(*caos_errs.AlreadyExistsError) - assert.True(t, ok) -} - -func TestIsErrorAlreadyExists(t *testing.T) { - err := caos_errs.ThrowAlreadyExists(nil, "id", "msg") - ok := caos_errs.IsErrorAlreadyExists(err) - assert.True(t, ok) - - err = errors.New("Already Exists!") - ok = caos_errs.IsErrorAlreadyExists(err) - assert.False(t, ok) -} diff --git a/internal/errors/deadline_exceeded_test.go b/internal/errors/deadline_exceeded_test.go deleted file mode 100644 index 1a26e3099..000000000 --- a/internal/errors/deadline_exceeded_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestDeadlineExceededError(t *testing.T) { - var err interface{} - err = new(caos_errs.DeadlineExceededError) - _, ok := err.(caos_errs.DeadlineExceeded) - assert.True(t, ok) -} - -func TestThrowDeadlineExceededf(t *testing.T) { - err := caos_errs.ThrowDeadlineExceededf(nil, "id", "msg") - _, ok := err.(*caos_errs.DeadlineExceededError) - assert.True(t, ok) -} - -func TestIsDeadlineExceeded(t *testing.T) { - err := caos_errs.ThrowDeadlineExceeded(nil, "id", "msg") - ok := caos_errs.IsDeadlineExceeded(err) - assert.True(t, ok) - - err = errors.New("I am found!") - ok = caos_errs.IsDeadlineExceeded(err) - assert.False(t, ok) -} diff --git a/internal/errors/generate/error_test.go.tmpl b/internal/errors/generate/error_test.go.tmpl deleted file mode 100644 index 38a0eb2ca..000000000 --- a/internal/errors/generate/error_test.go.tmpl +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func Test{{.ErrorName}}Error(t *testing.T) { - var err interface{} - err = new(caos_errs.{{.ErrorName}}Error) - _, ok := err.(*caos_errs.{{.ErrorName}}) - assert.True(t, ok) -} - -func TestThrow{{.ErrorName}}f(t *testing.T) { - err := caos_errs.Throw{{.ErrorName}}f(nil, "id", "msg") - _, ok := err.(*caos_errs.{{.ErrorName}}Error) - assert.True(t, ok) -} - -func TestIs{{.ErrorName}}(t *testing.T) { - err := caos_errs.Throw{{.ErrorName}}(nil, "id", "msg") - ok := caos_errs.Is{{.ErrorName}}(err) - assert.True(t, ok) - - err = errors.New("I am found!") - ok = caos_errs.Is{{.ErrorName}}(err) - assert.False(t, ok) -} diff --git a/internal/errors/internal_test.go b/internal/errors/internal_test.go deleted file mode 100644 index d13f7def8..000000000 --- a/internal/errors/internal_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestInternalError(t *testing.T) { - var err interface{} - err = new(caos_errs.InternalError) - _, ok := err.(caos_errs.Internal) - assert.True(t, ok) -} - -func TestThrowInternalf(t *testing.T) { - err := caos_errs.ThrowInternalf(nil, "id", "msg") - _, ok := err.(*caos_errs.InternalError) - assert.True(t, ok) -} - -func TestIsInternal(t *testing.T) { - err := caos_errs.ThrowInternal(nil, "id", "msg") - ok := caos_errs.IsInternal(err) - assert.True(t, ok) - - err = errors.New("I am found!") - ok = caos_errs.IsInternal(err) - assert.False(t, ok) -} diff --git a/internal/errors/invalid_argument_test.go b/internal/errors/invalid_argument_test.go deleted file mode 100644 index 6de64b008..000000000 --- a/internal/errors/invalid_argument_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestInvalidArgumentError(t *testing.T) { - var invalidArgumentError interface{} - invalidArgumentError = new(caos_errs.InvalidArgumentError) - _, ok := invalidArgumentError.(caos_errs.InvalidArgument) - assert.True(t, ok) -} - -func TestThrowInvalidArgumentf(t *testing.T) { - err := caos_errs.ThrowInvalidArgumentf(nil, "id", "msg") - _, ok := err.(*caos_errs.InvalidArgumentError) - assert.True(t, ok) -} - -func TestIsErrorInvalidArgument(t *testing.T) { - err := caos_errs.ThrowInvalidArgument(nil, "id", "msg") - ok := caos_errs.IsErrorInvalidArgument(err) - assert.True(t, ok) - - err = errors.New("I am invalid!") - ok = caos_errs.IsErrorInvalidArgument(err) - assert.False(t, ok) -} diff --git a/internal/errors/not_found_test.go b/internal/errors/not_found_test.go deleted file mode 100644 index 45f0ebb0b..000000000 --- a/internal/errors/not_found_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestNotFoundError(t *testing.T) { - var notFoundError interface{} - notFoundError = new(caos_errs.NotFoundError) - _, ok := notFoundError.(caos_errs.NotFound) - assert.True(t, ok) -} - -func TestThrowNotFoundf(t *testing.T) { - err := caos_errs.ThrowNotFoundf(nil, "id", "msg") - _, ok := err.(*caos_errs.NotFoundError) - assert.True(t, ok) -} - -func TestIsNotFound(t *testing.T) { - err := caos_errs.ThrowNotFound(nil, "id", "msg") - ok := caos_errs.IsNotFound(err) - assert.True(t, ok) - - err = errors.New("I am found!") - ok = caos_errs.IsNotFound(err) - assert.False(t, ok) -} diff --git a/internal/errors/permission_denied_test.go b/internal/errors/permission_denied_test.go deleted file mode 100644 index bf994321a..000000000 --- a/internal/errors/permission_denied_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestPermissionDeniedError(t *testing.T) { - var err interface{} - err = new(caos_errs.PermissionDeniedError) - _, ok := err.(caos_errs.PermissionDenied) - assert.True(t, ok) -} - -func TestThrowPermissionDeniedf(t *testing.T) { - err := caos_errs.ThrowPermissionDeniedf(nil, "id", "msg") - _, ok := err.(*caos_errs.PermissionDeniedError) - assert.True(t, ok) -} - -func TestIsPermissionDenied(t *testing.T) { - err := caos_errs.ThrowPermissionDenied(nil, "id", "msg") - ok := caos_errs.IsPermissionDenied(err) - assert.True(t, ok) - - err = errors.New("I am found!") - ok = caos_errs.IsPermissionDenied(err) - assert.False(t, ok) -} diff --git a/internal/errors/precondition_failed_test.go b/internal/errors/precondition_failed_test.go deleted file mode 100644 index 2503063b7..000000000 --- a/internal/errors/precondition_failed_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestPreconditionFailedError(t *testing.T) { - var err interface{} - err = new(caos_errs.PreconditionFailedError) - _, ok := err.(caos_errs.PreconditionFailed) - assert.True(t, ok) -} - -func TestThrowPreconditionFailedf(t *testing.T) { - err := caos_errs.ThrowPreconditionFailedf(nil, "id", "msg") - _, ok := err.(*caos_errs.PreconditionFailedError) - assert.True(t, ok) -} - -func TestIsPreconditionFailed(t *testing.T) { - err := caos_errs.ThrowPreconditionFailed(nil, "id", "msg") - ok := caos_errs.IsPreconditionFailed(err) - assert.True(t, ok) - - err = errors.New("Precondition failed!") - ok = caos_errs.IsPreconditionFailed(err) - assert.False(t, ok) -} diff --git a/internal/errors/resource_exhausted_test.go b/internal/errors/resource_exhausted_test.go deleted file mode 100644 index dd2bd7866..000000000 --- a/internal/errors/resource_exhausted_test.go +++ /dev/null @@ -1,34 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestResourceExhaustedError(t *testing.T) { - var err interface{} = new(caos_errs.ResourceExhaustedError) - _, ok := err.(caos_errs.ResourceExhausted) - assert.True(t, ok) -} - -func TestThrowResourceExhaustedf(t *testing.T) { - err := caos_errs.ThrowResourceExhaustedf(nil, "id", "msg") - // TODO: refactor errors package - //nolint:errorlint - _, ok := err.(*caos_errs.ResourceExhaustedError) - assert.True(t, ok) -} - -func TestIsResourceExhausted(t *testing.T) { - err := caos_errs.ThrowResourceExhausted(nil, "id", "msg") - ok := caos_errs.IsResourceExhausted(err) - assert.True(t, ok) - - err = errors.New("I am found!") - ok = caos_errs.IsResourceExhausted(err) - assert.False(t, ok) -} diff --git a/internal/errors/unauthenticated_test.go b/internal/errors/unauthenticated_test.go deleted file mode 100644 index faba8bbbc..000000000 --- a/internal/errors/unauthenticated_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestUnauthenticatedError(t *testing.T) { - var err interface{} - err = new(caos_errs.UnauthenticatedError) - _, ok := err.(caos_errs.Unauthenticated) - assert.True(t, ok) -} - -func TestThrowUnauthenticatedf(t *testing.T) { - err := caos_errs.ThrowUnauthenticatedf(nil, "id", "msg") - _, ok := err.(*caos_errs.UnauthenticatedError) - assert.True(t, ok) -} - -func TestIsUnauthenticated(t *testing.T) { - err := caos_errs.ThrowUnauthenticated(nil, "id", "msg") - ok := caos_errs.IsUnauthenticated(err) - assert.True(t, ok) - - err = errors.New("I am found!") - ok = caos_errs.IsUnauthenticated(err) - assert.False(t, ok) -} diff --git a/internal/errors/unavailable_test.go b/internal/errors/unavailable_test.go deleted file mode 100644 index 37fd549ea..000000000 --- a/internal/errors/unavailable_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestUnavailableError(t *testing.T) { - var err interface{} - err = new(caos_errs.UnavailableError) - _, ok := err.(caos_errs.Unavailable) - assert.True(t, ok) -} - -func TestThrowUnavailablef(t *testing.T) { - err := caos_errs.ThrowUnavailablef(nil, "id", "msg") - _, ok := err.(*caos_errs.UnavailableError) - assert.True(t, ok) -} - -func TestIsUnavailable(t *testing.T) { - err := caos_errs.ThrowUnavailable(nil, "id", "msg") - ok := caos_errs.IsUnavailable(err) - assert.True(t, ok) - - err = errors.New("I am found!") - ok = caos_errs.IsUnavailable(err) - assert.False(t, ok) -} diff --git a/internal/errors/unimplemented_test.go b/internal/errors/unimplemented_test.go deleted file mode 100644 index acaba5a42..000000000 --- a/internal/errors/unimplemented_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestUnimplementedError(t *testing.T) { - var unimplementedError interface{} - unimplementedError = new(caos_errs.UnimplementedError) - _, ok := unimplementedError.(caos_errs.Unimplemented) - assert.True(t, ok) -} - -func TestThrowUnimplementedf(t *testing.T) { - err := caos_errs.ThrowUnimplementedf(nil, "id", "msg") - _, ok := err.(*caos_errs.UnimplementedError) - assert.True(t, ok) -} - -func TestIsUnimplemented(t *testing.T) { - err := caos_errs.ThrowUnimplemented(nil, "id", "msg") - ok := caos_errs.IsUnimplemented(err) - assert.True(t, ok) - - err = errors.New("I am found!") - ok = caos_errs.IsUnimplemented(err) - assert.False(t, ok) -} diff --git a/internal/errors/unknown_test.go b/internal/errors/unknown_test.go deleted file mode 100644 index 2b21c0647..000000000 --- a/internal/errors/unknown_test.go +++ /dev/null @@ -1,33 +0,0 @@ -package errors_test - -import ( - "errors" - "testing" - - "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" -) - -func TestUnknownError(t *testing.T) { - var err interface{} - err = new(caos_errs.UnknownError) - _, ok := err.(caos_errs.Unknown) - assert.True(t, ok) -} - -func TestThrowUnknownf(t *testing.T) { - err := caos_errs.ThrowUnknownf(nil, "id", "msg") - _, ok := err.(*caos_errs.UnknownError) - assert.True(t, ok) -} - -func TestIsUnknown(t *testing.T) { - err := caos_errs.ThrowUnknown(nil, "id", "msg") - ok := caos_errs.IsUnknown(err) - assert.True(t, ok) - - err = errors.New("I am found!") - ok = caos_errs.IsUnknown(err) - assert.False(t, ok) -} diff --git a/internal/eventstore/event.go b/internal/eventstore/event.go index 4cb1d2ddc..6c7f47b73 100644 --- a/internal/eventstore/event.go +++ b/internal/eventstore/event.go @@ -5,7 +5,7 @@ import ( "reflect" "time" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type action interface { @@ -63,7 +63,7 @@ func EventData(event Command) ([]byte, error) { if json.Valid(data) { return data, nil } - return nil, errors.ThrowInvalidArgument(nil, "V2-6SbbS", "data bytes are not json") + return nil, zerrors.ThrowInvalidArgument(nil, "V2-6SbbS", "data bytes are not json") } dataType := reflect.TypeOf(event.Payload()) if dataType.Kind() == reflect.Ptr { @@ -72,11 +72,11 @@ func EventData(event Command) ([]byte, error) { if dataType.Kind() == reflect.Struct { dataBytes, err := json.Marshal(event.Payload()) if err != nil { - return nil, errors.ThrowInvalidArgument(err, "V2-xG87M", "could not marshal data") + return nil, zerrors.ThrowInvalidArgument(err, "V2-xG87M", "could not marshal data") } return dataBytes, nil } - return nil, errors.ThrowInvalidArgument(nil, "V2-91NRm", "wrong type of event data") + return nil, zerrors.ThrowInvalidArgument(nil, "V2-91NRm", "wrong type of event data") } type BaseEventSetter[T any] interface { @@ -91,7 +91,7 @@ func GenericEventMapper[T any, PT BaseEventSetter[T]](event Event) (Event, error err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "ES-Thai6", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "ES-Thai6", "unable to unmarshal event") } return e, nil diff --git a/internal/eventstore/eventstore_test.go b/internal/eventstore/eventstore_test.go index 8fe9fd859..fe8400be2 100644 --- a/internal/eventstore/eventstore_test.go +++ b/internal/eventstore/eventstore_test.go @@ -10,7 +10,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/service" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) // testEvent implements the Event interface @@ -122,7 +122,7 @@ func Test_eventstore_RegisterFilterEventMapper(t *testing.T) { eventMapper: map[EventType]eventTypeInterceptors{ "event.type": { eventMapper: func(Event) (Event, error) { - return nil, errors.ThrowUnimplemented(nil, "V2-1qPvn", "unimplemented") + return nil, zerrors.ThrowUnimplemented(nil, "V2-1qPvn", "unimplemented") }, }, }, @@ -661,7 +661,7 @@ func TestEventstore_Push(t *testing.T) { fields: fields{ pusher: &testPusher{ t: t, - err: errors.ThrowInternal(nil, "V2-qaa4S", "test err"), + err: zerrors.ThrowInternal(nil, "V2-qaa4S", "test err"), }, }, res: res{ @@ -684,7 +684,7 @@ func TestEventstore_Push(t *testing.T) { fields: fields{ pusher: &testPusher{ t: t, - err: errors.ThrowInternal(nil, "V2-qaa4S", "test err"), + err: zerrors.ThrowInternal(nil, "V2-qaa4S", "test err"), }, }, res: res{ @@ -775,7 +775,7 @@ func TestEventstore_FilterEvents(t *testing.T) { fields: fields{ repo: &testQuerier{ t: t, - err: errors.ThrowInternal(nil, "V2-RfkBa", "test err"), + err: zerrors.ThrowInternal(nil, "V2-RfkBa", "test err"), }, eventMapper: map[EventType]func(Event) (Event, error){ "test.event": func(e Event) (Event, error) { @@ -901,7 +901,7 @@ func TestEventstore_LatestSequence(t *testing.T) { fields: fields{ repo: &testQuerier{ t: t, - err: errors.ThrowInternal(nil, "V2-RfkBa", "test err"), + err: zerrors.ThrowInternal(nil, "V2-RfkBa", "test err"), }, }, res: res{ @@ -1038,7 +1038,7 @@ func TestEventstore_FilterToReducer(t *testing.T) { fields: fields{ repo: &testQuerier{ t: t, - err: errors.ThrowInternal(nil, "V2-RfkBa", "test err"), + err: zerrors.ThrowInternal(nil, "V2-RfkBa", "test err"), }, eventMapper: map[EventType]func(Event) (Event, error){ "test.event": func(e Event) (Event, error) { @@ -1100,7 +1100,7 @@ func TestEventstore_FilterToReducer(t *testing.T) { }, readModel: &testReducer{ t: t, - err: errors.ThrowInvalidArgument(nil, "V2-W06TG", "test err"), + err: zerrors.ThrowInvalidArgument(nil, "V2-W06TG", "test err"), expectedLength: 1, }, }, @@ -1212,7 +1212,7 @@ func TestEventstore_mapEvents(t *testing.T) { fields: fields{ eventMapper: map[EventType]func(Event) (Event, error){ "test.event": func(Event) (Event, error) { - return nil, errors.ThrowInternal(nil, "V2-8FbQk", "test err") + return nil, zerrors.ThrowInternal(nil, "V2-8FbQk", "test err") }, }, }, diff --git a/internal/eventstore/handler/crdb/lock.go b/internal/eventstore/handler/crdb/lock.go index e751eff2a..ba17ba792 100644 --- a/internal/eventstore/handler/crdb/lock.go +++ b/internal/eventstore/handler/crdb/lock.go @@ -11,8 +11,8 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -74,10 +74,10 @@ func (h *locker) renewLock(ctx context.Context, lockDuration time.Duration, inst lockStmt, values := h.lockStatement(lockDuration, instanceIDs) res, err := h.client.ExecContext(ctx, lockStmt, values...) if err != nil { - return errors.ThrowInternal(err, "CRDB-uaDoR", "unable to execute lock") + return zerrors.ThrowInternal(err, "CRDB-uaDoR", "unable to execute lock") } if rows, _ := res.RowsAffected(); rows == 0 { - return errors.ThrowAlreadyExists(nil, "CRDB-mmi4J", "projection already locked") + return zerrors.ThrowAlreadyExists(nil, "CRDB-mmi4J", "projection already locked") } return nil } @@ -86,7 +86,7 @@ func (h *locker) Unlock(instanceIDs ...string) error { lockStmt, values := h.lockStatement(0, instanceIDs) _, err := h.client.Exec(lockStmt, values...) if err != nil { - return errors.ThrowUnknown(err, "CRDB-JjfwO", "unlock failed") + return zerrors.ThrowUnknown(err, "CRDB-JjfwO", "unlock failed") } return nil } diff --git a/internal/eventstore/handler/crdb/lock_test.go b/internal/eventstore/handler/crdb/lock_test.go index 5ab824ee6..55d23b65b 100644 --- a/internal/eventstore/handler/crdb/lock_test.go +++ b/internal/eventstore/handler/crdb/lock_test.go @@ -11,7 +11,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/zitadel/zitadel/internal/database" - z_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -21,7 +21,7 @@ const ( ) var ( - renewNoRowsAffectedErr = z_errs.ThrowAlreadyExists(nil, "CRDB-mmi4J", "projection already locked") + renewNoRowsAffectedErr = zerrors.ThrowAlreadyExists(nil, "CRDB-mmi4J", "projection already locked") errLock = errors.New("lock err") ) diff --git a/internal/eventstore/handler/v2/failed_event.go b/internal/eventstore/handler/v2/failed_event.go index b9630f7bc..53457883c 100644 --- a/internal/eventstore/handler/v2/failed_event.go +++ b/internal/eventstore/handler/v2/failed_event.go @@ -5,8 +5,8 @@ import ( _ "embed" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -69,10 +69,10 @@ func (h *Handler) failureCount(tx *sql.Tx, f *failure) (count uint8, err error) f.sequence, ) if err = row.Err(); err != nil { - return 0, errors.ThrowInternal(err, "CRDB-Unnex", "unable to update failure count") + return 0, zerrors.ThrowInternal(err, "CRDB-Unnex", "unable to update failure count") } if err = row.Scan(&count); err != nil { - return 0, errors.ThrowInternal(err, "CRDB-RwSMV", "unable to scan count") + return 0, zerrors.ThrowInternal(err, "CRDB-RwSMV", "unable to scan count") } return count, nil } @@ -89,7 +89,7 @@ func (h *Handler) setFailureCount(tx *sql.Tx, count uint8, f *failure) error { f.err.Error(), ) if err != nil { - return errors.ThrowInternal(err, "CRDB-4Ht4x", "set failure count failed") + return zerrors.ThrowInternal(err, "CRDB-4Ht4x", "set failure count failed") } return nil } diff --git a/internal/eventstore/handler/v2/init.go b/internal/eventstore/handler/v2/init.go index cca5cb995..5ee650799 100644 --- a/internal/eventstore/handler/v2/init.go +++ b/internal/eventstore/handler/v2/init.go @@ -9,8 +9,8 @@ import ( "github.com/jackc/pgconn" "github.com/zitadel/logging" - errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler" + "github.com/zitadel/zitadel/internal/zerrors" ) type Table struct { @@ -196,7 +196,7 @@ func (h *Handler) Init(ctx context.Context) error { } tx, err := h.client.BeginTx(ctx, nil) if err != nil { - return errs.ThrowInternal(err, "CRDB-SAdf2", "begin failed") + return zerrors.ThrowInternal(err, "CRDB-SAdf2", "begin failed") } for i, execute := range check.Init().Executes { logging.WithFields("projection", h.projection.Name(), "execute", i).Debug("executing check") @@ -274,7 +274,7 @@ func execNextIfExists(config execConfig, q query, opts []execOption, executeNext } func isErrAlreadyExists(err error) bool { - caosErr := &errs.CaosError{} + caosErr := &zerrors.ZitadelError{} if !errors.As(err, &caosErr) { return false } diff --git a/internal/eventstore/handler/v2/state.go b/internal/eventstore/handler/v2/state.go index 4506135d7..ea674af4c 100644 --- a/internal/eventstore/handler/v2/state.go +++ b/internal/eventstore/handler/v2/state.go @@ -8,8 +8,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/api/authz" - errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type state struct { @@ -97,7 +97,7 @@ func (h *Handler) setState(tx *sql.Tx, updatedState *state) error { } if affected, err := res.RowsAffected(); affected == 0 { h.log().OnError(err).Error("unable to check if states are updated") - return errs.ThrowInternal(err, "V2-FGEKi", "unable to update state") + return zerrors.ThrowInternal(err, "V2-FGEKi", "unable to update state") } return nil } @@ -111,7 +111,7 @@ func (h *Handler) lockState(tx *sql.Tx, instanceID string) error { return err } if affected, err := res.RowsAffected(); affected == 0 || err != nil { - return errs.ThrowInternal(err, "V2-lpiK0", "projection already locked") + return zerrors.ThrowInternal(err, "V2-lpiK0", "projection already locked") } return nil } diff --git a/internal/eventstore/handler/v2/state_test.go b/internal/eventstore/handler/v2/state_test.go index 15031e66b..5e2077394 100644 --- a/internal/eventstore/handler/v2/state_test.go +++ b/internal/eventstore/handler/v2/state_test.go @@ -14,7 +14,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/database/mock" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestHandler_lockState(t *testing.T) { @@ -80,7 +80,7 @@ func TestHandler_lockState(t *testing.T) { instanceID: "instance", }, isErr: func(t *testing.T, err error) { - if !errors.Is(err, errs.ThrowInternal(nil, "V2-lpiK0", "")) { + if !errors.Is(err, zerrors.ThrowInternal(nil, "V2-lpiK0", "")) { t.Errorf("unexpected error: want internal (V2lpiK0), got: %v", err) } }, @@ -195,7 +195,7 @@ func TestHandler_updateLastUpdated(t *testing.T) { }, }, isErr: func(t *testing.T, err error) { - if !errors.Is(err, errs.ThrowInternal(nil, "V2-FGEKi", "")) { + if !errors.Is(err, zerrors.ThrowInternal(nil, "V2-FGEKi", "")) { t.Errorf("unexpected error, want: %v, got %v", sql.ErrTxDone, err) } }, diff --git a/internal/eventstore/handler/v2/statement.go b/internal/eventstore/handler/v2/statement.go index f2c915f63..e1e972c07 100644 --- a/internal/eventstore/handler/v2/statement.go +++ b/internal/eventstore/handler/v2/statement.go @@ -3,7 +3,7 @@ package handler import ( "database/sql" "encoding/json" - errs "errors" + "errors" "strconv" "strings" "time" @@ -11,8 +11,8 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) func (h *Handler) eventsToStatements(tx *sql.Tx, events []eventstore.Event, currentState *state) (statements []*Statement, err error) { @@ -79,9 +79,9 @@ func WithTableSuffix(name string) func(*execConfig) { } var ( - ErrNoProjection = errs.New("no projection") - ErrNoValues = errs.New("no values") - ErrNoCondition = errs.New("no condition") + ErrNoProjection = errors.New("no projection") + ErrNoValues = errors.New("no values") + ErrNoCondition = errors.New("no condition") ) func NewStatement(event eventstore.Event, e Exec) *Statement { @@ -558,7 +558,7 @@ func exec(config execConfig, q query, opts []execOption) Exec { _, err = ex.Exec("SAVEPOINT stmt_exec") if err != nil { - return errors.ThrowInternal(err, "CRDB-YdOXD", "create savepoint failed") + return zerrors.ThrowInternal(err, "CRDB-YdOXD", "create savepoint failed") } defer func() { if err != nil { @@ -570,7 +570,7 @@ func exec(config execConfig, q query, opts []execOption) Exec { }() _, err = ex.Exec(q(config), config.args...) if err != nil { - return errors.ThrowInternal(err, "CRDB-pKtsr", "exec failed") + return zerrors.ThrowInternal(err, "CRDB-pKtsr", "exec failed") } return nil diff --git a/internal/eventstore/repository/search_query.go b/internal/eventstore/repository/search_query.go index b0c7769cb..1f35222d7 100644 --- a/internal/eventstore/repository/search_query.go +++ b/internal/eventstore/repository/search_query.go @@ -4,8 +4,8 @@ import ( "database/sql" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) // SearchQuery defines the which and how data are queried @@ -99,16 +99,16 @@ func NewFilter(field Field, value interface{}, operation Operation) *Filter { // Validate checks if the fields of the filter have valid values func (f *Filter) Validate() error { if f == nil { - return errors.ThrowPreconditionFailed(nil, "REPO-z6KcG", "filter is nil") + return zerrors.ThrowPreconditionFailed(nil, "REPO-z6KcG", "filter is nil") } if f.Field <= 0 || f.Field >= fieldCount { - return errors.ThrowPreconditionFailed(nil, "REPO-zw62U", "field not definded") + return zerrors.ThrowPreconditionFailed(nil, "REPO-zw62U", "field not definded") } if f.Value == nil { - return errors.ThrowPreconditionFailed(nil, "REPO-GJ9ct", "no value definded") + return zerrors.ThrowPreconditionFailed(nil, "REPO-GJ9ct", "no value definded") } if f.Operation <= 0 || f.Operation >= operationCount { - return errors.ThrowPreconditionFailed(nil, "REPO-RrQTy", "operation not definded") + return zerrors.ThrowPreconditionFailed(nil, "REPO-RrQTy", "operation not definded") } return nil } @@ -116,7 +116,7 @@ func (f *Filter) Validate() error { func QueryFromBuilder(builder *eventstore.SearchQueryBuilder) (*SearchQuery, error) { if builder == nil || builder.GetColumns().Validate() != nil { - return nil, errors.ThrowPreconditionFailed(nil, "MODEL-4m9gs", "builder invalid") + return nil, zerrors.ThrowPreconditionFailed(nil, "MODEL-4m9gs", "builder invalid") } query := &SearchQuery{ diff --git a/internal/eventstore/repository/sql/crdb.go b/internal/eventstore/repository/sql/crdb.go index 2d92e45ef..e782a4c1b 100644 --- a/internal/eventstore/repository/sql/crdb.go +++ b/internal/eventstore/repository/sql/crdb.go @@ -16,9 +16,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -189,7 +189,7 @@ func (db *CRDB) Push(ctx context.Context, commands ...eventstore.Command) (event "eventType", e.Type(), "instanceID", e.Aggregate().InstanceID, ).WithError(err).Debug("query failed") - return caos_errs.ThrowInternal(err, "SQL-SBP37", "unable to create event") + return zerrors.ThrowInternal(err, "SQL-SBP37", "unable to create event") } uniqueConstraints = append(uniqueConstraints, command.UniqueConstraints()...) @@ -198,8 +198,8 @@ func (db *CRDB) Push(ctx context.Context, commands ...eventstore.Command) (event return db.handleUniqueConstraints(ctx, tx, uniqueConstraints...) }) - if err != nil && !errors.Is(err, &caos_errs.CaosError{}) { - err = caos_errs.ThrowInternal(err, "SQL-DjgtG", "unable to store events") + if err != nil && !errors.Is(err, &zerrors.ZitadelError{}) { + err = zerrors.ThrowInternal(err, "SQL-DjgtG", "unable to store events") } return events, err @@ -222,10 +222,10 @@ func (db *CRDB) handleUniqueConstraints(ctx context.Context, tx *sql.Tx, uniqueC "unique_field", uniqueConstraint.UniqueField).WithError(err).Info("insert unique constraint failed") if db.isUniqueViolationError(err) { - return caos_errs.ThrowAlreadyExists(err, "SQL-wHcEq", uniqueConstraint.ErrorMessage) + return zerrors.ThrowAlreadyExists(err, "SQL-wHcEq", uniqueConstraint.ErrorMessage) } - return caos_errs.ThrowInternal(err, "SQL-dM9ds", "unable to create unique constraint") + return zerrors.ThrowInternal(err, "SQL-dM9ds", "unable to create unique constraint") } case eventstore.UniqueConstraintRemove: _, err := tx.ExecContext(ctx, uniqueDelete, uniqueConstraint.UniqueType, uniqueConstraint.UniqueField, authz.GetInstance(ctx).InstanceID()) @@ -233,14 +233,14 @@ func (db *CRDB) handleUniqueConstraints(ctx context.Context, tx *sql.Tx, uniqueC logging.WithFields( "unique_type", uniqueConstraint.UniqueType, "unique_field", uniqueConstraint.UniqueField).WithError(err).Info("delete unique constraint failed") - return caos_errs.ThrowInternal(err, "SQL-6n88i", "unable to remove unique constraint") + return zerrors.ThrowInternal(err, "SQL-6n88i", "unable to remove unique constraint") } case eventstore.UniqueConstraintInstanceRemove: _, err := tx.ExecContext(ctx, uniqueDeleteInstance, authz.GetInstance(ctx).InstanceID()) if err != nil { logging.WithFields( "instance_id", authz.GetInstance(ctx).InstanceID()).WithError(err).Info("delete instance unique constraints failed") - return caos_errs.ThrowInternal(err, "SQL-6n88i", "unable to remove unique constraints of instance") + return zerrors.ThrowInternal(err, "SQL-6n88i", "unable to remove unique constraints of instance") } } } diff --git a/internal/eventstore/repository/sql/query.go b/internal/eventstore/repository/sql/query.go index a2eda79d3..6cd0672e4 100644 --- a/internal/eventstore/repository/sql/query.go +++ b/internal/eventstore/repository/sql/query.go @@ -14,9 +14,9 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/database/dialect" - z_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) type querier interface { @@ -62,7 +62,7 @@ func query(ctx context.Context, criteria querier, searchQuery *eventstore.Search query, rowScanner := prepareColumns(criteria, q.Columns, useV1) where, values := prepareConditions(criteria, q, useV1) if where == "" || query == "" { - return z_errors.ThrowInvalidArgument(nil, "SQL-rWeBw", "invalid query factory") + return zerrors.ThrowInvalidArgument(nil, "SQL-rWeBw", "invalid query factory") } if q.Tx == nil { if travel := prepareTimeTravel(ctx, criteria, q.AllowTimeTravel); travel != "" { @@ -116,7 +116,7 @@ func query(ctx context.Context, criteria querier, searchQuery *eventstore.Search }, query, values...) if err != nil { logging.New().WithError(err).Info("query failed") - return z_errors.ThrowInternal(err, "SQL-KyeAx", "unable to filter events") + return zerrors.ThrowInternal(err, "SQL-KyeAx", "unable to filter events") } return nil @@ -146,25 +146,25 @@ func prepareTimeTravel(ctx context.Context, criteria querier, allow bool) string func maxSequenceScanner(row scan, dest interface{}) (err error) { position, ok := dest.(*sql.NullFloat64) if !ok { - return z_errors.ThrowInvalidArgumentf(nil, "SQL-NBjA9", "type must be sql.NullInt64 got: %T", dest) + return zerrors.ThrowInvalidArgumentf(nil, "SQL-NBjA9", "type must be sql.NullInt64 got: %T", dest) } err = row(position) if err == nil || errors.Is(err, sql.ErrNoRows) { return nil } - return z_errors.ThrowInternal(err, "SQL-bN5xg", "something went wrong") + return zerrors.ThrowInternal(err, "SQL-bN5xg", "something went wrong") } func instanceIDsScanner(scanner scan, dest interface{}) (err error) { ids, ok := dest.(*[]string) if !ok { - return z_errors.ThrowInvalidArgument(nil, "SQL-Begh2", "type must be an array of string") + return zerrors.ThrowInvalidArgument(nil, "SQL-Begh2", "type must be an array of string") } var id string err = scanner(&id) if err != nil { logging.WithError(err).Warn("unable to scan row") - return z_errors.ThrowInternal(err, "SQL-DEFGe", "unable to scan row") + return zerrors.ThrowInternal(err, "SQL-DEFGe", "unable to scan row") } *ids = append(*ids, id) @@ -175,7 +175,7 @@ func eventsScanner(useV1 bool) func(scanner scan, dest interface{}) (err error) return func(scanner scan, dest interface{}) (err error) { reduce, ok := dest.(eventstore.Reducer) if !ok { - return z_errors.ThrowInvalidArgumentf(nil, "SQL-4GP6F", "events scanner: invalid type %T", dest) + return zerrors.ThrowInvalidArgumentf(nil, "SQL-4GP6F", "events scanner: invalid type %T", dest) } event := new(repository.Event) position := new(sql.NullFloat64) @@ -213,7 +213,7 @@ func eventsScanner(useV1 bool) func(scanner scan, dest interface{}) (err error) if err != nil { logging.New().WithError(err).Warn("unable to scan row") - return z_errors.ThrowInternal(err, "SQL-M0dsf", "unable to scan row") + return zerrors.ThrowInternal(err, "SQL-M0dsf", "unable to scan row") } event.Pos = position.Float64 return reduce(event) diff --git a/internal/eventstore/repository/sql/query_test.go b/internal/eventstore/repository/sql/query_test.go index 8d6f67038..6be560ce4 100644 --- a/internal/eventstore/repository/sql/query_test.go +++ b/internal/eventstore/repository/sql/query_test.go @@ -14,9 +14,9 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/database/cockroach" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) func Test_getCondition(t *testing.T) { @@ -142,7 +142,7 @@ func Test_prepareColumns(t *testing.T) { }, res: res{ query: `SELECT "position" FROM eventstore.events2`, - dbErr: errors.IsErrorInvalidArgument, + dbErr: zerrors.IsErrorInvalidArgument, }, }, { @@ -212,7 +212,7 @@ func Test_prepareColumns(t *testing.T) { }, res: res{ query: `SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events`, - dbErr: errors.IsErrorInvalidArgument, + dbErr: zerrors.IsErrorInvalidArgument, }, }, { @@ -228,7 +228,7 @@ func Test_prepareColumns(t *testing.T) { }, res: res{ query: `SELECT creation_date, event_type, event_sequence, event_data, editor_user, resource_owner, instance_id, aggregate_type, aggregate_id, aggregate_version FROM eventstore.events`, - dbErr: errors.IsInternal, + dbErr: zerrors.IsInternal, }, }, } @@ -277,7 +277,7 @@ func prepareTestScan(err error, res []interface{}) scan { return err } if len(dests) != len(res) { - return errors.ThrowInvalidArgumentf(nil, "SQL-NML1q", "expected len %d got %d", len(res), len(dests)) + return zerrors.ThrowInvalidArgumentf(nil, "SQL-NML1q", "expected len %d got %d", len(res), len(dests)) } for i, r := range res { _, ok := dests[i].(*eventstore.Version) diff --git a/internal/eventstore/search_query.go b/internal/eventstore/search_query.go index 68321f9f9..27561a1c3 100644 --- a/internal/eventstore/search_query.go +++ b/internal/eventstore/search_query.go @@ -6,7 +6,7 @@ import ( "time" "github.com/zitadel/zitadel/internal/api/authz" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) // SearchQueryBuilder represents the builder for your filter @@ -141,7 +141,7 @@ const ( func (c Columns) Validate() error { if c <= 0 || c >= columnsCount { - return errors.ThrowPreconditionFailed(nil, "REPOS-x8R35", "column out of range") + return zerrors.ThrowPreconditionFailed(nil, "REPOS-x8R35", "column out of range") } return nil } diff --git a/internal/eventstore/v1/models/event.go b/internal/eventstore/v1/models/event.go index 82f7d3f8e..8c50d64da 100644 --- a/internal/eventstore/v1/models/event.go +++ b/internal/eventstore/v1/models/event.go @@ -5,8 +5,8 @@ import ( "reflect" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type EventType string @@ -101,7 +101,7 @@ func eventData(i interface{}) ([]byte, error) { case map[string]interface{}: bytes, err := json.Marshal(v) if err != nil { - return nil, errors.ThrowInvalidArgument(err, "MODEL-s2fgE", "unable to marshal data") + return nil, zerrors.ThrowInvalidArgument(err, "MODEL-s2fgE", "unable to marshal data") } return bytes, nil case nil: @@ -112,11 +112,11 @@ func eventData(i interface{}) ([]byte, error) { t = t.Elem() } if t.Kind() != reflect.Struct { - return nil, errors.ThrowInvalidArgument(nil, "MODEL-rjWdN", "data is not valid") + return nil, zerrors.ThrowInvalidArgument(nil, "MODEL-rjWdN", "data is not valid") } bytes, err := json.Marshal(v) if err != nil { - return nil, errors.ThrowInvalidArgument(err, "MODEL-Y2OpM", "unable to marshal data") + return nil, zerrors.ThrowInvalidArgument(err, "MODEL-Y2OpM", "unable to marshal data") } return bytes, nil } @@ -124,29 +124,29 @@ func eventData(i interface{}) ([]byte, error) { func (e *Event) Validate() error { if e == nil { - return errors.ThrowPreconditionFailed(nil, "MODEL-oEAG4", "event is nil") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-oEAG4", "event is nil") } if string(e.Typ) == "" { - return errors.ThrowPreconditionFailed(nil, "MODEL-R2sB0", "type not defined") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-R2sB0", "type not defined") } if e.AggregateID == "" { - return errors.ThrowPreconditionFailed(nil, "MODEL-A6WwL", "aggregate id not set") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-A6WwL", "aggregate id not set") } if e.AggregateType == "" { - return errors.ThrowPreconditionFailed(nil, "MODEL-EzdyK", "aggregate type not set") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-EzdyK", "aggregate type not set") } if err := e.AggregateVersion.Validate(); err != nil { - return errors.ThrowPreconditionFailed(err, "MODEL-KO71q", "version invalid") + return zerrors.ThrowPreconditionFailed(err, "MODEL-KO71q", "version invalid") } if e.Service == "" { - return errors.ThrowPreconditionFailed(nil, "MODEL-4Yqik", "editor service not set") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-4Yqik", "editor service not set") } if e.User == "" { - return errors.ThrowPreconditionFailed(nil, "MODEL-L3NHO", "editor user not set") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-L3NHO", "editor user not set") } if e.ResourceOwner == "" { - return errors.ThrowPreconditionFailed(nil, "MODEL-omFVT", "resource ow") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-omFVT", "resource ow") } return nil } diff --git a/internal/eventstore/v3/event.go b/internal/eventstore/v3/event.go index f99e91b05..e1c95f13f 100644 --- a/internal/eventstore/v3/event.go +++ b/internal/eventstore/v3/event.go @@ -6,8 +6,8 @@ import ( "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -31,7 +31,7 @@ func commandToEvent(sequence *latestSequence, command eventstore.Command) (_ *ev payload, err = json.Marshal(command.Payload()) if err != nil { logging.WithError(err).Warn("marshal payload failed") - return nil, errors.ThrowInternal(err, "V3-MInPK", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "V3-MInPK", "Errors.Internal") } } return &event{ @@ -95,7 +95,7 @@ func (e *event) Unmarshal(ptr any) error { return nil } if err := json.Unmarshal(e.payload, ptr); err != nil { - return errors.ThrowInternal(err, "V3-u8qVo", "Errors.Internal") + return zerrors.ThrowInternal(err, "V3-u8qVo", "Errors.Internal") } return nil diff --git a/internal/eventstore/v3/push.go b/internal/eventstore/v3/push.go index b954b5ca4..a86e42613 100644 --- a/internal/eventstore/v3/push.go +++ b/internal/eventstore/v3/push.go @@ -4,7 +4,7 @@ import ( "context" "database/sql" _ "embed" - errs "errors" + "errors" "fmt" "strconv" "strings" @@ -14,8 +14,8 @@ import ( "github.com/jackc/pgconn" "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) func (es *Eventstore) Push(ctx context.Context, commands ...eventstore.Command) (events []eventstore.Event, err error) { @@ -77,16 +77,16 @@ func insertEvents(ctx context.Context, tx *sql.Tx, sequences []*latestSequence, if err := rows.Err(); err != nil { pgErr := new(pgconn.PgError) - if errs.As(err, &pgErr) { + if errors.As(err, &pgErr) { // Check if push tries to write an event just written // by another transaction if pgErr.Code == "40001" { // TODO: @livio-a should we return the parent or not? - return nil, errors.ThrowInvalidArgument(err, "V3-p5xAn", "Errors.AlreadyExists") + return nil, zerrors.ThrowInvalidArgument(err, "V3-p5xAn", "Errors.AlreadyExists") } } logging.WithError(rows.Err()).Warn("failed to push events") - return nil, errors.ThrowInternal(err, "V3-VGnZY", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "V3-VGnZY", "Errors.Internal") } return events, nil @@ -132,7 +132,7 @@ func mapCommands(commands []eventstore.Command, sequences []*latestSequence) (ev revision, err := strconv.Atoi(strings.TrimPrefix(string(events[i].(*event).aggregate.Version), "v")) if err != nil { - return nil, nil, nil, errors.ThrowInternal(err, "V3-JoZEp", "Errors.Internal") + return nil, nil, nil, zerrors.ThrowInternal(err, "V3-JoZEp", "Errors.Internal") } args = append(args, events[i].(*event).aggregate.InstanceID, diff --git a/internal/eventstore/v3/sequence.go b/internal/eventstore/v3/sequence.go index 3155ac3a9..994645eab 100644 --- a/internal/eventstore/v3/sequence.go +++ b/internal/eventstore/v3/sequence.go @@ -10,8 +10,8 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type latestSequence struct { @@ -28,18 +28,18 @@ func latestSequences(ctx context.Context, tx *sql.Tx, commands []eventstore.Comm conditions, args := sequencesToSql(sequences) rows, err := tx.QueryContext(ctx, fmt.Sprintf(latestSequencesStmt, strings.Join(conditions, " OR ")), args...) if err != nil { - return nil, errors.ThrowInternal(err, "V3-5jU5z", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "V3-5jU5z", "Errors.Internal") } defer rows.Close() for rows.Next() { if err := scanToSequence(rows, sequences); err != nil { - return nil, errors.ThrowInternal(err, "V3-Ydiwv", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "V3-Ydiwv", "Errors.Internal") } } if rows.Err() != nil { - return nil, errors.ThrowInternal(rows.Err(), "V3-XApDk", "Errors.Internal") + return nil, zerrors.ThrowInternal(rows.Err(), "V3-XApDk", "Errors.Internal") } return sequences, nil } @@ -110,7 +110,7 @@ func scanToSequence(rows *sql.Rows, sequences []*latestSequence) error { var resourceOwner string if err := rows.Scan(&instanceID, &resourceOwner, &aggregateType, &aggregateID, ¤tSequence); err != nil { - return errors.ThrowInternal(err, "V3-OIWqj", "Errors.Internal") + return zerrors.ThrowInternal(err, "V3-OIWqj", "Errors.Internal") } sequence := searchSequence(sequences, aggregateType, aggregateID, instanceID) diff --git a/internal/eventstore/v3/unique_constraints.go b/internal/eventstore/v3/unique_constraints.go index 78a956afd..34967e9b3 100644 --- a/internal/eventstore/v3/unique_constraints.go +++ b/internal/eventstore/v3/unique_constraints.go @@ -11,8 +11,8 @@ import ( "github.com/jackc/pgconn" "github.com/zitadel/logging" - errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -61,7 +61,7 @@ func handleUniqueConstraints(ctx context.Context, tx *sql.Tx, commands []eventst if constraint := constraintFromErr(err, deleteConstraints); constraint != nil { errMessage = constraint.ErrorMessage } - return errs.ThrowInternal(err, "V3-C8l3V", errMessage) + return zerrors.ThrowInternal(err, "V3-C8l3V", errMessage) } } if len(addPlaceholders) > 0 { @@ -72,7 +72,7 @@ func handleUniqueConstraints(ctx context.Context, tx *sql.Tx, commands []eventst if constraint := constraintFromErr(err, addConstraints); constraint != nil { errMessage = constraint.ErrorMessage } - return errs.ThrowAlreadyExists(err, "V3-DKcYh", errMessage) + return zerrors.ThrowAlreadyExists(err, "V3-DKcYh", errMessage) } } return nil diff --git a/internal/eventstore/version.go b/internal/eventstore/version.go index 518b78d15..9e9bb6b35 100644 --- a/internal/eventstore/version.go +++ b/internal/eventstore/version.go @@ -3,7 +3,7 @@ package eventstore import ( "regexp" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type Version string @@ -12,7 +12,7 @@ var versionRegexp = regexp.MustCompile(`^v[0-9]+(\.[0-9]+){0,2}$`) func (v Version) Validate() error { if !versionRegexp.MatchString(string(v)) { - return errors.ThrowPreconditionFailed(nil, "MODEL-luDuS", "version is not semver") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-luDuS", "version is not semver") } return nil } diff --git a/internal/form/parser.go b/internal/form/parser.go index abffac10c..63986dcc2 100644 --- a/internal/form/parser.go +++ b/internal/form/parser.go @@ -5,7 +5,7 @@ import ( "github.com/gorilla/schema" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type Parser struct { @@ -21,7 +21,7 @@ func NewParser() *Parser { func (p *Parser) Parse(r *http.Request, data interface{}) error { err := r.ParseForm() if err != nil { - return errors.ThrowInternal(err, "FORM-lCC9zI", "Errors.Internal") + return zerrors.ThrowInternal(err, "FORM-lCC9zI", "Errors.Internal") } return p.decoder.Decode(data, r.Form) diff --git a/internal/i18n/bundle.go b/internal/i18n/bundle.go index 78b4550d8..822b91fa0 100644 --- a/internal/i18n/bundle.go +++ b/internal/i18n/bundle.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/yaml" "github.com/zitadel/zitadel/internal/domain" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const i18nPath = "/i18n" @@ -26,12 +26,12 @@ func newBundle(dir http.FileSystem, defaultLanguage language.Tag, allowedLanguag bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal) i18nDir, err := dir.Open(i18nPath) if err != nil { - return nil, zitadel_errors.ThrowNotFound(err, "I18N-MnXRie", "path not found") + return nil, zerrors.ThrowNotFound(err, "I18N-MnXRie", "path not found") } defer i18nDir.Close() files, err := i18nDir.Readdir(0) if err != nil { - return nil, zitadel_errors.ThrowNotFound(err, "I18N-Gew23", "cannot read dir") + return nil, zerrors.ThrowNotFound(err, "I18N-Gew23", "cannot read dir") } for _, file := range files { fileLang, _ := strings.CutSuffix(file.Name(), filepath.Ext(file.Name())) @@ -39,7 +39,7 @@ func newBundle(dir http.FileSystem, defaultLanguage language.Tag, allowedLanguag continue } if err := addFileFromFileSystemToBundle(dir, bundle, file); err != nil { - return nil, zitadel_errors.ThrowNotFoundf(err, "I18N-ZS2AW", "cannot append file %s to Bundle", file.Name()) + return nil, zerrors.ThrowNotFoundf(err, "I18N-ZS2AW", "cannot append file %s to Bundle", file.Name()) } } return bundle, nil diff --git a/internal/iam/model/idp_config_view.go b/internal/iam/model/idp_config_view.go index 3d3bddc46..6ba6a8c97 100644 --- a/internal/iam/model/idp_config_view.go +++ b/internal/iam/model/idp_config_view.go @@ -1,11 +1,11 @@ package model import ( + "time" + "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" - - "time" + "github.com/zitadel/zitadel/internal/zerrors" ) type IDPConfigView struct { @@ -72,7 +72,7 @@ type IDPConfigSearchResponse struct { func (r *IDPConfigSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-Mv9sd", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-Mv9sd", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/iam/model/idp_provider_view.go b/internal/iam/model/idp_provider_view.go index 562e37172..182521cee 100644 --- a/internal/iam/model/idp_provider_view.go +++ b/internal/iam/model/idp_provider_view.go @@ -1,10 +1,10 @@ package model import ( - "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" - "time" + + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/zerrors" ) type IDPProviderView struct { @@ -57,7 +57,7 @@ type IDPProviderSearchResponse struct { func (r *IDPProviderSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-3n8fs", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-3n8fs", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/iam/model/password_complexity_policy.go b/internal/iam/model/password_complexity_policy.go index 9f270e812..90081b9cc 100644 --- a/internal/iam/model/password_complexity_policy.go +++ b/internal/iam/model/password_complexity_policy.go @@ -3,8 +3,8 @@ package model import ( "regexp" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -29,30 +29,30 @@ type PasswordComplexityPolicy struct { func (p *PasswordComplexityPolicy) IsValid() error { if p.MinLength == 0 || p.MinLength > 72 { - return caos_errs.ThrowInvalidArgument(nil, "MODEL-Lsp0e", "Errors.User.PasswordComplexityPolicy.MinLengthNotAllowed") + return zerrors.ThrowInvalidArgument(nil, "MODEL-Lsp0e", "Errors.User.PasswordComplexityPolicy.MinLengthNotAllowed") } return nil } func (p *PasswordComplexityPolicy) Check(password string) error { if p.MinLength != 0 && uint64(len(password)) < p.MinLength { - return caos_errs.ThrowInvalidArgument(nil, "MODEL-HuJf6", "Errors.User.PasswordComplexityPolicy.MinLength") + return zerrors.ThrowInvalidArgument(nil, "MODEL-HuJf6", "Errors.User.PasswordComplexityPolicy.MinLength") } if p.HasLowercase && !hasStringLowerCase(password) { - return caos_errs.ThrowInvalidArgument(nil, "MODEL-co3Xw", "Errors.User.PasswordComplexityPolicy.HasLower") + return zerrors.ThrowInvalidArgument(nil, "MODEL-co3Xw", "Errors.User.PasswordComplexityPolicy.HasLower") } if p.HasUppercase && !hasStringUpperCase(password) { - return caos_errs.ThrowInvalidArgument(nil, "MODEL-VoaRj", "Errors.User.PasswordComplexityPolicy.HasUpper") + return zerrors.ThrowInvalidArgument(nil, "MODEL-VoaRj", "Errors.User.PasswordComplexityPolicy.HasUpper") } if p.HasNumber && !hasNumber(password) { - return caos_errs.ThrowInvalidArgument(nil, "MODEL-ZBv4H", "Errors.User.PasswordComplexityPolicy.HasNumber") + return zerrors.ThrowInvalidArgument(nil, "MODEL-ZBv4H", "Errors.User.PasswordComplexityPolicy.HasNumber") } if p.HasSymbol && !hasSymbol(password) { - return caos_errs.ThrowInvalidArgument(nil, "MODEL-ZDLwA", "Errors.User.PasswordComplexityPolicy.HasSymbol") + return zerrors.ThrowInvalidArgument(nil, "MODEL-ZDLwA", "Errors.User.PasswordComplexityPolicy.HasSymbol") } return nil } diff --git a/internal/iam/repository/eventsourcing/model/org_iam_policy.go b/internal/iam/repository/eventsourcing/model/org_iam_policy.go index 0ad162465..d56b4ee7a 100644 --- a/internal/iam/repository/eventsourcing/model/org_iam_policy.go +++ b/internal/iam/repository/eventsourcing/model/org_iam_policy.go @@ -1,10 +1,10 @@ package model import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type DomainPolicy struct { @@ -34,7 +34,7 @@ func (p *DomainPolicy) Changes(changed *DomainPolicy) map[string]interface{} { func (p *DomainPolicy) SetData(event eventstore.Event) error { err := event.Unmarshal(p) if err != nil { - return errors.ThrowInternal(err, "EVENT-7JS9d", "unable to unmarshal data") + return zerrors.ThrowInternal(err, "EVENT-7JS9d", "unable to unmarshal data") } return nil } diff --git a/internal/iam/repository/view/idp_provider_view.go b/internal/iam/repository/view/idp_provider_view.go index 06662cb21..3b5d9b2c2 100644 --- a/internal/iam/repository/view/idp_provider_view.go +++ b/internal/iam/repository/view/idp_provider_view.go @@ -4,10 +4,10 @@ import ( "github.com/jinzhu/gorm" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" iam_model "github.com/zitadel/zitadel/internal/iam/model" "github.com/zitadel/zitadel/internal/iam/repository/view/model" "github.com/zitadel/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) func GetIDPProviderByAggregateIDAndConfigID(db *gorm.DB, table, aggregateID, idpConfigID, instanceID string) (*model.IDPProviderView, error) { @@ -18,8 +18,8 @@ func GetIDPProviderByAggregateIDAndConfigID(db *gorm.DB, table, aggregateID, idp ownerRemovedQuery := &model.IDPProviderSearchQuery{Key: iam_model.IDPProviderSearchKeyOwnerRemoved, Value: false, Method: domain.SearchMethodEquals} query := repository.PrepareGetByQuery(table, aggIDQuery, idpConfigIDQuery, instanceIDQuery, ownerRemovedQuery) err := query(db, policy) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-Skvi8", "Errors.IAM.LoginPolicy.IDP.NotExisting") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-Skvi8", "Errors.IAM.LoginPolicy.IDP.NotExisting") } return policy, err } diff --git a/internal/iam/repository/view/idp_view.go b/internal/iam/repository/view/idp_view.go index da77a97ca..ad2cac2bb 100644 --- a/internal/iam/repository/view/idp_view.go +++ b/internal/iam/repository/view/idp_view.go @@ -4,10 +4,10 @@ import ( "github.com/jinzhu/gorm" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" iam_model "github.com/zitadel/zitadel/internal/iam/model" "github.com/zitadel/zitadel/internal/iam/repository/view/model" "github.com/zitadel/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) func IDPByID(db *gorm.DB, table, idpID, instanceID string) (*model.IDPConfigView, error) { @@ -17,8 +17,8 @@ func IDPByID(db *gorm.DB, table, idpID, instanceID string) (*model.IDPConfigView ownerRemovedQuery := &model.IDPConfigSearchQuery{Key: iam_model.IDPConfigSearchKeyOwnerRemoved, Value: false, Method: domain.SearchMethodEquals} query := repository.PrepareGetByQuery(table, idpIDQuery, instanceIDQuery, ownerRemovedQuery) err := query(db, idp) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-Ahq2s", "Errors.IDP.NotExisting") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-Ahq2s", "Errors.IDP.NotExisting") } return idp, err } diff --git a/internal/iam/repository/view/model/idp_config.go b/internal/iam/repository/view/model/idp_config.go index b2c41d93c..529068e24 100644 --- a/internal/iam/repository/view/model/idp_config.go +++ b/internal/iam/repository/view/model/idp_config.go @@ -7,11 +7,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/iam/model" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -117,7 +117,7 @@ func (r *IDPConfigView) SetData(event eventstore.Event) error { err := event.Unmarshal(r) if err != nil { logging.New().WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-lub6s", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-lub6s", "Could not unmarshal data") } return nil } diff --git a/internal/iam/repository/view/model/idp_provider.go b/internal/iam/repository/view/model/idp_provider.go index 775c8ba25..779df2426 100644 --- a/internal/iam/repository/view/model/idp_provider.go +++ b/internal/iam/repository/view/model/idp_provider.go @@ -5,11 +5,11 @@ import ( "github.com/zitadel/logging" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/iam/model" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -81,7 +81,7 @@ func (r *IDPProviderView) setRootData(event eventstore.Event) { func (r *IDPProviderView) SetData(event eventstore.Event) error { if err := event.Unmarshal(r); err != nil { logging.New().WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-Hs8uf", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-Hs8uf", "Could not unmarshal data") } return nil } diff --git a/internal/iam/repository/view/model/label_policy.go b/internal/iam/repository/view/model/label_policy.go index f4fad063b..2e3966661 100644 --- a/internal/iam/repository/view/model/label_policy.go +++ b/internal/iam/repository/view/model/label_policy.go @@ -6,11 +6,11 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -179,7 +179,7 @@ func (r *LabelPolicyView) setRootData(event eventstore.Event) { func (r *LabelPolicyView) SetData(event eventstore.Event) error { if err := event.Unmarshal(r); err != nil { logging.Log("MODEL-Flp9C").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-Hs8uf", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-Hs8uf", "Could not unmarshal data") } return nil } @@ -187,7 +187,7 @@ func (r *LabelPolicyView) SetData(event eventstore.Event) error { func (r *AssetView) SetData(event eventstore.Event) error { if err := event.Unmarshal(r); err != nil { logging.Log("MODEL-Ms8f2").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-Hs8uf", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-Hs8uf", "Could not unmarshal data") } return nil } diff --git a/internal/iam/repository/view/model/password_complexity_policy.go b/internal/iam/repository/view/model/password_complexity_policy.go index 30f72acb8..80b2b57b2 100644 --- a/internal/iam/repository/view/model/password_complexity_policy.go +++ b/internal/iam/repository/view/model/password_complexity_policy.go @@ -5,12 +5,12 @@ import ( "github.com/zitadel/logging" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/iam/model" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -71,7 +71,7 @@ func (r *PasswordComplexityPolicyView) setRootData(event eventstore.Event) { func (r *PasswordComplexityPolicyView) SetData(event eventstore.Event) error { if err := event.Unmarshal(r); err != nil { logging.Log("EVEN-Dmi9g").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-Hs8uf", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-Hs8uf", "Could not unmarshal data") } return nil } diff --git a/internal/iam/repository/view/styling.go b/internal/iam/repository/view/styling.go index fe1426893..3611483bc 100644 --- a/internal/iam/repository/view/styling.go +++ b/internal/iam/repository/view/styling.go @@ -1,13 +1,13 @@ package view import ( + "github.com/jinzhu/gorm" + "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" iam_model "github.com/zitadel/zitadel/internal/iam/model" "github.com/zitadel/zitadel/internal/iam/repository/view/model" "github.com/zitadel/zitadel/internal/view/repository" - - "github.com/jinzhu/gorm" + "github.com/zitadel/zitadel/internal/zerrors" ) func GetStylingByAggregateIDAndState(db *gorm.DB, table, aggregateID, instanceID string, state int32) (*model.LabelPolicyView, error) { @@ -18,8 +18,8 @@ func GetStylingByAggregateIDAndState(db *gorm.DB, table, aggregateID, instanceID ownerRemovedQuery := &model.LabelPolicySearchQuery{Key: iam_model.LabelPolicySearchKeyOwnerRemoved, Value: false, Method: domain.SearchMethodEquals} query := repository.PrepareGetByQuery(table, aggregateIDQuery, stateQuery, instanceIDQuery, ownerRemovedQuery) err := query(db, policy) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-68G11", "Errors.IAM.LabelPolicy.NotExisting") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-68G11", "Errors.IAM.LabelPolicy.NotExisting") } return policy, err } diff --git a/internal/idp/providers/saml/saml.go b/internal/idp/providers/saml/saml.go index 215230f72..aa816dfea 100644 --- a/internal/idp/providers/saml/saml.go +++ b/internal/idp/providers/saml/saml.go @@ -11,8 +11,8 @@ import ( "github.com/crewjam/saml" "github.com/crewjam/saml/samlsp" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/idp" + "github.com/zitadel/zitadel/internal/zerrors" ) var _ idp.Provider = (*Provider)(nil) @@ -154,7 +154,7 @@ func (p *Provider) IsAutoUpdate() bool { func (p *Provider) GetSP() (*samlsp.Middleware, error) { sp, err := samlsp.New(*p.spOptions) if err != nil { - return nil, errors.ThrowInternal(err, "SAML-qee09ffuq5", "Errors.Intent.IDPInvalid") + return nil, zerrors.ThrowInternal(err, "SAML-qee09ffuq5", "Errors.Intent.IDPInvalid") } if p.requestTracker != nil { sp.RequestTracker = p.requestTracker diff --git a/internal/idp/providers/saml/session.go b/internal/idp/providers/saml/session.go index c795493ad..af5ec0caf 100644 --- a/internal/idp/providers/saml/session.go +++ b/internal/idp/providers/saml/session.go @@ -9,8 +9,8 @@ import ( "github.com/crewjam/saml" "github.com/crewjam/saml/samlsp" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/idp" + "github.com/zitadel/zitadel/internal/zerrors" ) var _ idp.Session = (*Session)(nil) @@ -48,12 +48,12 @@ func (s *Session) GetAuth(ctx context.Context) (string, bool) { // FetchUser implements the [idp.Session] interface. func (s *Session) FetchUser(ctx context.Context) (user idp.User, err error) { if s.RequestID == "" || s.Request == nil { - return nil, errors.ThrowInvalidArgument(nil, "SAML-d09hy0wkex", "Errors.Intent.ResponseInvalid") + return nil, zerrors.ThrowInvalidArgument(nil, "SAML-d09hy0wkex", "Errors.Intent.ResponseInvalid") } s.Assertion, err = s.ServiceProvider.ServiceProvider.ParseResponse(s.Request, []string{s.RequestID}) if err != nil { - return nil, errors.ThrowInvalidArgument(err, "SAML-nuo0vphhh9", "Errors.Intent.ResponseInvalid") + return nil, zerrors.ThrowInvalidArgument(err, "SAML-nuo0vphhh9", "Errors.Intent.ResponseInvalid") } userMapper := NewUser() diff --git a/internal/idp/providers/saml/session_test.go b/internal/idp/providers/saml/session_test.go index 34126ff7f..3ab33a855 100644 --- a/internal/idp/providers/saml/session_test.go +++ b/internal/idp/providers/saml/session_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/idp/providers/saml/requesttracker" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestSession_FetchUser(t *testing.T) { @@ -69,7 +69,7 @@ func TestSession_FetchUser(t *testing.T) { requestID: "", }, want: want{ - err: caos_errs.ThrowInvalidArgument(nil, "SAML-d09hy0wkex", "Errors.Intent.ResponseInvalid"), + err: zerrors.ThrowInvalidArgument(nil, "SAML-d09hy0wkex", "Errors.Intent.ResponseInvalid"), }, }, { @@ -95,7 +95,7 @@ func TestSession_FetchUser(t *testing.T) { requestID: "id-b22c90db88bf01d82ffb0a7b6fe25ac9fcb2c679", }, want: want{ - err: caos_errs.ThrowInvalidArgument(nil, "SAML-d09hy0wkex", "Errors.Intent.ResponseInvalid"), + err: zerrors.ThrowInvalidArgument(nil, "SAML-d09hy0wkex", "Errors.Intent.ResponseInvalid"), }, }, { @@ -125,7 +125,7 @@ func TestSession_FetchUser(t *testing.T) { requestID: "id-b22c90db88bf01d82ffb0a7b6fe25ac9fcb2c679", }, want: want{ - err: caos_errs.ThrowInvalidArgument(nil, "SAML-nuo0vphhh9", "Errors.Intent.ResponseInvalid"), + err: zerrors.ThrowInvalidArgument(nil, "SAML-nuo0vphhh9", "Errors.Intent.ResponseInvalid"), }, }, { diff --git a/internal/integration/integration.go b/internal/integration/integration.go index 3d794a10d..8e38ca0e3 100644 --- a/internal/integration/integration.go +++ b/internal/integration/integration.go @@ -32,11 +32,11 @@ import ( z_oidc "github.com/zitadel/zitadel/internal/api/oidc" "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/net" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/webauthn" + "github.com/zitadel/zitadel/internal/zerrors" "github.com/zitadel/zitadel/pkg/grpc/admin" ) @@ -181,7 +181,7 @@ func (s *Tester) createMachineUserOrgOwner(ctx context.Context) { ctx, user := s.createMachineUser(ctx, MachineUserOrgOwner, OrgOwner) _, err = s.Commands.AddOrgMember(ctx, user.ResourceOwner, user.ID, "ORG_OWNER") - target := new(caos_errs.AlreadyExistsError) + target := new(zerrors.AlreadyExistsError) if !errors.As(err, &target) { logging.OnError(err).Fatal("add org member") } @@ -192,7 +192,7 @@ func (s *Tester) createMachineUserInstanceOwner(ctx context.Context) { ctx, user := s.createMachineUser(ctx, MachineUserInstanceOwner, IAMOwner) _, err = s.Commands.AddInstanceMember(ctx, user.ID, "IAM_OWNER") - target := new(caos_errs.AlreadyExistsError) + target := new(zerrors.AlreadyExistsError) if !errors.As(err, &target) { logging.OnError(err).Fatal("add instance member") } diff --git a/internal/migration/command.go b/internal/migration/command.go index 8a296edab..5c1885669 100644 --- a/internal/migration/command.go +++ b/internal/migration/command.go @@ -6,8 +6,8 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/service" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) // SetupStep is the command pushed on the eventstore @@ -22,7 +22,7 @@ type SetupStep struct { func (s *SetupStep) UnmarshalJSON(data []byte) error { fields := struct { Name string `json:"name,"` - Error *errors.CaosError `json:"error"` + Error *zerrors.ZitadelError `json:"error"` LastRun map[string]interface{} `json:"lastRun,omitempty"` }{} if err := json.Unmarshal(data, &fields); err != nil { @@ -108,7 +108,7 @@ func SetupMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(step) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-hYp7M", "unable to unmarshal step") + return nil, zerrors.ThrowInternal(err, "IAM-hYp7M", "unable to unmarshal step") } return step, nil diff --git a/internal/migration/migration.go b/internal/migration/migration.go index d6e335516..3e94ea5bb 100644 --- a/internal/migration/migration.go +++ b/internal/migration/migration.go @@ -2,13 +2,13 @@ package migration import ( "context" - errs "errors" + "errors" "time" "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -21,7 +21,7 @@ const ( ) var ( - errMigrationAlreadyStarted = errs.New("already started") + errMigrationAlreadyStarted = errors.New("already started") ) type Migration interface { @@ -90,7 +90,7 @@ func LatestStep(ctx context.Context, es *eventstore.Eventstore) (*SetupStep, err } step, ok := events[0].(*SetupStep) if !ok { - return nil, errors.ThrowInternal(nil, "MIGRA-hppLM", "setup step is malformed") + return nil, zerrors.ThrowInternal(nil, "MIGRA-hppLM", "setup step is malformed") } return step, nil } @@ -111,7 +111,7 @@ func (m *cancelMigration) String() string { return m.name } -var errCancelStep = errors.ThrowError(nil, "MIGRA-zo86K", "migration canceled manually") +var errCancelStep = zerrors.ThrowError(nil, "MIGRA-zo86K", "migration canceled manually") func CancelStep(ctx context.Context, es *eventstore.Eventstore, step *SetupStep) error { _, err := es.Push(ctx, setupDoneCmd(ctx, &cancelMigration{name: step.Name}, errCancelStep)) @@ -125,11 +125,11 @@ func checkExec(ctx context.Context, es *eventstore.Eventstore, migration Migrati for { select { case <-ctx.Done(): - return false, errors.ThrowInternal(nil, "MIGR-as3f7", "Errors.Internal") + return false, zerrors.ThrowInternal(nil, "MIGR-as3f7", "Errors.Internal") case <-timer.C: should, err := shouldExec(ctx, es, migration) if err != nil { - if !errs.Is(err, errMigrationAlreadyStarted) { + if !errors.Is(err, errMigrationAlreadyStarted) { return false, err } logging.WithFields("migration step", migration.String()). @@ -159,7 +159,7 @@ func shouldExec(ctx context.Context, es *eventstore.Eventstore, migration Migrat for _, event := range events { e, ok := event.(*SetupStep) if !ok { - return false, errors.ThrowInternal(nil, "MIGRA-IJY3D", "Errors.Internal") + return false, zerrors.ThrowInternal(nil, "MIGRA-IJY3D", "Errors.Internal") } if e.Name != migration.String() { diff --git a/internal/notification/channels/fs/channel.go b/internal/notification/channels/fs/channel.go index 723946c24..814629a12 100644 --- a/internal/notification/channels/fs/channel.go +++ b/internal/notification/channels/fs/channel.go @@ -11,9 +11,9 @@ import ( "github.com/k3a/html2text" "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/notification/channels" "github.com/zitadel/zitadel/internal/notification/messages" + "github.com/zitadel/zitadel/internal/zerrors" ) func InitFSChannel(config Config) (channels.NotificationChannel, error) { @@ -44,7 +44,7 @@ func InitFSChannel(config Config) (channels.NotificationChannel, error) { case *messages.JSON: fileName = "message.json" default: - return errors.ThrowUnimplementedf(nil, "NOTIF-6f9a1", "filesystem provider doesn't support message type %T", message) + return zerrors.ThrowUnimplementedf(nil, "NOTIF-6f9a1", "filesystem provider doesn't support message type %T", message) } return os.WriteFile(filepath.Join(config.Path, fileName), []byte(content), 0666) diff --git a/internal/notification/channels/smtp/channel.go b/internal/notification/channels/smtp/channel.go index 35da2b3e1..2d6dc9dad 100644 --- a/internal/notification/channels/smtp/channel.go +++ b/internal/notification/channels/smtp/channel.go @@ -8,9 +8,9 @@ import ( "github.com/zitadel/logging" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/notification/channels" "github.com/zitadel/zitadel/internal/notification/messages" + "github.com/zitadel/zitadel/internal/zerrors" ) var _ channels.NotificationChannel = (*Email)(nil) @@ -41,22 +41,22 @@ func (email *Email) HandleMessage(message channels.Message) error { defer email.smtpClient.Close() emailMsg, ok := message.(*messages.Email) if !ok { - return caos_errs.ThrowInternal(nil, "EMAIL-s8JLs", "message is not EmailMessage") + return zerrors.ThrowInternal(nil, "EMAIL-s8JLs", "message is not EmailMessage") } if emailMsg.Content == "" || emailMsg.Subject == "" || len(emailMsg.Recipients) == 0 { - return caos_errs.ThrowInternalf(nil, "EMAIL-zGemZ", "subject, recipients and content must be set but got subject %s, recipients length %d and content length %d", emailMsg.Subject, len(emailMsg.Recipients), len(emailMsg.Content)) + return zerrors.ThrowInternalf(nil, "EMAIL-zGemZ", "subject, recipients and content must be set but got subject %s, recipients length %d and content length %d", emailMsg.Subject, len(emailMsg.Recipients), len(emailMsg.Content)) } emailMsg.SenderEmail = email.senderAddress emailMsg.SenderName = email.senderName emailMsg.ReplyToAddress = email.replyToAddress // To && From if err := email.smtpClient.Mail(emailMsg.SenderEmail); err != nil { - return caos_errs.ThrowInternalf(err, "EMAIL-s3is3", "could not set sender: %v", emailMsg.SenderEmail) + return zerrors.ThrowInternalf(err, "EMAIL-s3is3", "could not set sender: %v", emailMsg.SenderEmail) } for _, recp := range append(append(emailMsg.Recipients, emailMsg.CC...), emailMsg.BCC...) { if err := email.smtpClient.Rcpt(recp); err != nil { - return caos_errs.ThrowInternalf(err, "EMAIL-s4is4", "could not set recipient: %v", recp) + return zerrors.ThrowInternalf(err, "EMAIL-s4is4", "could not set recipient: %v", recp) } } @@ -87,7 +87,7 @@ func (email *Email) HandleMessage(message channels.Message) error { func (smtpConfig SMTP) connectToSMTP(tlsRequired bool) (client *smtp.Client, err error) { host, _, err := net.SplitHostPort(smtpConfig.Host) if err != nil { - return nil, caos_errs.ThrowInternal(err, "EMAIL-spR56", "could not split host and port for connect to smtp") + return nil, zerrors.ThrowInternal(err, "EMAIL-spR56", "could not split host and port for connect to smtp") } if !tlsRequired { @@ -109,7 +109,7 @@ func (smtpConfig SMTP) connectToSMTP(tlsRequired bool) (client *smtp.Client, err func (smtpConfig SMTP) getSMPTClient() (*smtp.Client, error) { client, err := smtp.Dial(smtpConfig.Host) if err != nil { - return nil, caos_errs.ThrowInternal(err, "EMAIL-skwos", "could not make smtp dial") + return nil, zerrors.ThrowInternal(err, "EMAIL-skwos", "could not make smtp dial") } return client, nil } @@ -123,12 +123,12 @@ func (smtpConfig SMTP) getSMPTClientWithTls(host string) (*smtp.Client, error) { } if err != nil { - return nil, caos_errs.ThrowInternal(err, "EMAIL-sl39s", "could not make tls dial") + return nil, zerrors.ThrowInternal(err, "EMAIL-sl39s", "could not make tls dial") } client, err := smtp.NewClient(conn, host) if err != nil { - return nil, caos_errs.ThrowInternal(err, "EMAIL-skwi4", "could not create smtp client") + return nil, zerrors.ThrowInternal(err, "EMAIL-skwi4", "could not create smtp client") } return client, err } @@ -142,7 +142,7 @@ func (smtpConfig SMTP) getSMPTClientWithStartTls(host string) (*smtp.Client, err if err := client.StartTLS(&tls.Config{ ServerName: host, }); err != nil { - return nil, caos_errs.ThrowInternal(err, "EMAIL-guvsQ", "could not start tls") + return nil, zerrors.ThrowInternal(err, "EMAIL-guvsQ", "could not start tls") } return client, nil } @@ -157,7 +157,7 @@ func (smtpConfig SMTP) smtpAuth(client *smtp.Client, host string) error { } err := client.Auth(auth) if err != nil { - return caos_errs.ThrowInternalf(err, "EMAIL-s9kfs", "could not add smtp auth for user %s", smtpConfig.User) + return zerrors.ThrowInternalf(err, "EMAIL-s9kfs", "could not add smtp auth for user %s", smtpConfig.User) } return nil } diff --git a/internal/notification/channels/twilio/channel.go b/internal/notification/channels/twilio/channel.go index c25ceb842..da04b20f5 100644 --- a/internal/notification/channels/twilio/channel.go +++ b/internal/notification/channels/twilio/channel.go @@ -4,9 +4,9 @@ import ( "github.com/kevinburke/twilio-go" "github.com/zitadel/logging" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/notification/channels" "github.com/zitadel/zitadel/internal/notification/messages" + "github.com/zitadel/zitadel/internal/zerrors" ) func InitChannel(config Config) channels.NotificationChannel { @@ -17,7 +17,7 @@ func InitChannel(config Config) channels.NotificationChannel { return channels.HandleMessageFunc(func(message channels.Message) error { twilioMsg, ok := message.(*messages.SMS) if !ok { - return caos_errs.ThrowInternal(nil, "TWILI-s0pLc", "message is not SMS") + return zerrors.ThrowInternal(nil, "TWILI-s0pLc", "message is not SMS") } content, err := twilioMsg.GetContent() if err != nil { @@ -25,7 +25,7 @@ func InitChannel(config Config) channels.NotificationChannel { } m, err := client.Messages.SendMessage(twilioMsg.SenderPhoneNumber, twilioMsg.RecipientPhoneNumber, content, nil) if err != nil { - return caos_errs.ThrowInternal(err, "TWILI-osk3S", "could not send message") + return zerrors.ThrowInternal(err, "TWILI-osk3S", "could not send message") } logging.WithFields("message_sid", m.Sid, "status", m.Status).Debug("sms sent") return nil diff --git a/internal/notification/channels/webhook/channel.go b/internal/notification/channels/webhook/channel.go index c587f593b..4065767d1 100644 --- a/internal/notification/channels/webhook/channel.go +++ b/internal/notification/channels/webhook/channel.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/notification/channels" "github.com/zitadel/zitadel/internal/notification/messages" + "github.com/zitadel/zitadel/internal/zerrors" ) func InitChannel(ctx context.Context, cfg Config) (channels.NotificationChannel, error) { @@ -25,7 +25,7 @@ func InitChannel(ctx context.Context, cfg Config) (channels.NotificationChannel, defer cancel() msg, ok := message.(*messages.JSON) if !ok { - return errors.ThrowInternal(nil, "WEBH-K686U", "message is not JSON") + return zerrors.ThrowInternal(nil, "WEBH-K686U", "message is not JSON") } payload, err := msg.GetContent() if err != nil { @@ -47,7 +47,7 @@ func InitChannel(ctx context.Context, cfg Config) (channels.NotificationChannel, return err } if resp.StatusCode < 200 || resp.StatusCode >= 300 { - return errors.ThrowUnknown(fmt.Errorf("calling url %s returned %s", cfg.CallURL, resp.Status), "WEBH-LBxU0", "webhook didn't return a success status") + return zerrors.ThrowUnknown(fmt.Errorf("calling url %s returned %s", cfg.CallURL, resp.Status), "WEBH-LBxU0", "webhook didn't return a success status") } logging.WithFields("calling_url", cfg.CallURL, "method", cfg.Method).Debug("webhook called") return nil diff --git a/internal/notification/handlers/config_twilio.go b/internal/notification/handlers/config_twilio.go index 29a79415d..539155369 100644 --- a/internal/notification/handlers/config_twilio.go +++ b/internal/notification/handlers/config_twilio.go @@ -5,9 +5,9 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/notification/channels/twilio" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) // GetTwilioConfig reads the iam Twilio provider config @@ -21,7 +21,7 @@ func (n *NotificationQueries) GetTwilioConfig(ctx context.Context) (*twilio.Conf return nil, err } if config.TwilioConfig == nil { - return nil, errors.ThrowNotFound(nil, "HANDLER-8nfow", "Errors.SMS.Twilio.NotFound") + return nil, zerrors.ThrowNotFound(nil, "HANDLER-8nfow", "Errors.SMS.Twilio.NotFound") } token, err := crypto.DecryptString(config.TwilioConfig.Token, n.SMSTokenCrypto) if err != nil { diff --git a/internal/notification/handlers/origin.go b/internal/notification/handlers/origin.go index 915e1fed1..0d12ac303 100644 --- a/internal/notification/handlers/origin.go +++ b/internal/notification/handlers/origin.go @@ -8,9 +8,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" http_utils "github.com/zitadel/zitadel/internal/api/http" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) type OriginEvent interface { @@ -44,7 +44,7 @@ func (n *NotificationQueries) Origin(ctx context.Context, e eventstore.Event) (c return ctx, err } if len(domains.Domains) < 1 { - return ctx, errors.ThrowInternal(nil, "NOTIF-Ef3r1", "Errors.Notification.NoDomain") + return ctx, zerrors.ThrowInternal(nil, "NOTIF-Ef3r1", "Errors.Notification.NoDomain") } return enrichCtx( ctx, diff --git a/internal/notification/handlers/quota_notifier.go b/internal/notification/handlers/quota_notifier.go index b149643ea..d0ed12baa 100644 --- a/internal/notification/handlers/quota_notifier.go +++ b/internal/notification/handlers/quota_notifier.go @@ -5,13 +5,13 @@ import ( "net/http" "github.com/zitadel/zitadel/internal/command" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/notification/channels/webhook" _ "github.com/zitadel/zitadel/internal/notification/statik" "github.com/zitadel/zitadel/internal/notification/types" "github.com/zitadel/zitadel/internal/repository/quota" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -60,7 +60,7 @@ func (u *quotaNotifier) Reducers() []handler.AggregateReducer { func (u *quotaNotifier) reduceNotificationDue(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*quota.NotificationDueEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-DLxdE", "reduce.wrong.event.type %s", quota.NotificationDueEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-DLxdE", "reduce.wrong.event.type %s", quota.NotificationDueEventType) } return handler.NewStatement(event, func(ex handler.Executer, projectionName string) error { diff --git a/internal/notification/handlers/telemetry_pusher.go b/internal/notification/handlers/telemetry_pusher.go index b326bbc96..39a1f5945 100644 --- a/internal/notification/handlers/telemetry_pusher.go +++ b/internal/notification/handlers/telemetry_pusher.go @@ -11,7 +11,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/command" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/notification/channels/webhook" @@ -20,6 +19,7 @@ import ( "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/repository/milestone" "github.com/zitadel/zitadel/internal/repository/pseudo" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -80,7 +80,7 @@ func (t *telemetryPusher) pushMilestones(event eventstore.Event) (*handler.State ctx := call.WithTimestamp(context.Background()) scheduledEvent, ok := event.(*pseudo.ScheduledEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-lDTs5", "reduce.wrong.event.type %s", event.Type()) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-lDTs5", "reduce.wrong.event.type %s", event.Type()) } return handler.NewStatement(event, func(ex handler.Executer, projectionName string) error { diff --git a/internal/notification/handlers/user_notifier.go b/internal/notification/handlers/user_notifier.go index 6f15b994f..9208fbc4b 100644 --- a/internal/notification/handlers/user_notifier.go +++ b/internal/notification/handlers/user_notifier.go @@ -9,13 +9,13 @@ import ( "github.com/zitadel/zitadel/internal/api/ui/login" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/notification/types" "github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/repository/session" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -127,7 +127,7 @@ func (u *userNotifier) Reducers() []handler.AggregateReducer { func (u *userNotifier) reduceInitCodeAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanInitialCodeAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-EFe2f", "reduce.wrong.event.type %s", user.HumanInitialCodeAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-EFe2f", "reduce.wrong.event.type %s", user.HumanInitialCodeAddedType) } return handler.NewStatement(event, func(ex handler.Executer, projectionName string) error { @@ -180,7 +180,7 @@ func (u *userNotifier) reduceInitCodeAdded(event eventstore.Event) (*handler.Sta func (u *userNotifier) reduceEmailCodeAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanEmailCodeAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SWf3g", "reduce.wrong.event.type %s", user.HumanEmailCodeAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SWf3g", "reduce.wrong.event.type %s", user.HumanEmailCodeAddedType) } if e.CodeReturned { @@ -237,7 +237,7 @@ func (u *userNotifier) reduceEmailCodeAdded(event eventstore.Event) (*handler.St func (u *userNotifier) reducePasswordCodeAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanPasswordCodeAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Eeg3s", "reduce.wrong.event.type %s", user.HumanPasswordCodeAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Eeg3s", "reduce.wrong.event.type %s", user.HumanPasswordCodeAddedType) } if e.CodeReturned { return handler.NewNoOpStatement(e), nil @@ -296,7 +296,7 @@ func (u *userNotifier) reducePasswordCodeAdded(event eventstore.Event) (*handler func (u *userNotifier) reduceOTPSMSCodeAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanOTPSMSCodeAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ASF3g", "reduce.wrong.event.type %s", user.HumanOTPSMSCodeAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ASF3g", "reduce.wrong.event.type %s", user.HumanOTPSMSCodeAddedType) } return u.reduceOTPSMS( e, @@ -313,7 +313,7 @@ func (u *userNotifier) reduceOTPSMSCodeAdded(event eventstore.Event) (*handler.S func (u *userNotifier) reduceSessionOTPSMSChallenged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.OTPSMSChallengedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Sk32L", "reduce.wrong.event.type %s", session.OTPSMSChallengedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Sk32L", "reduce.wrong.event.type %s", session.OTPSMSChallengedType) } if e.CodeReturned { return handler.NewNoOpStatement(e), nil @@ -388,7 +388,7 @@ func (u *userNotifier) reduceOTPSMS( func (u *userNotifier) reduceOTPEmailCodeAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanOTPEmailCodeAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-JL3hw", "reduce.wrong.event.type %s", user.HumanOTPEmailCodeAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-JL3hw", "reduce.wrong.event.type %s", user.HumanOTPEmailCodeAddedType) } var authRequestID string if e.AuthRequestInfo != nil { @@ -413,7 +413,7 @@ func (u *userNotifier) reduceOTPEmailCodeAdded(event eventstore.Event) (*handler func (u *userNotifier) reduceSessionOTPEmailChallenged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.OTPEmailChallengedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-zbsgt", "reduce.wrong.event.type %s", session.OTPEmailChallengedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-zbsgt", "reduce.wrong.event.type %s", session.OTPEmailChallengedType) } if e.ReturnCode { return handler.NewNoOpStatement(e), nil @@ -510,7 +510,7 @@ func (u *userNotifier) reduceOTPEmail( func (u *userNotifier) reduceDomainClaimed(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.DomainClaimedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Drh5w", "reduce.wrong.event.type %s", user.UserDomainClaimedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Drh5w", "reduce.wrong.event.type %s", user.UserDomainClaimedType) } return handler.NewStatement(event, func(ex handler.Executer, projectionName string) error { ctx := HandlerContext(event.Aggregate()) @@ -557,7 +557,7 @@ func (u *userNotifier) reduceDomainClaimed(event eventstore.Event) (*handler.Sta func (u *userNotifier) reducePasswordlessCodeRequested(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanPasswordlessInitCodeRequestedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-EDtjd", "reduce.wrong.event.type %s", user.HumanPasswordlessInitCodeAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-EDtjd", "reduce.wrong.event.type %s", user.HumanPasswordlessInitCodeAddedType) } if e.CodeReturned { return handler.NewNoOpStatement(e), nil @@ -611,7 +611,7 @@ func (u *userNotifier) reducePasswordlessCodeRequested(event eventstore.Event) ( func (u *userNotifier) reducePasswordChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanPasswordChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Yko2z8", "reduce.wrong.event.type %s", user.HumanPasswordChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Yko2z8", "reduce.wrong.event.type %s", user.HumanPasswordChangedType) } return handler.NewStatement(event, func(ex handler.Executer, projectionName string) error { @@ -625,7 +625,7 @@ func (u *userNotifier) reducePasswordChanged(event eventstore.Event) (*handler.S } notificationPolicy, err := u.queries.NotificationPolicyByOrg(ctx, true, e.Aggregate().ResourceOwner, false) - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { return nil } if err != nil { @@ -670,7 +670,7 @@ func (u *userNotifier) reducePasswordChanged(event eventstore.Event) (*handler.S func (u *userNotifier) reducePhoneCodeAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanPhoneCodeAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-He83g", "reduce.wrong.event.type %s", user.HumanPhoneCodeAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-He83g", "reduce.wrong.event.type %s", user.HumanPhoneCodeAddedType) } if e.CodeReturned { return handler.NewNoOpStatement(e), nil diff --git a/internal/notification/types/email_verification_code_test.go b/internal/notification/types/email_verification_code_test.go index ab1b4e181..38aeb987a 100644 --- a/internal/notification/types/email_verification_code_test.go +++ b/internal/notification/types/email_verification_code_test.go @@ -9,8 +9,8 @@ import ( http_utils "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestNotify_SendEmailVerificationCode(t *testing.T) { @@ -56,7 +56,7 @@ func TestNotify_SendEmailVerificationCode(t *testing.T) { urlTmpl: "{{", }, want: ¬ifyResult{}, - wantErr: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), + wantErr: zerrors.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), }, { name: "template success", diff --git a/internal/notification/types/passwordless_registration_link_test.go b/internal/notification/types/passwordless_registration_link_test.go index 489a50567..95fb75603 100644 --- a/internal/notification/types/passwordless_registration_link_test.go +++ b/internal/notification/types/passwordless_registration_link_test.go @@ -9,8 +9,8 @@ import ( http_utils "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestNotify_SendPasswordlessRegistrationLink(t *testing.T) { @@ -58,7 +58,7 @@ func TestNotify_SendPasswordlessRegistrationLink(t *testing.T) { urlTmpl: "{{", }, want: ¬ifyResult{}, - wantErr: caos_errs.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), + wantErr: zerrors.ThrowInvalidArgument(nil, "DOMAIN-oGh5e", "Errors.User.InvalidURLTemplate"), }, { name: "template success", diff --git a/internal/notification/types/user_email.go b/internal/notification/types/user_email.go index 152b63076..d3c3bfdd4 100644 --- a/internal/notification/types/user_email.go +++ b/internal/notification/types/user_email.go @@ -4,10 +4,10 @@ import ( "context" "html" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/notification/messages" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) func generateEmail( @@ -34,7 +34,7 @@ func generateEmail( return err } if emailChannels == nil || emailChannels.Len() == 0 { - return errors.ThrowPreconditionFailed(nil, "MAIL-83nof", "Errors.Notification.Channels.NotPresent") + return zerrors.ThrowPreconditionFailed(nil, "MAIL-83nof", "Errors.Notification.Channels.NotPresent") } return emailChannels.HandleMessage(message) } diff --git a/internal/notification/types/user_phone.go b/internal/notification/types/user_phone.go index 6eb3314cd..c9adfeac8 100644 --- a/internal/notification/types/user_phone.go +++ b/internal/notification/types/user_phone.go @@ -5,10 +5,10 @@ import ( "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/notification/messages" "github.com/zitadel/zitadel/internal/query" + "github.com/zitadel/zitadel/internal/zerrors" ) func generateSms( @@ -23,7 +23,7 @@ func generateSms( smsChannels, twilioConfig, err := channels.SMS(ctx) logging.OnError(err).Error("could not create sms channel") if smsChannels == nil || smsChannels.Len() == 0 { - return errors.ThrowPreconditionFailed(nil, "PHONE-w8nfow", "Errors.Notification.Channels.NotPresent") + return zerrors.ThrowPreconditionFailed(nil, "PHONE-w8nfow", "Errors.Notification.Channels.NotPresent") } if err == nil { number = twilioConfig.SenderNumber diff --git a/internal/org/model/org.go b/internal/org/model/org.go index 104931c66..f2e8454b5 100644 --- a/internal/org/model/org.go +++ b/internal/org/model/org.go @@ -2,9 +2,9 @@ package model import ( "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type Org struct { @@ -43,7 +43,7 @@ func (o *Org) GetPrimaryDomain() (string, error) { return d.Domain, nil } } - return "", errors.ThrowInternalf(nil, "ORG-Dertg", "no primary domain found for org: %s (instanceID: %s)", o.AggregateID, o.InstanceID) + return "", zerrors.ThrowInternalf(nil, "ORG-Dertg", "no primary domain found for org: %s (instanceID: %s)", o.AggregateID, o.InstanceID) } func (o *Org) AddIAMDomain(iamDomain string) { diff --git a/internal/org/repository/eventsourcing/model/domain.go b/internal/org/repository/eventsourcing/model/domain.go index 902805772..212d8b499 100644 --- a/internal/org/repository/eventsourcing/model/domain.go +++ b/internal/org/repository/eventsourcing/model/domain.go @@ -2,10 +2,10 @@ package model import ( "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/org/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type OrgDomain struct { @@ -98,7 +98,7 @@ func (o *Org) appendVerificationDomainEvent(event eventstore.Event) error { func (m *OrgDomain) SetData(event eventstore.Event) error { err := event.Unmarshal(m) if err != nil { - return errors.ThrowInternal(err, "EVENT-Hz7Mb", "unable to unmarshal data") + return zerrors.ThrowInternal(err, "EVENT-Hz7Mb", "unable to unmarshal data") } return nil } diff --git a/internal/org/repository/eventsourcing/model/member.go b/internal/org/repository/eventsourcing/model/member.go index 1dad429a5..328b9b45d 100644 --- a/internal/org/repository/eventsourcing/model/member.go +++ b/internal/org/repository/eventsourcing/model/member.go @@ -4,8 +4,8 @@ import ( "encoding/json" "reflect" - "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type OrgMember struct { @@ -34,7 +34,7 @@ func (m *OrgMember) AppendEvent(event *es_models.Event) error { func (m *OrgMember) SetData(event *es_models.Event) error { err := json.Unmarshal(event.Data, m) if err != nil { - return errors.ThrowInternal(err, "EVENT-Hz7Mb", "unable to unmarshal data") + return zerrors.ThrowInternal(err, "EVENT-Hz7Mb", "unable to unmarshal data") } return nil } diff --git a/internal/org/repository/eventsourcing/model/org.go b/internal/org/repository/eventsourcing/model/org.go index 5de94e499..4ff271fe2 100644 --- a/internal/org/repository/eventsourcing/model/org.go +++ b/internal/org/repository/eventsourcing/model/org.go @@ -1,12 +1,12 @@ package model import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" iam_es_model "github.com/zitadel/zitadel/internal/iam/repository/eventsourcing/model" org_model "github.com/zitadel/zitadel/internal/org/model" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) type Org struct { @@ -93,7 +93,7 @@ func (o *Org) AppendEvent(event eventstore.Event) (err error) { func (o *Org) SetData(event eventstore.Event) error { err := event.Unmarshal(o) if err != nil { - return errors.ThrowInternal(err, "EVENT-BpbQZ", "unable to unmarshal event") + return zerrors.ThrowInternal(err, "EVENT-BpbQZ", "unable to unmarshal event") } return nil } diff --git a/internal/org/repository/view/query.go b/internal/org/repository/view/query.go index 21b39a223..d2e56eaaf 100644 --- a/internal/org/repository/view/query.go +++ b/internal/org/repository/view/query.go @@ -1,14 +1,14 @@ package view import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func OrgByIDQuery(id, instanceID string, latestSequence uint64) (*eventstore.SearchQueryBuilder, error) { if id == "" { - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-dke74", "id should be filled") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-dke74", "id should be filled") } return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent). InstanceID(instanceID). diff --git a/internal/project/model/api_config.go b/internal/project/model/api_config.go index 2751d601d..e2854b416 100644 --- a/internal/project/model/api_config.go +++ b/internal/project/model/api_config.go @@ -7,9 +7,9 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/zerrors" ) type APIConfig struct { @@ -32,7 +32,7 @@ func (c *APIConfig) IsValid() bool { return true } -//ClientID random_number@projectname (eg. 495894098234@zitadel) +// ClientID random_number@projectname (eg. 495894098234@zitadel) func (c *APIConfig) GenerateNewClientID(idGenerator id.Generator, project *Project) error { rndID, err := idGenerator.Next() if err != nil { @@ -54,7 +54,7 @@ func (c *APIConfig) GenerateNewClientSecret(generator crypto.Generator) (string, cryptoValue, stringSecret, err := crypto.NewCode(generator) if err != nil { logging.Log("MODEL-ADvd2").OnError(err).Error("unable to create client secret") - return "", errors.ThrowInternal(err, "MODEL-dsvr43", "Errors.Project.CouldNotGenerateClientSecret") + return "", zerrors.ThrowInternal(err, "MODEL-dsvr43", "Errors.Project.CouldNotGenerateClientSecret") } c.ClientSecret = cryptoValue return stringSecret, nil diff --git a/internal/project/model/oidc_config.go b/internal/project/model/oidc_config.go index c3b0739f5..dbcece15f 100644 --- a/internal/project/model/oidc_config.go +++ b/internal/project/model/oidc_config.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/id" + "github.com/zitadel/zitadel/internal/zerrors" ) type OIDCConfig struct { @@ -108,7 +108,7 @@ func (c *OIDCConfig) IsValid() bool { return true } -//ClientID random_number@projectname (eg. 495894098234@zitadel) +// ClientID random_number@projectname (eg. 495894098234@zitadel) func (c *OIDCConfig) GenerateNewClientID(idGenerator id.Generator, project *Project) error { rndID, err := idGenerator.Next() if err != nil { @@ -130,7 +130,7 @@ func (c *OIDCConfig) GenerateNewClientSecret(generator crypto.Generator) (string cryptoValue, stringSecret, err := crypto.NewCode(generator) if err != nil { logging.Log("MODEL-UpnTI").OnError(err).Error("unable to create client secret") - return "", errors.ThrowInternal(err, "MODEL-gH2Wl", "Errors.Project.CouldNotGenerateClientSecret") + return "", zerrors.ThrowInternal(err, "MODEL-gH2Wl", "Errors.Project.CouldNotGenerateClientSecret") } c.ClientSecret = cryptoValue return stringSecret, nil diff --git a/internal/project/model/project_grant_member_view.go b/internal/project/model/project_grant_member_view.go index 635648fe5..1b30e4cf7 100644 --- a/internal/project/model/project_grant_member_view.go +++ b/internal/project/model/project_grant_member_view.go @@ -1,10 +1,10 @@ package model import ( - "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" - "time" + + "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/zerrors" ) type ProjectGrantMemberView struct { @@ -63,7 +63,7 @@ type ProjectGrantMemberSearchResponse struct { func (r *ProjectGrantMemberSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-ZT8df", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-ZT8df", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/project/model/project_grant_view.go b/internal/project/model/project_grant_view.go index fb6dd26f3..02eb78393 100644 --- a/internal/project/model/project_grant_view.go +++ b/internal/project/model/project_grant_view.go @@ -2,7 +2,7 @@ package model import ( "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" "time" ) @@ -81,7 +81,7 @@ func (r *ProjectGrantViewSearchRequest) AppendMyResourceOwnerQuery(orgID string) func (r *ProjectGrantViewSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-0fj3s", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-0fj3s", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/project/model/project_member_view.go b/internal/project/model/project_member_view.go index c208df383..3eeecfe19 100644 --- a/internal/project/model/project_member_view.go +++ b/internal/project/model/project_member_view.go @@ -2,7 +2,7 @@ package model import ( "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" "time" ) @@ -61,7 +61,7 @@ type ProjectMemberSearchResponse struct { func (r *ProjectMemberSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-389Nd", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-389Nd", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/project/model/project_role_view.go b/internal/project/model/project_role_view.go index 10efc0bf4..bf3d8aae1 100644 --- a/internal/project/model/project_role_view.go +++ b/internal/project/model/project_role_view.go @@ -2,7 +2,7 @@ package model import ( "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" "time" ) @@ -66,7 +66,7 @@ func (r *ProjectRoleSearchRequest) AppendRoleKeysQuery(keys []string) { func (r *ProjectRoleSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-92hNf", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-92hNf", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/project/model/project_view.go b/internal/project/model/project_view.go index 31fa33625..95ee5887a 100644 --- a/internal/project/model/project_view.go +++ b/internal/project/model/project_view.go @@ -2,7 +2,7 @@ package model import ( "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" "time" ) @@ -68,7 +68,7 @@ func (r *ProjectViewSearchRequest) AppendMyResourceOwnerQuery(orgID string) { func (r *ProjectViewSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-2M0ds", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-2M0ds", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/project/repository/eventsourcing/model/oidc_config.go b/internal/project/repository/eventsourcing/model/oidc_config.go index fb75374aa..df35e2724 100644 --- a/internal/project/repository/eventsourcing/model/oidc_config.go +++ b/internal/project/repository/eventsourcing/model/oidc_config.go @@ -7,9 +7,9 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) type OIDCConfig struct { @@ -78,7 +78,7 @@ func (key *ClientKey) AppendEvent(event *es_models.Event) (err error) { case project.ApplicationKeyAddedEventType: err = json.Unmarshal(event.Data, key) if err != nil { - return errors.ThrowInternal(err, "MODEL-Fetg3", "Errors.Internal") + return zerrors.ThrowInternal(err, "MODEL-Fetg3", "Errors.Internal") } case project.ApplicationKeyRemovedEventType: key.ExpirationDate = event.CreationDate diff --git a/internal/project/repository/view/model/application.go b/internal/project/repository/view/model/application.go index 8a7dc6db6..006415bb1 100644 --- a/internal/project/repository/view/model/application.go +++ b/internal/project/repository/view/model/application.go @@ -9,10 +9,10 @@ import ( http_util "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/project/model" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -173,7 +173,7 @@ func (a *ApplicationView) setRootData(event *models.Event) { func (a *ApplicationView) SetData(event *models.Event) error { if err := json.Unmarshal(event.Data, a); err != nil { logging.Log("EVEN-lo9ds").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-8suie", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-8suie", "Could not unmarshal data") } return nil } @@ -213,7 +213,7 @@ func (a *ApplicationView) setProjectChanges(event *models.Event) error { }{} if err := json.Unmarshal(event.Data, &changes); err != nil { logging.Log("EVEN-DFbfg").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-Bw221", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-Bw221", "Could not unmarshal data") } if changes.ProjectRoleAssertion != nil { a.ProjectRoleAssertion = *changes.ProjectRoleAssertion diff --git a/internal/project/repository/view/model/project.go b/internal/project/repository/view/model/project.go index 81ccb4929..a13eb205c 100644 --- a/internal/project/repository/view/model/project.go +++ b/internal/project/repository/view/model/project.go @@ -7,10 +7,10 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/project/model" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -75,7 +75,7 @@ func (p *ProjectView) setProjectData(event *models.Event) error { func (p *ProjectView) SetData(event *models.Event) error { if err := json.Unmarshal(event.Data, p); err != nil { logging.Log("EVEN-sk9Sj").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-s9ols", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-s9ols", "Could not unmarshal data") } return nil } diff --git a/internal/project/repository/view/model/project_grant.go b/internal/project/repository/view/model/project_grant.go index a8a14113f..2b6557dcc 100644 --- a/internal/project/repository/view/model/project_grant.go +++ b/internal/project/repository/view/model/project_grant.go @@ -7,10 +7,10 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/project/model" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -93,7 +93,7 @@ func (p *ProjectGrantView) setProjectGrantData(event *models.Event) error { func (p *ProjectGrant) SetData(event *models.Event) error { if err := json.Unmarshal(event.Data, p); err != nil { logging.Log("EVEN-dlo92").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-s9ols", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-s9ols", "Could not unmarshal data") } return nil } diff --git a/internal/project/repository/view/model/project_grant_member.go b/internal/project/repository/view/model/project_grant_member.go index 7e52a8804..119692cfd 100644 --- a/internal/project/repository/view/model/project_grant_member.go +++ b/internal/project/repository/view/model/project_grant_member.go @@ -7,9 +7,9 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -62,7 +62,7 @@ func (r *ProjectGrantMemberView) setRootData(event *models.Event) { func (r *ProjectGrantMemberView) SetData(event *models.Event) error { if err := json.Unmarshal(event.Data, r); err != nil { logging.Log("EVEN-slo9s").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-0plew", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-0plew", "Could not unmarshal data") } return nil } diff --git a/internal/project/repository/view/model/project_member.go b/internal/project/repository/view/model/project_member.go index 4a20e3da1..d81f584c6 100644 --- a/internal/project/repository/view/model/project_member.go +++ b/internal/project/repository/view/model/project_member.go @@ -7,9 +7,9 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -60,7 +60,7 @@ func (r *ProjectMemberView) setRootData(event *models.Event) { func (r *ProjectMemberView) SetData(event *models.Event) error { if err := json.Unmarshal(event.Data, r); err != nil { logging.Log("EVEN-slo9s").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-lub6s", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-lub6s", "Could not unmarshal data") } return nil } diff --git a/internal/project/repository/view/org_project_mapping_view.go b/internal/project/repository/view/org_project_mapping_view.go index b75a7f13d..76d98c815 100644 --- a/internal/project/repository/view/org_project_mapping_view.go +++ b/internal/project/repository/view/org_project_mapping_view.go @@ -4,10 +4,10 @@ import ( "github.com/jinzhu/gorm" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" proj_model "github.com/zitadel/zitadel/internal/project/model" "github.com/zitadel/zitadel/internal/project/repository/view/model" "github.com/zitadel/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) func OrgProjectMappingByIDs(db *gorm.DB, table, orgID, projectID, instanceID string) (*model.OrgProjectMapping, error) { @@ -19,8 +19,8 @@ func OrgProjectMappingByIDs(db *gorm.DB, table, orgID, projectID, instanceID str ownerRemovedQuery := model.OrgProjectMappingSearchQuery{Key: proj_model.OrgProjectMappingSearchKeyOwnerRemoved, Value: false, Method: domain.SearchMethodEquals} query := repository.PrepareGetByQuery(table, projectIDQuery, orgIDQuery, instanceIDQuery, ownerRemovedQuery) err := query(db, orgProjectMapping) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-fn9fs", "Errors.OrgProjectMapping.NotExisting") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-fn9fs", "Errors.OrgProjectMapping.NotExisting") } return orgProjectMapping, err } diff --git a/internal/project/repository/view/query.go b/internal/project/repository/view/query.go index 70d7f29e4..af1670a4d 100644 --- a/internal/project/repository/view/query.go +++ b/internal/project/repository/view/query.go @@ -1,14 +1,14 @@ package view import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func ProjectByIDQuery(id, instanceID string, latestSequence uint64) (*eventstore.SearchQueryBuilder, error) { if id == "" { - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-dke74", "Errors.Project.ProjectIDMissing") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-dke74", "Errors.Project.ProjectIDMissing") } return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent). InstanceID(instanceID). diff --git a/internal/query/access_token.go b/internal/query/access_token.go index 664796d2d..379b561bf 100644 --- a/internal/query/access_token.go +++ b/internal/query/access_token.go @@ -6,11 +6,11 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/oidcsession" "github.com/zitadel/zitadel/internal/repository/session" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type OIDCSessionAccessTokenReadModel struct { @@ -98,14 +98,14 @@ func (q *Queries) ActiveAccessTokenByToken(ctx context.Context, token string) (m split := strings.Split(token, "-") if len(split) != 2 { - return nil, caos_errs.ThrowPermissionDenied(nil, "QUERY-LJK2W", "Errors.OIDCSession.Token.Invalid") + return nil, zerrors.ThrowPermissionDenied(nil, "QUERY-LJK2W", "Errors.OIDCSession.Token.Invalid") } model, err = q.accessTokenByOIDCSessionAndTokenID(ctx, split[0], split[1]) if err != nil { return nil, err } if !model.AccessTokenExpiration.After(time.Now()) { - return nil, caos_errs.ThrowPermissionDenied(nil, "QUERY-SAF3rf", "Errors.OIDCSession.Token.Expired") + return nil, zerrors.ThrowPermissionDenied(nil, "QUERY-SAF3rf", "Errors.OIDCSession.Token.Expired") } if err = q.checkSessionNotTerminatedAfter(ctx, model.SessionID, model.AccessTokenCreation); err != nil { return nil, err @@ -119,10 +119,10 @@ func (q *Queries) accessTokenByOIDCSessionAndTokenID(ctx context.Context, oidcSe model = newOIDCSessionAccessTokenReadModel(oidcSessionID) if err = q.eventstore.FilterToQueryReducer(ctx, model); err != nil { - return nil, caos_errs.ThrowPermissionDenied(err, "QUERY-ASfe2", "Errors.OIDCSession.Token.Invalid") + return nil, zerrors.ThrowPermissionDenied(err, "QUERY-ASfe2", "Errors.OIDCSession.Token.Invalid") } if model.AccessTokenID != tokenID { - return nil, caos_errs.ThrowPermissionDenied(nil, "QUERY-M2u9w", "Errors.OIDCSession.Token.Invalid") + return nil, zerrors.ThrowPermissionDenied(nil, "QUERY-M2u9w", "Errors.OIDCSession.Token.Invalid") } return model, nil } @@ -145,10 +145,10 @@ func (q *Queries) checkSessionNotTerminatedAfter(ctx context.Context, sessionID ). Builder()) if err != nil { - return caos_errs.ThrowPermissionDenied(err, "QUERY-SJ642", "Errors.Internal") + return zerrors.ThrowPermissionDenied(err, "QUERY-SJ642", "Errors.Internal") } if len(events) > 0 { - return caos_errs.ThrowPermissionDenied(nil, "QUERY-IJL3H", "Errors.OIDCSession.Token.Invalid") + return zerrors.ThrowPermissionDenied(nil, "QUERY-IJL3H", "Errors.OIDCSession.Token.Invalid") } return nil } diff --git a/internal/query/action.go b/internal/query/action.go index e2c75e690..30ded403d 100644 --- a/internal/query/action.go +++ b/internal/query/action.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -11,9 +11,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -127,7 +127,7 @@ func (q *Queries) SearchActions(ctx context.Context, queries *ActionSearchQuerie } stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-SDgwg", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-SDgwg", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -135,7 +135,7 @@ func (q *Queries) SearchActions(ctx context.Context, queries *ActionSearchQuerie return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SDfr52", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-SDfr52", "Errors.Internal") } actions.State, err = q.latestState(ctx, actionTable) @@ -157,7 +157,7 @@ func (q *Queries) GetActionByID(ctx context.Context, id string, orgID string, wi } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dgff3", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-Dgff3", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -223,7 +223,7 @@ func prepareActionsQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuil } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-EGdff", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-EGdff", "Errors.Query.CloseRows") } return &Actions{ @@ -264,10 +264,10 @@ func prepareActionQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuild &action.AllowedToFail, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-GEfnb", "Errors.Action.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-GEfnb", "Errors.Action.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Dbnt4", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Dbnt4", "Errors.Internal") } return action, nil } diff --git a/internal/query/action_flow.go b/internal/query/action_flow.go index a06d88b62..d6d4243d9 100644 --- a/internal/query/action_flow.go +++ b/internal/query/action_flow.go @@ -10,9 +10,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -75,7 +75,7 @@ func (q *Queries) GetFlow(ctx context.Context, flowType domain.FlowType, orgID s } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-HBRh3", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-HBRh3", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -99,7 +99,7 @@ func (q *Queries) GetActiveActionsByFlowAndTriggerType(ctx context.Context, flow } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dgff3", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-Dgff3", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -120,7 +120,7 @@ func (q *Queries) GetFlowTypesOfActionID(ctx context.Context, actionID string) ( } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-Dh311", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-Dh311", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -192,7 +192,7 @@ func prepareTriggerActionsQuery(ctx context.Context, db prepareDatabase) (sq.Sel } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Df42d", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-Df42d", "Errors.Query.CloseRows") } return actions, nil @@ -281,7 +281,7 @@ func prepareFlowQuery(ctx context.Context, db prepareDatabase, flowType domain.F } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dfbe2", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-Dfbe2", "Errors.Query.CloseRows") } return flow, nil diff --git a/internal/query/action_test.go b/internal/query/action_test.go index 4c0f00d07..f6ba5be4b 100644 --- a/internal/query/action_test.go +++ b/internal/query/action_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -227,7 +227,7 @@ func Test_ActionPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/app.go b/internal/query/app.go index 0877d68c0..92a44742f 100644 --- a/internal/query/app.go +++ b/internal/query/app.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -13,10 +13,10 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type Apps struct { @@ -264,7 +264,7 @@ func (q *Queries) AppByProjectAndAppID(ctx context.Context, shouldTriggerBulk bo } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-AFDgg", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-AFDgg", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -285,7 +285,7 @@ func (q *Queries) AppByID(ctx context.Context, appID string) (app *App, err erro } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-immt9", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-immt9", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -306,7 +306,7 @@ func (q *Queries) AppBySAMLEntityID(ctx context.Context, entityID string) (app * } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-JgUop", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-JgUop", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -331,7 +331,7 @@ func (q *Queries) ProjectByClientID(ctx context.Context, appID string) (project }, }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-XhJi3", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-XhJi3", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -352,7 +352,7 @@ func (q *Queries) ProjectIDFromOIDCClientID(ctx context.Context, appID string) ( } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return "", errors.ThrowInternal(err, "QUERY-7d92U", "Errors.Query.SQLStatement") + return "", zerrors.ThrowInternal(err, "QUERY-7d92U", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -378,7 +378,7 @@ func (q *Queries) ProjectIDFromClientID(ctx context.Context, appID string) (id s } query, args, err := stmt.Where(where).ToSql() if err != nil { - return "", errors.ThrowInternal(err, "QUERY-SDfg3", "Errors.Query.SQLStatement") + return "", zerrors.ThrowInternal(err, "QUERY-SDfg3", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -399,7 +399,7 @@ func (q *Queries) ProjectByOIDCClientID(ctx context.Context, id string) (project } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-XhJi4", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-XhJi4", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -420,7 +420,7 @@ func (q *Queries) AppByOIDCClientID(ctx context.Context, clientID string) (app * } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-JgVop", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-JgVop", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -444,7 +444,7 @@ func (q *Queries) AppByClientID(ctx context.Context, clientID string) (app *App, }, }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dfge2", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-Dfge2", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -462,7 +462,7 @@ func (q *Queries) SearchApps(ctx context.Context, queries *AppSearchQueries, wit eq := sq.Eq{AppColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()} stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-fajp8", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-fajp8", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -470,7 +470,7 @@ func (q *Queries) SearchApps(ctx context.Context, queries *AppSearchQueries, wit return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-aJnZL", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-aJnZL", "Errors.Internal") } apps.State, err = q.latestState(ctx, appsTable) return apps, err @@ -484,7 +484,7 @@ func (q *Queries) SearchClientIDs(ctx context.Context, queries *AppSearchQueries eq := sq.Eq{AppColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()} stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-fajp8", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-fajp8", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -492,7 +492,7 @@ func (q *Queries) SearchClientIDs(ctx context.Context, queries *AppSearchQueries return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-aJnZL", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-aJnZL", "Errors.Internal") } return ids, nil } @@ -594,10 +594,10 @@ func prepareAppQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-pCP8P", "Errors.App.NotExisting") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-pCP8P", "Errors.App.NotExisting") } - return nil, errors.ThrowInternal(err, "QUERY-4SJlx", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-4SJlx", "Errors.Internal") } apiConfig.set(app) @@ -621,10 +621,10 @@ func prepareProjectIDByAppQuery(ctx context.Context, db prepareDatabase) (sq.Sel ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return "", errors.ThrowNotFound(err, "QUERY-aKcc2", "Errors.Project.NotExisting") + if errors.Is(err, sql.ErrNoRows) { + return "", zerrors.ThrowNotFound(err, "QUERY-aKcc2", "Errors.Project.NotExisting") } - return "", errors.ThrowInternal(err, "QUERY-3A5TG", "Errors.Internal") + return "", zerrors.ThrowInternal(err, "QUERY-3A5TG", "Errors.Internal") } return projectID, nil @@ -666,10 +666,10 @@ func prepareProjectByAppQuery(ctx context.Context, db prepareDatabase) (sq.Selec &p.PrivateLabelingSetting, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-yxTMh", "Errors.Project.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-yxTMh", "Errors.Project.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-dj2FF", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-dj2FF", "Errors.Internal") } return p, nil } @@ -769,7 +769,7 @@ func prepareAppsQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder ) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-XGWAX", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-XGWAX", "Errors.Internal") } apiConfig.set(app) @@ -800,7 +800,7 @@ func prepareClientIDsQuery(ctx context.Context, db prepareDatabase) (sq.SelectBu &apiID, &oidcID, ); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-0R2Nw", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-0R2Nw", "Errors.Internal") } if apiID.Valid { ids = append(ids, apiID.String) diff --git a/internal/query/app_test.go b/internal/query/app_test.go index 599a9724a..a7658dd0a 100644 --- a/internal/query/app_test.go +++ b/internal/query/app_test.go @@ -11,7 +11,7 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -1146,7 +1146,7 @@ func Test_AppPrepare(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -1864,7 +1864,7 @@ func Test_ProjectIDByAppPrepare(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -1930,7 +1930,7 @@ func Test_ProjectByAppPrepare(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/auth_request.go b/internal/query/auth_request.go index 71766b899..50df4bf6f 100644 --- a/internal/query/auth_request.go +++ b/internal/query/auth_request.go @@ -4,7 +4,7 @@ import ( "context" "database/sql" _ "embed" - errs "errors" + "errors" "fmt" "time" @@ -14,10 +14,10 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type AuthRequest struct { @@ -36,7 +36,7 @@ type AuthRequest struct { func (a *AuthRequest) checkLoginClient(ctx context.Context) error { if uid := authz.GetCtxData(ctx).UserID; uid != a.LoginClient { - return errors.ThrowPermissionDenied(nil, "OIDCv2-aL0ag", "Errors.AuthRequest.WrongLoginClient") + return zerrors.ThrowPermissionDenied(nil, "OIDCv2-aL0ag", "Errors.AuthRequest.WrongLoginClient") } return nil } @@ -77,11 +77,11 @@ func (q *Queries) AuthRequestByID(ctx context.Context, shouldTriggerBulk bool, i q.authRequestByIDQuery(ctx), id, authz.GetInstance(ctx).InstanceID(), ) - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-Thee9", "Errors.AuthRequest.NotExisting") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-Thee9", "Errors.AuthRequest.NotExisting") } if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Ou8ue", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Ou8ue", "Errors.Internal") } dst.Scope = scope diff --git a/internal/query/auth_request_test.go b/internal/query/auth_request_test.go index 4cc52fa8c..aacc2e025 100644 --- a/internal/query/auth_request_test.go +++ b/internal/query/auth_request_test.go @@ -16,8 +16,8 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestQueries_AuthRequestByID(t *testing.T) { @@ -126,7 +126,7 @@ func TestQueries_AuthRequestByID(t *testing.T) { id: "123", }, expect: mockQueryScanErr(expQuery, cols, nil, "123", "instanceID"), - wantErr: errors.ThrowNotFound(sql.ErrNoRows, "QUERY-Thee9", "Errors.AuthRequest.NotExisting"), + wantErr: zerrors.ThrowNotFound(sql.ErrNoRows, "QUERY-Thee9", "Errors.AuthRequest.NotExisting"), }, { name: "query error", @@ -135,7 +135,7 @@ func TestQueries_AuthRequestByID(t *testing.T) { id: "123", }, expect: mockQueryErr(expQuery, sql.ErrConnDone, "123", "instanceID"), - wantErr: errors.ThrowInternal(sql.ErrConnDone, "QUERY-Ou8ue", "Errors.Internal"), + wantErr: zerrors.ThrowInternal(sql.ErrConnDone, "QUERY-Ou8ue", "Errors.Internal"), }, { name: "wrong login client", @@ -157,7 +157,7 @@ func TestQueries_AuthRequestByID(t *testing.T) { sql.NullInt64{}, sql.NullString{}, }, "123", "instanceID"), - wantErr: errors.ThrowPermissionDeniedf(nil, "OIDCv2-aL0ag", "Errors.AuthRequest.WrongLoginClient"), + wantErr: zerrors.ThrowPermissionDeniedf(nil, "OIDCv2-aL0ag", "Errors.AuthRequest.WrongLoginClient"), }, } for _, tt := range tests { diff --git a/internal/query/authn_key.go b/internal/query/authn_key.go index 21ff3aee1..584270e2b 100644 --- a/internal/query/authn_key.go +++ b/internal/query/authn_key.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -13,10 +13,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -137,7 +137,7 @@ func (q *Queries) SearchAuthNKeys(ctx context.Context, queries *AuthNKeySearchQu } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-SAf3f", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-SAf3f", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -145,7 +145,7 @@ func (q *Queries) SearchAuthNKeys(ctx context.Context, queries *AuthNKeySearchQu return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dbg53", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Dbg53", "Errors.Internal") } authNKeys.State, err = q.latestState(ctx, authNKeyTable) @@ -164,7 +164,7 @@ func (q *Queries) SearchAuthNKeysData(ctx context.Context, queries *AuthNKeySear } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-SAg3f", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-SAg3f", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -172,7 +172,7 @@ func (q *Queries) SearchAuthNKeysData(ctx context.Context, queries *AuthNKeySear return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dbi53", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Dbi53", "Errors.Internal") } authNKeys.State, err = q.latestState(ctx, authNKeyTable) return authNKeys, err @@ -200,7 +200,7 @@ func (q *Queries) GetAuthNKeyByID(ctx context.Context, shouldTriggerBulk bool, i } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-AGhg4", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-AGhg4", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -228,7 +228,7 @@ func (q *Queries) GetAuthNKeyPublicKeyByIDAndIdentifier(ctx context.Context, id } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-DAb32", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-DAb32", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -284,7 +284,7 @@ func prepareAuthNKeysQuery(ctx context.Context, db prepareDatabase) (sq.SelectBu } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dgfn3", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-Dgfn3", "Errors.Query.CloseRows") } return &AuthNKeys{ @@ -319,10 +319,10 @@ func prepareAuthNKeyQuery(ctx context.Context, db prepareDatabase) (sq.SelectBui &authNKey.Type, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-Dgr3g", "Errors.AuthNKey.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-Dgr3g", "Errors.AuthNKey.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-BGnbr", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-BGnbr", "Errors.Internal") } return authNKey, nil } @@ -339,10 +339,10 @@ func prepareAuthNKeyPublicKeyQuery(ctx context.Context, db prepareDatabase) (sq. &publicKey, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-SDf32", "Errors.AuthNKey.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-SDf32", "Errors.AuthNKey.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Bfs2a", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Bfs2a", "Errors.Internal") } return publicKey, nil } @@ -386,7 +386,7 @@ func prepareAuthNKeysDataQuery(ctx context.Context, db prepareDatabase) (sq.Sele } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dgfn3", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-Dgfn3", "Errors.Query.CloseRows") } return &AuthNKeysData{ diff --git a/internal/query/authn_key_test.go b/internal/query/authn_key_test.go index 620e6a507..5f5084de3 100644 --- a/internal/query/authn_key_test.go +++ b/internal/query/authn_key_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -361,7 +361,7 @@ func Test_AuthNKeyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -424,7 +424,7 @@ func Test_AuthNKeyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/certificate.go b/internal/query/certificate.go index d43787ff2..f4254e023 100644 --- a/internal/query/certificate.go +++ b/internal/query/certificate.go @@ -11,9 +11,9 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type Certificate interface { @@ -85,7 +85,7 @@ func (q *Queries) ActiveCertificates(ctx context.Context, t time.Time, usage dom }, ).OrderBy(KeyPrivateColExpiry.identifier()).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SDfkg", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-SDfkg", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -93,11 +93,11 @@ func (q *Queries) ActiveCertificates(ctx context.Context, t time.Time, usage dom return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Sgan4", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Sgan4", "Errors.Internal") } certs.State, err = q.latestState(ctx, keyTable) - if !errors.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return certs, err } return certs, nil @@ -146,7 +146,7 @@ func prepareCertificateQuery(ctx context.Context, db prepareDatabase) (sq.Select } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows") } return &Certificates{ diff --git a/internal/query/certificate_test.go b/internal/query/certificate_test.go index 6e8b52abf..a6c862c8a 100644 --- a/internal/query/certificate_test.go +++ b/internal/query/certificate_test.go @@ -10,7 +10,7 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -65,7 +65,7 @@ func Test_CertificatePrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/current_state.go b/internal/query/current_state.go index 2c42e97bd..73c8eaeb9 100644 --- a/internal/query/current_state.go +++ b/internal/query/current_state.go @@ -4,7 +4,7 @@ import ( "context" "database/sql" _ "embed" - errs "errors" + "errors" "fmt" "strings" "time" @@ -14,10 +14,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type State struct { @@ -68,7 +68,7 @@ func (q *Queries) SearchCurrentStates(ctx context.Context, queries *CurrentState query, scan := prepareCurrentStateQuery(ctx, q.client) stmt, args, err := queries.toQuery(query).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-MmFef", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-MmFef", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -76,7 +76,7 @@ func (q *Queries) SearchCurrentStates(ctx context.Context, queries *CurrentState return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-22H8f", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-22H8f", "Errors.Internal") } return currentStates, nil @@ -97,7 +97,7 @@ func (q *Queries) latestState(ctx context.Context, projections ...table) (state OrderBy(CurrentStateColEventDate.identifier() + " DESC"). ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-5CfX9", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-5CfX9", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -111,7 +111,7 @@ func (q *Queries) latestState(ctx context.Context, projections ...table) (state func (q *Queries) ClearCurrentSequence(ctx context.Context, projectionName string) (err error) { tx, err := q.client.Begin() if err != nil { - return errors.ThrowInternal(err, "QUERY-9iOpr", "Errors.RemoveFailed") + return zerrors.ThrowInternal(err, "QUERY-9iOpr", "Errors.RemoveFailed") } defer func() { if err != nil { @@ -120,7 +120,7 @@ func (q *Queries) ClearCurrentSequence(ctx context.Context, projectionName strin return } if commitErr := tx.Commit(); commitErr != nil { - err = errors.ThrowInternal(commitErr, "QUERY-JGD0l", "Errors.Internal") + err = zerrors.ThrowInternal(commitErr, "QUERY-JGD0l", "Errors.Internal") } }() @@ -139,7 +139,7 @@ func (q *Queries) ClearCurrentSequence(ctx context.Context, projectionName strin } err = tx.Commit() if err != nil { - return errors.ThrowInternal(err, "QUERY-Sfvsc", "Errors.Internal") + return zerrors.ThrowInternal(err, "QUERY-Sfvsc", "Errors.Internal") } return nil } @@ -153,11 +153,11 @@ func (q *Queries) checkAndLock(tx *sql.Tx, projectionName string) (name string, PlaceholderFormat(sq.Dollar). ToSql() if err != nil { - return "", errors.ThrowInternal(err, "QUERY-UJTUy", "Errors.Internal") + return "", zerrors.ThrowInternal(err, "QUERY-UJTUy", "Errors.Internal") } row := tx.QueryRow(stmt, args...) if err := row.Scan(&name); err != nil || name == "" { - return "", errors.ThrowInternal(err, "QUERY-ej8fn", "Errors.ProjectionName.Invalid") + return "", zerrors.ThrowInternal(err, "QUERY-ej8fn", "Errors.ProjectionName.Invalid") } return name, nil } @@ -165,7 +165,7 @@ func (q *Queries) checkAndLock(tx *sql.Tx, projectionName string) (name string, func tablesForReset(ctx context.Context, tx *sql.Tx, projectionName string) (tables []string, err error) { names := strings.Split(projectionName, ".") if len(names) != 2 { - return nil, errors.ThrowInvalidArgument(nil, "QUERY-wk1jr", "Errors.InvalidArgument") + return nil, zerrors.ThrowInvalidArgument(nil, "QUERY-wk1jr", "Errors.InvalidArgument") } schema := names[0] tablePrefix := names[1] @@ -181,19 +181,19 @@ func tablesForReset(ctx context.Context, tx *sql.Tx, projectionName string) (tab PlaceholderFormat(sq.Dollar). ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-ASff2", "Errors.ProjectionName.Invalid") + return nil, zerrors.ThrowInternal(err, "QUERY-ASff2", "Errors.ProjectionName.Invalid") } rows, err := tx.QueryContext(ctx, tablesQuery, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dgfw", "Errors.ProjectionName.Invalid") + return nil, zerrors.ThrowInternal(err, "QUERY-Dgfw", "Errors.ProjectionName.Invalid") } defer rows.Close() for rows.Next() { var tableName string if err := rows.Scan(&tableName); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-ej8fn", "Errors.ProjectionName.Invalid") + return nil, zerrors.ThrowInternal(err, "QUERY-ej8fn", "Errors.ProjectionName.Invalid") } tables = append(tables, schema+"."+tableName) } @@ -209,7 +209,7 @@ func reset(ctx context.Context, tx *sql.Tx, tables []string, projectionName stri for _, tableName := range tables { _, err := tx.Exec(fmt.Sprintf("TRUNCATE %s cascade", tableName)) if err != nil { - return errors.ThrowInternal(err, "QUERY-3n92f", "Errors.RemoveFailed") + return zerrors.ThrowInternal(err, "QUERY-3n92f", "Errors.RemoveFailed") } } update, args, err := sq.Update(currentStateTable.identifier()). @@ -220,11 +220,11 @@ func reset(ctx context.Context, tx *sql.Tx, tables []string, projectionName stri PlaceholderFormat(sq.Dollar). ToSql() if err != nil { - return errors.ThrowInternal(err, "QUERY-Ff3tw", "Errors.RemoveFailed") + return zerrors.ThrowInternal(err, "QUERY-Ff3tw", "Errors.RemoveFailed") } _, err = tx.Exec(update, args...) if err != nil { - return errors.ThrowInternal(err, "QUERY-NFiws", "Errors.RemoveFailed") + return zerrors.ThrowInternal(err, "QUERY-NFiws", "Errors.RemoveFailed") } return nil } @@ -247,8 +247,8 @@ func prepareLatestState(ctx context.Context, db prepareDatabase) (sq.SelectBuild &position, &lastUpdated, ) - if err != nil && !errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowInternal(err, "QUERY-aAZ1D", "Errors.Internal") + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowInternal(err, "QUERY-aAZ1D", "Errors.Internal") } return &State{ EventCreatedAt: creationDate.Time, @@ -307,7 +307,7 @@ func prepareCurrentStateQuery(ctx context.Context, db prepareDatabase) (sq.Selec } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-jbJ77", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-jbJ77", "Errors.Query.CloseRows") } return &CurrentStates{ diff --git a/internal/query/custom_text.go b/internal/query/custom_text.go index 6641b1b20..3bd3bf079 100644 --- a/internal/query/custom_text.go +++ b/internal/query/custom_text.go @@ -15,11 +15,11 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type CustomTexts struct { @@ -102,7 +102,7 @@ func (q *Queries) CustomTextList(ctx context.Context, aggregateID, template, lan } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-M9gse", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-M9gse", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -110,7 +110,7 @@ func (q *Queries) CustomTextList(ctx context.Context, aggregateID, template, lan return err }, query, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-2j00f", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-2j00f", "Errors.Internal") } texts.State, err = q.latestState(ctx, projectsTable) @@ -132,7 +132,7 @@ func (q *Queries) CustomTextListByTemplate(ctx context.Context, aggregateID, tem } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-M49fs", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-M49fs", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -140,7 +140,7 @@ func (q *Queries) CustomTextListByTemplate(ctx context.Context, aggregateID, tem return err }, query, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-3n9ge", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-3n9ge", "Errors.Internal") } texts.State, err = q.latestState(ctx, projectsTable) @@ -157,7 +157,7 @@ func (q *Queries) GetDefaultLoginTexts(ctx context.Context, lang string) (_ *dom } loginText := new(domain.CustomLoginText) if err := yaml.Unmarshal(contents, loginText); err != nil { - return nil, errors.ThrowInternal(err, "TEXT-M0p4s", "Errors.TranslationFile.ReadError") + return nil, zerrors.ThrowInternal(err, "TEXT-M0p4s", "Errors.TranslationFile.ReadError") } loginText.IsDefault = true loginText.AggregateID = authz.GetInstance(ctx).InstanceID() @@ -185,7 +185,7 @@ func (q *Queries) IAMLoginTexts(ctx context.Context, lang string) (_ *domain.Cus } loginTextMap := make(map[string]interface{}) if err := yaml.Unmarshal(contents, &loginTextMap); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-m0Jf3", "Errors.TranslationFile.ReadError") + return nil, zerrors.ThrowInternal(err, "QUERY-m0Jf3", "Errors.TranslationFile.ReadError") } texts, err := q.CustomTextList(ctx, authz.GetInstance(ctx).InstanceID(), domain.LoginCustomText, lang, false) if err != nil { @@ -201,11 +201,11 @@ func (q *Queries) IAMLoginTexts(ctx context.Context, lang string) (_ *domain.Cus } jsonbody, err := json.Marshal(loginTextMap) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-0nJ3f", "Errors.TranslationFile.MergeError") + return nil, zerrors.ThrowInternal(err, "QUERY-0nJ3f", "Errors.TranslationFile.MergeError") } loginText := new(domain.CustomLoginText) if err := json.Unmarshal(jsonbody, &loginText); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-m93Jf", "Errors.TranslationFile.MergeError") + return nil, zerrors.ThrowInternal(err, "QUERY-m93Jf", "Errors.TranslationFile.MergeError") } loginText.AggregateID = authz.GetInstance(ctx).InstanceID() loginText.IsDefault = true @@ -219,7 +219,7 @@ func (q *Queries) readLoginTranslationFile(ctx context.Context, lang string) ([] var err error if !ok { contents, err = q.readTranslationFile(i18n.LOGIN, fmt.Sprintf("/i18n/%s.yaml", lang)) - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { contents, err = q.readTranslationFile(i18n.LOGIN, fmt.Sprintf("/i18n/%s.yaml", authz.GetInstance(ctx).DefaultLanguage().String())) } if err != nil { @@ -268,7 +268,7 @@ func prepareCustomTextsQuery(ctx context.Context, db prepareDatabase) (sq.Select } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-3n9fs", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-3n9fs", "Errors.Query.CloseRows") } return &CustomTexts{ diff --git a/internal/query/custom_text_test.go b/internal/query/custom_text_test.go index 3df40638c..0453f71a2 100644 --- a/internal/query/custom_text_test.go +++ b/internal/query/custom_text_test.go @@ -10,7 +10,7 @@ import ( "golang.org/x/text/language" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -59,7 +59,7 @@ func Test_CustomTextPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/device_auth.go b/internal/query/device_auth.go index c16fcdf58..8f1c91458 100644 --- a/internal/query/device_auth.go +++ b/internal/query/device_auth.go @@ -3,16 +3,16 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" sq "github.com/Masterminds/squirrel" "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -82,7 +82,7 @@ func (q *Queries) DeviceAuthByDeviceCode(ctx context.Context, clientID, deviceCo } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-uk1Oh", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-uk1Oh", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -103,7 +103,7 @@ func (q *Queries) DeviceAuthByUserCode(ctx context.Context, userCode string) (de } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Axu7l", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-Axu7l", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -136,11 +136,11 @@ func prepareDeviceAuthQuery(ctx context.Context, db prepareDatabase) (sq.SelectB &dst.State, &dst.Subject, ) - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-Sah9a", "Errors.DeviceAuth.NotExisting") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-Sah9a", "Errors.DeviceAuth.NotExisting") } if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Voo3o", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Voo3o", "Errors.Internal") } dst.Scopes = scopes diff --git a/internal/query/domain_policy.go b/internal/query/domain_policy.go index bbe79a9da..922efb386 100644 --- a/internal/query/domain_policy.go +++ b/internal/query/domain_policy.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -13,10 +13,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type DomainPolicy struct { @@ -123,7 +123,7 @@ func (q *Queries) DomainPolicyByOrg(ctx context.Context, shouldTriggerBulk bool, query, args, err := stmt.Where(eq).OrderBy(DomainPolicyColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-D3CqT", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-D3CqT", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -145,7 +145,7 @@ func (q *Queries) DefaultDomainPolicy(ctx context.Context) (policy *DomainPolicy OrderBy(DomainPolicyColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-pM7lP", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-pM7lP", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -185,10 +185,10 @@ func prepareDomainPolicyQuery(ctx context.Context, db prepareDatabase) (sq.Selec &policy.State, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-K0Jr5", "Errors.DomainPolicy.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-K0Jr5", "Errors.DomainPolicy.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-rIy6j", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-rIy6j", "Errors.Internal") } return policy, nil } diff --git a/internal/query/domain_policy_test.go b/internal/query/domain_policy_test.go index ef861c737..70d3ddc39 100644 --- a/internal/query/domain_policy_test.go +++ b/internal/query/domain_policy_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -60,7 +60,7 @@ func Test_DomainPolicyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/event.go b/internal/query/event.go index 074b5c83c..a95697942 100644 --- a/internal/query/event.go +++ b/internal/query/event.go @@ -6,9 +6,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type Event struct { @@ -45,7 +45,7 @@ func (q *Queries) SearchEvents(ctx context.Context, query *eventstore.SearchQuer defer func() { span.EndWithError(err) }() auditLogRetention := q.defaultAuditLogRetention instanceLimits, err := q.Limits(ctx, authz.GetInstance(ctx).InstanceID()) - if err != nil && !errors.IsNotFound(err) { + if err != nil && !zerrors.IsNotFound(err) { return nil, err } if instanceLimits != nil && instanceLimits.AuditLogRetention != nil { diff --git a/internal/query/failed_events.go b/internal/query/failed_events.go index a1c2b31e4..7d2e875ce 100644 --- a/internal/query/failed_events.go +++ b/internal/query/failed_events.go @@ -8,8 +8,8 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/zitadel/zitadel/internal/api/call" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -86,7 +86,7 @@ func (q *Queries) SearchFailedEvents(ctx context.Context, queries *FailedEventSe query, scan := prepareFailedEventsQuery(ctx, q.client) stmt, args, err := queries.toQuery(query).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-n8rjJ", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-n8rjJ", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -94,7 +94,7 @@ func (q *Queries) SearchFailedEvents(ctx context.Context, queries *FailedEventSe return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-3j99J", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-3j99J", "Errors.Internal") } return failedEvents, nil } @@ -109,11 +109,11 @@ func (q *Queries) RemoveFailedEvent(ctx context.Context, projectionName, instanc PlaceholderFormat(sq.Dollar). ToSql() if err != nil { - return errors.ThrowInternal(err, "QUERY-DGgh3", "Errors.RemoveFailed") + return zerrors.ThrowInternal(err, "QUERY-DGgh3", "Errors.RemoveFailed") } _, err = q.client.ExecContext(ctx, stmt, args...) if err != nil { - return errors.ThrowInternal(err, "QUERY-0kbFF", "Errors.RemoveFailed") + return zerrors.ThrowInternal(err, "QUERY-0kbFF", "Errors.RemoveFailed") } return nil } @@ -175,7 +175,7 @@ func prepareFailedEventsQuery(ctx context.Context, db prepareDatabase) (sq.Selec } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-En99f", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-En99f", "Errors.Query.CloseRows") } return &FailedEvents{ diff --git a/internal/query/iam_member.go b/internal/query/iam_member.go index ca30fc05f..9f1c5521c 100644 --- a/internal/query/iam_member.go +++ b/internal/query/iam_member.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -71,7 +71,7 @@ func (q *Queries) IAMMembers(ctx context.Context, queries *IAMMembersQuery) (mem eq := sq.Eq{InstanceMemberInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()} stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-USNwM", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-USNwM", "Errors.Query.InvalidRequest") } currentSequence, err := q.latestState(ctx, instanceMemberTable) @@ -84,7 +84,7 @@ func (q *Queries) IAMMembers(ctx context.Context, queries *IAMMembersQuery) (mem return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Pdg1I", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Pdg1I", "Errors.Internal") } members.State = currentSequence return members, err @@ -172,7 +172,7 @@ func prepareInstanceMembersQuery(ctx context.Context, db prepareDatabase) (sq.Se } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-EqJFc", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-EqJFc", "Errors.Query.CloseRows") } return &Members{ diff --git a/internal/query/idp.go b/internal/query/idp.go index 6dc4d4783..06d96a76a 100644 --- a/internal/query/idp.go +++ b/internal/query/idp.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -15,10 +15,10 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type IDP struct { @@ -219,7 +219,7 @@ func (q *Queries) IDPByIDAndResourceOwner(ctx context.Context, shouldTriggerBulk stmt, scan := prepareIDPByIDQuery(ctx, q.client) query, args, err := stmt.Where(where).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-0gocI", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-0gocI", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -243,7 +243,7 @@ func (q *Queries) IDPs(ctx context.Context, queries *IDPSearchQueries, withOwner } stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-X6X7y", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-X6X7y", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -251,7 +251,7 @@ func (q *Queries) IDPs(ctx context.Context, queries *IDPSearchQueries, withOwner return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-xPlVH", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-xPlVH", "Errors.Internal") } idps.State, err = q.latestState(ctx, idpTable) return idps, err @@ -370,10 +370,10 @@ func prepareIDPByIDQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuil &jwtEndpoint, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-rhR2o", "Errors.IDPConfig.NotExisting") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-rhR2o", "Errors.IDPConfig.NotExisting") } - return nil, errors.ThrowInternal(err, "QUERY-zE3Ro", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-zE3Ro", "Errors.Internal") } if oidcIDPID.Valid { @@ -515,7 +515,7 @@ func prepareIDPsQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-iiBgK", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-iiBgK", "Errors.Query.CloseRows") } return &IDPs{ @@ -539,5 +539,5 @@ func (q *Queries) GetOIDCIDPClientSecret(ctx context.Context, shouldRealTime boo if idp.ClientSecret != nil && idp.ClientSecret.Crypted != nil { return crypto.DecryptString(idp.ClientSecret, q.idpConfigEncryption) } - return "", errors.ThrowNotFound(nil, "QUERY-bsm2o", "Errors.Query.NotFound") + return "", zerrors.ThrowNotFound(nil, "QUERY-bsm2o", "Errors.Query.NotFound") } diff --git a/internal/query/idp_login_policy_link.go b/internal/query/idp_login_policy_link.go index 7bc60bf17..f257e88ad 100644 --- a/internal/query/idp_login_policy_link.go +++ b/internal/query/idp_login_policy_link.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type IDPLoginPolicyLink struct { @@ -103,7 +103,7 @@ func (q *Queries) IDPLoginPolicyLinks(ctx context.Context, resourceOwner string, stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-FDbKW", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-FDbKW", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -111,7 +111,7 @@ func (q *Queries) IDPLoginPolicyLinks(ctx context.Context, resourceOwner string, return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-ZkKUc", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-ZkKUc", "Errors.Internal") } idps.State, err = q.latestState(ctx, idpLoginPolicyLinkTable) return idps, err @@ -168,7 +168,7 @@ func prepareIDPLoginPolicyLinksQuery(ctx context.Context, db prepareDatabase, re } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-vOLFG", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-vOLFG", "Errors.Query.CloseRows") } return &IDPLoginPolicyLinks{ diff --git a/internal/query/idp_template.go b/internal/query/idp_template.go index 39e68b887..1cfdc14d5 100644 --- a/internal/query/idp_template.go +++ b/internal/query/idp_template.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -15,11 +15,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/repository/idp" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type IDPTemplate struct { @@ -723,7 +723,7 @@ func (q *Queries) IDPTemplateByID(ctx context.Context, shouldTriggerBulk bool, i } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SFefg", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-SFefg", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -747,7 +747,7 @@ func (q *Queries) IDPTemplates(ctx context.Context, queries *IDPTemplateSearchQu } stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-SAF34", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-SAF34", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -755,7 +755,7 @@ func (q *Queries) IDPTemplates(ctx context.Context, queries *IDPTemplateSearchQu return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-BDFrq", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-BDFrq", "Errors.Internal") } idps.State, err = q.latestState(ctx, idpTemplateTable) return idps, err @@ -1136,10 +1136,10 @@ func prepareIDPTemplateByIDQuery(ctx context.Context, db prepareDatabase) (sq.Se &appleScopes, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-SAFrt", "Errors.IDPConfig.NotExisting") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-SAFrt", "Errors.IDPConfig.NotExisting") } - return nil, errors.ThrowInternal(err, "QUERY-ADG42", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-ADG42", "Errors.Internal") } idpTemplate.Name = name.String @@ -1771,7 +1771,7 @@ func prepareIDPTemplatesQuery(ctx context.Context, db prepareDatabase) (sq.Selec } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SAGrt", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-SAGrt", "Errors.Query.CloseRows") } return &IDPTemplates{ diff --git a/internal/query/idp_template_test.go b/internal/query/idp_template_test.go index 626e411c8..f95b6da05 100644 --- a/internal/query/idp_template_test.go +++ b/internal/query/idp_template_test.go @@ -11,8 +11,8 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/repository/idp" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -509,7 +509,7 @@ func Test_IDPTemplateTemplatesPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -2132,7 +2132,7 @@ func Test_IDPTemplateTemplatesPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/idp_test.go b/internal/query/idp_test.go index 5b34fac06..9474a0c75 100644 --- a/internal/query/idp_test.go +++ b/internal/query/idp_test.go @@ -11,7 +11,7 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -150,7 +150,7 @@ func Test_IDPPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -353,7 +353,7 @@ func Test_IDPPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/idp_user_link.go b/internal/query/idp_user_link.go index 60d606604..50e780c37 100644 --- a/internal/query/idp_user_link.go +++ b/internal/query/idp_user_link.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type IDPUserLink struct { @@ -100,7 +100,7 @@ func (q *Queries) IDPUserLinks(ctx context.Context, queries *IDPUserLinksSearchQ } stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-4zzFK", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-4zzFK", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -108,7 +108,7 @@ func (q *Queries) IDPUserLinks(ctx context.Context, queries *IDPUserLinksSearchQ return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-C1E4D", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-C1E4D", "Errors.Internal") } idps.State, err = q.latestState(ctx, idpUserLinkTable) return idps, err @@ -176,7 +176,7 @@ func prepareIDPUserLinksQuery(ctx context.Context, db prepareDatabase) (sq.Selec } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-nwx6U", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-nwx6U", "Errors.Query.CloseRows") } return &IDPUserLinks{ diff --git a/internal/query/instance.go b/internal/query/instance.go index ba28bb6a2..7c8acdf31 100644 --- a/internal/query/instance.go +++ b/internal/query/instance.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "strings" "time" @@ -14,10 +14,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -174,7 +174,7 @@ func (q *Queries) SearchInstances(ctx context.Context, queries *InstanceSearchQu filter, query, scan := prepareInstancesQuery(ctx, q.client) stmt, args, err := query(queries.toQuery(filter)).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-M9fow", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-M9fow", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -182,7 +182,7 @@ func (q *Queries) SearchInstances(ctx context.Context, queries *InstanceSearchQu return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-3j98f", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-3j98f", "Errors.Internal") } return instances, err } @@ -203,7 +203,7 @@ func (q *Queries) Instance(ctx context.Context, shouldTriggerBulk bool) (instanc InstanceColumnID.identifier(): authz.GetInstance(ctx).InstanceID(), }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-d9ngs", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-d9ngs", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -223,7 +223,7 @@ func (q *Queries) InstanceByHost(ctx context.Context, host string) (instance aut InstanceDomainDomainCol.identifier(): host, }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SAfg2", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-SAfg2", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -274,10 +274,10 @@ func prepareInstanceQuery(ctx context.Context, db prepareDatabase, host string) &lang, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-5m09s", "Errors.IAM.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-5m09s", "Errors.IAM.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-3j9sf", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-3j9sf", "Errors.Internal") } instance.DefaultLang = language.Make(lang) return instance, nil @@ -377,7 +377,7 @@ func prepareInstancesQuery(ctx context.Context, db prepareDatabase) (sq.SelectBu } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-8nlWW", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-8nlWW", "Errors.Query.CloseRows") } return &Instances{ @@ -445,7 +445,7 @@ func prepareInstanceDomainQuery(ctx context.Context, db prepareDatabase, host st &sequence, ) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-d9nw", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-d9nw", "Errors.Internal") } if !domain.Valid { continue @@ -461,11 +461,11 @@ func prepareInstanceDomainQuery(ctx context.Context, db prepareDatabase, host st }) } if instance.ID == "" { - return nil, errors.ThrowNotFound(nil, "QUERY-n0wng", "Errors.IAM.NotFound") + return nil, zerrors.ThrowNotFound(nil, "QUERY-n0wng", "Errors.IAM.NotFound") } instance.DefaultLang = language.Make(lang) if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dfbe2", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-Dfbe2", "Errors.Query.CloseRows") } return instance, nil } @@ -533,7 +533,7 @@ func prepareAuthzInstanceQuery(ctx context.Context, db prepareDatabase, host str &instance.csp.allowedOrigins, ) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-d3fas", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-d3fas", "Errors.Internal") } if !domain.Valid { continue @@ -550,11 +550,11 @@ func prepareAuthzInstanceQuery(ctx context.Context, db prepareDatabase, host str instance.csp.enabled = securityPolicyEnabled.Bool } if instance.ID == "" { - return nil, errors.ThrowNotFound(nil, "QUERY-1kIjX", "Errors.IAM.NotFound") + return nil, zerrors.ThrowNotFound(nil, "QUERY-1kIjX", "Errors.IAM.NotFound") } instance.DefaultLang = language.Make(lang) if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dfbe2", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-Dfbe2", "Errors.Query.CloseRows") } return instance, nil } diff --git a/internal/query/instance_domain.go b/internal/query/instance_domain.go index ee5230f06..285bd1293 100644 --- a/internal/query/instance_domain.go +++ b/internal/query/instance_domain.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type InstanceDomain struct { @@ -68,7 +68,7 @@ func (q *Queries) SearchInstanceDomains(ctx context.Context, queries *InstanceDo InstanceDomainInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID(), }).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-inlsF", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-inlsF", "Errors.Query.SQLStatement") } return q.queryInstanceDomains(ctx, stmt, scan, args...) @@ -81,7 +81,7 @@ func (q *Queries) SearchInstanceDomainsGlobal(ctx context.Context, queries *Inst query, scan := prepareInstanceDomainsQuery(ctx, q.client) stmt, args, err := queries.toQuery(query).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-IHhLR", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-IHhLR", "Errors.Query.SQLStatement") } return q.queryInstanceDomains(ctx, stmt, scan, args...) @@ -133,7 +133,7 @@ func prepareInstanceDomainsQuery(ctx context.Context, db prepareDatabase) (sq.Se } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-8nlWW", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-8nlWW", "Errors.Query.CloseRows") } return &InstanceDomains{ diff --git a/internal/query/instance_test.go b/internal/query/instance_test.go index decd687e2..03b9937d5 100644 --- a/internal/query/instance_test.go +++ b/internal/query/instance_test.go @@ -13,7 +13,7 @@ import ( sq "github.com/Masterminds/squirrel" "golang.org/x/text/language" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -104,7 +104,7 @@ func Test_InstancePrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/key.go b/internal/query/key.go index 7447b1134..5e1f4fca5 100644 --- a/internal/query/key.go +++ b/internal/query/key.go @@ -12,11 +12,11 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/repository/keypair" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type Key interface { @@ -193,7 +193,7 @@ func (q *Queries) ActivePublicKeys(ctx context.Context, t time.Time) (keys *Publ sq.Gt{KeyPublicColExpiry.identifier(): t}, }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SDFfg", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-SDFfg", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -201,11 +201,11 @@ func (q *Queries) ActivePublicKeys(ctx context.Context, t time.Time) (keys *Publ return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Sghn4", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Sghn4", "Errors.Internal") } keys.State, err = q.latestState(ctx, keyTable) - if !errors.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return keys, err } return keys, nil @@ -228,7 +228,7 @@ func (q *Queries) ActivePrivateSigningKey(ctx context.Context, t time.Time) (key sq.Gt{KeyPrivateColExpiry.identifier(): t}, }).OrderBy(KeyPrivateColExpiry.identifier()).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SDff2", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-SDff2", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -236,10 +236,10 @@ func (q *Queries) ActivePrivateSigningKey(ctx context.Context, t time.Time) (key return err }, query, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-WRFG4", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-WRFG4", "Errors.Internal") } keys.State, err = q.latestState(ctx, keyTable) - if !errors.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return keys, err } return keys, nil @@ -289,7 +289,7 @@ func preparePublicKeysQuery(ctx context.Context, db prepareDatabase) (sq.SelectB } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows") } return &PublicKeys{ @@ -340,7 +340,7 @@ func preparePrivateKeysQuery(ctx context.Context, db prepareDatabase) (sq.Select } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows") } return &PrivateKeys{ @@ -408,18 +408,18 @@ func (q *Queries) GetActivePublicKeyByID(ctx context.Context, keyID string, curr return nil, err } if model.Algorithm == "" || model.Key == nil { - return nil, errors.ThrowNotFound(err, "QUERY-Ahf7x", "Errors.Key.NotFound") + return nil, zerrors.ThrowNotFound(err, "QUERY-Ahf7x", "Errors.Key.NotFound") } if model.Expiry.Before(current) { - return nil, errors.ThrowInvalidArgument(err, "QUERY-ciF4k", "Errors.Key.ExpireBeforeNow") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-ciF4k", "Errors.Key.ExpireBeforeNow") } keyValue, err := crypto.Decrypt(model.Key, q.keyEncryptionAlgorithm) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Ie4oh", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Ie4oh", "Errors.Internal") } publicKey, err := crypto.BytesToPublicKey(keyValue) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Kai2Z", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Kai2Z", "Errors.Internal") } return &rsaPublicKey{ diff --git a/internal/query/key_test.go b/internal/query/key_test.go index 553b63524..af3702c0e 100644 --- a/internal/query/key_test.go +++ b/internal/query/key_test.go @@ -20,9 +20,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" key_repo "github.com/zitadel/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -88,7 +88,7 @@ func Test_KeyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -169,7 +169,7 @@ func Test_KeyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -292,7 +292,7 @@ func TestQueries_GetActivePublicKeyByID(t *testing.T) { eventstore: expectEventstore( expectFilter(), ), - wantErr: errs.ThrowNotFound(nil, "QUERY-Ahf7x", "Errors.Key.NotFound"), + wantErr: zerrors.ThrowNotFound(nil, "QUERY-Ahf7x", "Errors.Key.NotFound"), }, { name: "expired error", @@ -324,7 +324,7 @@ func TestQueries_GetActivePublicKeyByID(t *testing.T) { )), ), ), - wantErr: errs.ThrowInvalidArgument(nil, "QUERY-ciF4k", "Errors.Key.ExpireBeforeNow"), + wantErr: zerrors.ThrowInvalidArgument(nil, "QUERY-ciF4k", "Errors.Key.ExpireBeforeNow"), }, { name: "decrypt error", @@ -363,7 +363,7 @@ func TestQueries_GetActivePublicKeyByID(t *testing.T) { expect.DecryptionKeyIDs().Return([]string{}) return encryption }, - wantErr: errs.ThrowInternal(nil, "QUERY-Ie4oh", "Errors.Internal"), + wantErr: zerrors.ThrowInternal(nil, "QUERY-Ie4oh", "Errors.Internal"), }, { name: "parse error", @@ -403,7 +403,7 @@ func TestQueries_GetActivePublicKeyByID(t *testing.T) { expect.Decrypt([]byte("public"), "keyID").Return([]byte("foo"), nil) return encryption }, - wantErr: errs.ThrowInternal(nil, "QUERY-Kai2Z", "Errors.Internal"), + wantErr: zerrors.ThrowInternal(nil, "QUERY-Kai2Z", "Errors.Internal"), }, { name: "success", diff --git a/internal/query/label_policy.go b/internal/query/label_policy.go index fe21987ad..6dc7b0092 100644 --- a/internal/query/label_policy.go +++ b/internal/query/label_policy.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -11,9 +11,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type LabelPolicy struct { @@ -66,7 +66,7 @@ func (q *Queries) ActiveLabelPolicyByOrg(ctx context.Context, orgID string, with OrderBy(LabelPolicyColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-V22un", "unable to create sql stmt") + return nil, zerrors.ThrowInternal(err, "QUERY-V22un", "unable to create sql stmt") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -99,7 +99,7 @@ func (q *Queries) PreviewLabelPolicyByOrg(ctx context.Context, orgID string) (po OrderBy(LabelPolicyColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-AG5eq", "unable to create sql stmt") + return nil, zerrors.ThrowInternal(err, "QUERY-AG5eq", "unable to create sql stmt") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -122,7 +122,7 @@ func (q *Queries) DefaultActiveLabelPolicy(ctx context.Context) (policy *LabelPo OrderBy(LabelPolicyColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-mN0Ci", "unable to create sql stmt") + return nil, zerrors.ThrowInternal(err, "QUERY-mN0Ci", "unable to create sql stmt") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -145,7 +145,7 @@ func (q *Queries) DefaultPreviewLabelPolicy(ctx context.Context) (policy *LabelP OrderBy(LabelPolicyColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-B3JQR", "unable to create sql stmt") + return nil, zerrors.ThrowInternal(err, "QUERY-B3JQR", "unable to create sql stmt") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -321,10 +321,10 @@ func prepareLabelPolicyQuery(ctx context.Context, db prepareDatabase) (sq.Select &darkIconURL, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-bJEsm", "Errors.Org.PolicyNotExisting") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-bJEsm", "Errors.Org.PolicyNotExisting") } - return nil, errors.ThrowInternal(err, "QUERY-awLM6", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-awLM6", "Errors.Internal") } policy.FontURL = fontURL.String diff --git a/internal/query/limits.go b/internal/query/limits.go index cf9635026..bd03f4ad9 100644 --- a/internal/query/limits.go +++ b/internal/query/limits.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -11,9 +11,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -71,7 +71,7 @@ func (q *Queries) Limits(ctx context.Context, resourceOwner string) (limits *Lim LimitsColumnResourceOwner.identifier(): resourceOwner, }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-jJe80", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-jJe80", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -106,10 +106,10 @@ func prepareLimitsQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuild &auditLogRetention, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-GU1em", "Errors.Limits.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-GU1em", "Errors.Limits.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-00jgy", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-00jgy", "Errors.Internal") } if auditLogRetention.Valid { limits.AuditLogRetention = &auditLogRetention.Duration diff --git a/internal/query/limits_test.go b/internal/query/limits_test.go index 84e6e70e5..efd127235 100644 --- a/internal/query/limits_test.go +++ b/internal/query/limits_test.go @@ -11,7 +11,7 @@ import ( "github.com/muhlemmer/gu" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -56,7 +56,7 @@ func Test_LimitsPrepare(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/lockout_policy.go b/internal/query/lockout_policy.go index d568427b2..e84750cc6 100644 --- a/internal/query/lockout_policy.go +++ b/internal/query/lockout_policy.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -13,10 +13,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type LockoutPolicy struct { @@ -113,7 +113,7 @@ func (q *Queries) LockoutPolicyByOrg(ctx context.Context, shouldTriggerBulk bool OrderBy(LockoutColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SKR6X", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-SKR6X", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -135,7 +135,7 @@ func (q *Queries) DefaultLockoutPolicy(ctx context.Context) (policy *LockoutPoli OrderBy(LockoutColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-mN0Ci", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-mN0Ci", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -173,10 +173,10 @@ func prepareLockoutPolicyQuery(ctx context.Context, db prepareDatabase) (sq.Sele &policy.State, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-63mtI", "Errors.PasswordComplexityPolicy.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-63mtI", "Errors.PasswordComplexityPolicy.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-uulCZ", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-uulCZ", "Errors.Internal") } return policy, nil } diff --git a/internal/query/lockout_policy_test.go b/internal/query/lockout_policy_test.go index 0fefcf386..044f6c291 100644 --- a/internal/query/lockout_policy_test.go +++ b/internal/query/lockout_policy_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -59,7 +59,7 @@ func Test_LockoutPolicyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/login_policy.go b/internal/query/login_policy.go index fc4b12bf4..7bd659797 100644 --- a/internal/query/login_policy.go +++ b/internal/query/login_policy.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -14,10 +14,10 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type LoginPolicy struct { @@ -194,7 +194,7 @@ func (q *Queries) LoginPolicyByID(ctx context.Context, shouldTriggerBulk bool, o }, }).Limit(1).OrderBy(LoginPolicyColumnIsDefault.identifier()).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-scVHo", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-scVHo", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -202,7 +202,7 @@ func (q *Queries) LoginPolicyByID(ctx context.Context, shouldTriggerBulk bool, o return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SWgr3", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-SWgr3", "Errors.Internal") } return policy, nil } @@ -233,7 +233,7 @@ func (q *Queries) DefaultLoginPolicy(ctx context.Context) (policy *LoginPolicy, LoginPolicyColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).OrderBy(LoginPolicyColumnIsDefault.identifier()).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-t4TBK", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-t4TBK", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -241,7 +241,7 @@ func (q *Queries) DefaultLoginPolicy(ctx context.Context) (policy *LoginPolicy, return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SArt2", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-SArt2", "Errors.Internal") } return policy, nil } @@ -268,7 +268,7 @@ func (q *Queries) SecondFactorsByOrg(ctx context.Context, orgID string) (factors OrderBy(LoginPolicyColumnIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-scVHo", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-scVHo", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -292,7 +292,7 @@ func (q *Queries) DefaultSecondFactors(ctx context.Context) (factors *SecondFact LoginPolicyColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).OrderBy(LoginPolicyColumnIsDefault.identifier()).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-CZ2Nv", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-CZ2Nv", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -328,7 +328,7 @@ func (q *Queries) MultiFactorsByOrg(ctx context.Context, orgID string) (factors OrderBy(LoginPolicyColumnIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-B4o7h", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-B4o7h", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -352,7 +352,7 @@ func (q *Queries) DefaultMultiFactors(ctx context.Context) (factors *MultiFactor LoginPolicyColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).OrderBy(LoginPolicyColumnIsDefault.identifier()).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-WxYjr", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-WxYjr", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -425,11 +425,11 @@ func prepareLoginPolicyQuery(ctx context.Context, db prepareDatabase) (sq.Select &p.MultiFactorCheckLifetime, ) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-YcC53", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-YcC53", "Errors.Internal") } } if p.OrgID == "" { - return nil, errors.ThrowNotFound(nil, "QUERY-QsUBJ", "Errors.LoginPolicy.NotFound") + return nil, zerrors.ThrowNotFound(nil, "QUERY-QsUBJ", "Errors.LoginPolicy.NotFound") } p.DefaultRedirectURI = defaultRedirectURI.String return p, nil @@ -447,10 +447,10 @@ func prepareLoginPolicy2FAsQuery(ctx context.Context, db prepareDatabase) (sq.Se &p.Factors, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-yPqIZ", "Errors.LoginPolicy.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-yPqIZ", "Errors.LoginPolicy.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Mr6H3", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Mr6H3", "Errors.Internal") } p.Count = uint64(len(p.Factors)) @@ -469,10 +469,10 @@ func prepareLoginPolicyMFAsQuery(ctx context.Context, db prepareDatabase) (sq.Se &p.Factors, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-yPqIZ", "Errors.LoginPolicy.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-yPqIZ", "Errors.LoginPolicy.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Mr6H3", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Mr6H3", "Errors.Internal") } p.Count = uint64(len(p.Factors)) diff --git a/internal/query/login_policy_test.go b/internal/query/login_policy_test.go index f346bd9e3..7714fa302 100644 --- a/internal/query/login_policy_test.go +++ b/internal/query/login_policy_test.go @@ -11,7 +11,7 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -104,7 +104,7 @@ func Test_LoginPolicyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -201,7 +201,7 @@ func Test_LoginPolicyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -269,7 +269,7 @@ func Test_LoginPolicyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/mail_template.go b/internal/query/mail_template.go index f0872cf29..9d5ff8316 100644 --- a/internal/query/mail_template.go +++ b/internal/query/mail_template.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -11,9 +11,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type MailTemplate struct { @@ -90,7 +90,7 @@ func (q *Queries) MailTemplateByOrg(ctx context.Context, orgID string, withOwner OrderBy(MailTemplateColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-m0sJg", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-m0sJg", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -112,7 +112,7 @@ func (q *Queries) DefaultMailTemplate(ctx context.Context) (template *MailTempla OrderBy(MailTemplateColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-2m0fH", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-2m0fH", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -146,10 +146,10 @@ func prepareMailTemplateQuery(ctx context.Context, db prepareDatabase) (sq.Selec &policy.State, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-2NO0g", "Errors.MailTemplate.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-2NO0g", "Errors.MailTemplate.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-4Nisf", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-4Nisf", "Errors.Internal") } return policy, nil } diff --git a/internal/query/message_text.go b/internal/query/message_text.go index ab7674c7a..dd2d9cd50 100644 --- a/internal/query/message_text.go +++ b/internal/query/message_text.go @@ -4,7 +4,7 @@ import ( "context" "database/sql" "encoding/json" - errs "errors" + "errors" "fmt" "io/ioutil" "os" @@ -17,10 +17,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type MessageTexts struct { @@ -137,7 +137,7 @@ func (q *Queries) DefaultMessageText(ctx context.Context) (text *MessageText, er }). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-1b9mf", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-1b9mf", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -157,7 +157,7 @@ func (q *Queries) DefaultMessageTextByTypeAndLanguageFromFileSystem(ctx context. } messageTexts := new(MessageTexts) if err := yaml.Unmarshal(contents, messageTexts); err != nil { - return nil, errors.ThrowInternal(err, "TEXT-3N9fs", "Errors.TranslationFile.ReadError") + return nil, zerrors.ThrowInternal(err, "TEXT-3N9fs", "Errors.TranslationFile.ReadError") } return messageTexts.GetMessageTextByType(messageType), nil } @@ -179,14 +179,14 @@ func (q *Queries) CustomMessageTextByTypeAndLanguage(ctx context.Context, aggreg query, args, err := stmt.Where(eq).OrderBy(MessageTextColAggregateID.identifier()).Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-1b9mf", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-1b9mf", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { msg, err = scan(row) return err }, query, args...) - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { return q.IAMMessageTextByTypeAndLanguage(ctx, messageType, language) } return msg, err @@ -202,7 +202,7 @@ func (q *Queries) IAMMessageTextByTypeAndLanguage(ctx context.Context, messageTy } notificationTextMap := make(map[string]interface{}) if err := yaml.Unmarshal(contents, ¬ificationTextMap); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-ekjFF", "Errors.TranslationFile.ReadError") + return nil, zerrors.ThrowInternal(err, "QUERY-ekjFF", "Errors.TranslationFile.ReadError") } texts, err := q.CustomTextList(ctx, authz.GetInstance(ctx).InstanceID(), messageType, language, false) if err != nil { @@ -218,11 +218,11 @@ func (q *Queries) IAMMessageTextByTypeAndLanguage(ctx context.Context, messageTy jsonbody, err := json.Marshal(notificationTextMap) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-3m8fJ", "Errors.TranslationFile.MergeError") + return nil, zerrors.ThrowInternal(err, "QUERY-3m8fJ", "Errors.TranslationFile.MergeError") } notificationText := new(MessageTexts) if err := json.Unmarshal(jsonbody, ¬ificationText); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-9MkfD", "Errors.TranslationFile.MergeError") + return nil, zerrors.ThrowInternal(err, "QUERY-9MkfD", "Errors.TranslationFile.MergeError") } result := notificationText.GetMessageTextByType(messageType) result.IsDefault = true @@ -237,7 +237,7 @@ func (q *Queries) readNotificationTextMessages(ctx context.Context, language str contents, ok := q.NotificationTranslationFileContents[language] if !ok { contents, err = q.readTranslationFile(i18n.NOTIFICATION, fmt.Sprintf("/i18n/%s.yaml", language)) - if errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { contents, err = q.readTranslationFile(i18n.NOTIFICATION, fmt.Sprintf("/i18n/%s.yaml", authz.GetInstance(ctx).DefaultLanguage().String())) } if err != nil { @@ -294,10 +294,10 @@ func prepareMessageTextQuery(ctx context.Context, db prepareDatabase) (sq.Select &footer, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-3nlrS", "Errors.MessageText.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-3nlrS", "Errors.MessageText.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-499gJ", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-499gJ", "Errors.Internal") } msg.Language = language.Make(lang) msg.Title = title.String @@ -314,14 +314,14 @@ func prepareMessageTextQuery(ctx context.Context, db prepareDatabase) (sq.Select func (q *Queries) readTranslationFile(namespace i18n.Namespace, filename string) ([]byte, error) { r, err := i18n.LoadFilesystem(namespace).Open(filename) if os.IsNotExist(err) { - return nil, errors.ThrowNotFound(err, "QUERY-sN9wg", "Errors.TranslationFile.NotFound") + return nil, zerrors.ThrowNotFound(err, "QUERY-sN9wg", "Errors.TranslationFile.NotFound") } if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-93njw", "Errors.TranslationFile.ReadError") + return nil, zerrors.ThrowInternal(err, "QUERY-93njw", "Errors.TranslationFile.ReadError") } contents, err := ioutil.ReadAll(r) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-l0fse", "Errors.TranslationFile.ReadError") + return nil, zerrors.ThrowInternal(err, "QUERY-l0fse", "Errors.TranslationFile.ReadError") } return contents, nil } diff --git a/internal/query/message_text_test.go b/internal/query/message_text_test.go index 713066512..09df5dcd8 100644 --- a/internal/query/message_text_test.go +++ b/internal/query/message_text_test.go @@ -11,7 +11,7 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -70,7 +70,7 @@ func Test_MessageTextPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/milestone.go b/internal/query/milestone.go index 7a91223c9..0b9c34fc7 100644 --- a/internal/query/milestone.go +++ b/internal/query/milestone.go @@ -9,10 +9,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/repository/milestone" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type Milestones struct { @@ -78,7 +78,7 @@ func (q *Queries) SearchMilestones(ctx context.Context, instanceIDs []string, qu } stmt, args, err := queries.toQuery(query).Where(sq.Eq{MilestoneInstanceIDColID.identifier(): instanceIDs}).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-A9i5k", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-A9i5k", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { milestones, err = scan(rows) diff --git a/internal/query/notification_policy.go b/internal/query/notification_policy.go index ba0b2c549..f3878e798 100644 --- a/internal/query/notification_policy.go +++ b/internal/query/notification_policy.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -11,10 +11,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type NotificationPolicy struct { @@ -104,7 +104,7 @@ func (q *Queries) NotificationPolicyByOrg(ctx context.Context, shouldTriggerBulk }). OrderBy(NotificationPolicyColIsDefault.identifier()).Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Xuoapqm", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-Xuoapqm", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -135,7 +135,7 @@ func (q *Queries) DefaultNotificationPolicy(ctx context.Context, shouldTriggerBu OrderBy(NotificationPolicyColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-xlqp209", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-xlqp209", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -171,10 +171,10 @@ func prepareNotificationPolicyQuery(ctx context.Context, db prepareDatabase) (sq &policy.State, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-x0so2p", "Errors.NotificationPolicy.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-x0so2p", "Errors.NotificationPolicy.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Zixoooq", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Zixoooq", "Errors.Internal") } return policy, nil } diff --git a/internal/query/notification_policy_test.go b/internal/query/notification_policy_test.go index 3c5de860f..d755bdc54 100644 --- a/internal/query/notification_policy_test.go +++ b/internal/query/notification_policy_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -56,7 +56,7 @@ func Test_NotificationPolicyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/notification_provider.go b/internal/query/notification_provider.go index 7ba7320e2..b2038c603 100644 --- a/internal/query/notification_provider.go +++ b/internal/query/notification_provider.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -11,9 +11,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type DebugNotificationProvider struct { @@ -87,7 +87,7 @@ func (q *Queries) NotificationProviderByIDAndType(ctx context.Context, aggID str }). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-f9jSf", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-f9jSf", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -122,10 +122,10 @@ func prepareDebugNotificationProviderQuery(ctx context.Context, db prepareDataba &p.Compact, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-s9ujf", "Errors.NotificationProvider.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-s9ujf", "Errors.NotificationProvider.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-2liu0", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-2liu0", "Errors.Internal") } return p, nil } diff --git a/internal/query/notification_provider_test.go b/internal/query/notification_provider_test.go index b0bfbe511..2fce31e11 100644 --- a/internal/query/notification_provider_test.go +++ b/internal/query/notification_provider_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -56,7 +56,7 @@ func Test_NotificationProviderPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/oidc_client.go b/internal/query/oidc_client.go index ac685fab5..7157f9e6e 100644 --- a/internal/query/oidc_client.go +++ b/internal/query/oidc_client.go @@ -11,8 +11,8 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - zerrors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type OIDCClient struct { diff --git a/internal/query/oidc_client_test.go b/internal/query/oidc_client_test.go index d32e9208b..44f642cce 100644 --- a/internal/query/oidc_client_test.go +++ b/internal/query/oidc_client_test.go @@ -14,7 +14,7 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - zerrors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( diff --git a/internal/query/oidc_settings.go b/internal/query/oidc_settings.go index a5d9052d4..32cbc3242 100644 --- a/internal/query/oidc_settings.go +++ b/internal/query/oidc_settings.go @@ -3,16 +3,16 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -85,7 +85,7 @@ func (q *Queries) OIDCSettingsByAggID(ctx context.Context, aggregateID string) ( OIDCSettingsColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-s9nle", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-s9nle", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -122,10 +122,10 @@ func prepareOIDCSettingsQuery(ctx context.Context, db prepareDatabase) (sq.Selec &oidcSettings.RefreshTokenExpiration, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-s9nlw", "Errors.OIDCSettings.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-s9nlw", "Errors.OIDCSettings.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-9bf8s", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-9bf8s", "Errors.Internal") } return oidcSettings, nil } diff --git a/internal/query/oidc_settings_test.go b/internal/query/oidc_settings_test.go index d5aa65316..bdb5cb96e 100644 --- a/internal/query/oidc_settings_test.go +++ b/internal/query/oidc_settings_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -58,7 +58,7 @@ func Test_OIDCConfigsPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/org.go b/internal/query/org.go index fcc53e6a0..65be2ff1a 100644 --- a/internal/query/org.go +++ b/internal/query/org.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -13,10 +13,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" domain_pkg "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -109,7 +109,7 @@ func (q *Queries) OrgByID(ctx context.Context, shouldTriggerBulk bool, id string OrgColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-AWx52", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-AWx52", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -130,7 +130,7 @@ func (q *Queries) OrgByPrimaryDomain(ctx context.Context, domain string) (org *O OrgColumnState.identifier(): domain_pkg.OrgStateActive, }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-TYUCE", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-TYUCE", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -151,7 +151,7 @@ func (q *Queries) OrgByVerifiedDomain(ctx context.Context, domain string) (org * OrgColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-TYUCE", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-TYUCE", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -166,7 +166,7 @@ func (q *Queries) IsOrgUnique(ctx context.Context, name, domain string) (isUniqu defer func() { span.EndWithError(err) }() if name == "" && domain == "" { - return false, errors.ThrowInvalidArgument(nil, "QUERY-DGqfd", "Errors.Query.InvalidRequest") + return false, zerrors.ThrowInvalidArgument(nil, "QUERY-DGqfd", "Errors.Query.InvalidRequest") } query, scan := prepareOrgUniqueQuery(ctx, q.client) stmt, args, err := query.Where( @@ -188,7 +188,7 @@ func (q *Queries) IsOrgUnique(ctx context.Context, name, domain string) (isUniqu }, }).ToSql() if err != nil { - return false, errors.ThrowInternal(err, "QUERY-Dgbe2", "Errors.Query.SQLStatement") + return false, zerrors.ThrowInternal(err, "QUERY-Dgbe2", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -226,7 +226,7 @@ func (q *Queries) SearchOrgs(ctx context.Context, queries *OrgSearchQueries) (or }, }).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-wQ3by", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-wQ3by", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -234,7 +234,7 @@ func (q *Queries) SearchOrgs(ctx context.Context, queries *OrgSearchQueries) (or return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-M6mYN", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-M6mYN", "Errors.Internal") } orgs.State, err = q.latestState(ctx, orgsTable) @@ -297,7 +297,7 @@ func prepareOrgsQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-QMXJv", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-QMXJv", "Errors.Query.CloseRows") } return &Orgs{ @@ -335,10 +335,10 @@ func prepareOrgQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, &o.Domain, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-iTTGJ", "Errors.Org.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-iTTGJ", "Errors.Org.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-pWS5H", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-pWS5H", "Errors.Internal") } return o, nil } @@ -371,10 +371,10 @@ func prepareOrgWithDomainsQuery(ctx context.Context, db prepareDatabase) (sq.Sel &o.Domain, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-iTTGJ", "Errors.Org.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-iTTGJ", "Errors.Org.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-pWS5H", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-pWS5H", "Errors.Internal") } return o, nil } @@ -388,7 +388,7 @@ func prepareOrgUniqueQuery(ctx context.Context, db prepareDatabase) (sq.SelectBu func(row *sql.Row) (isUnique bool, err error) { err = row.Scan(&isUnique) if err != nil { - return false, errors.ThrowInternal(err, "QUERY-e6EiG", "Errors.Internal") + return false, zerrors.ThrowInternal(err, "QUERY-e6EiG", "Errors.Internal") } return isUnique, err } diff --git a/internal/query/org_domain.go b/internal/query/org_domain.go index d03f0291d..595ba897d 100644 --- a/internal/query/org_domain.go +++ b/internal/query/org_domain.go @@ -10,9 +10,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type Domain struct { @@ -67,7 +67,7 @@ func (q *Queries) SearchOrgDomains(ctx context.Context, queries *OrgDomainSearch } stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-ZRfj1", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-ZRfj1", "Errors.Query.SQLStatement") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -75,7 +75,7 @@ func (q *Queries) SearchOrgDomains(ctx context.Context, queries *OrgDomainSearch return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-M6mYN", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-M6mYN", "Errors.Internal") } domains.State, err = q.latestState(ctx, orgDomainsTable) @@ -118,7 +118,7 @@ func prepareDomainsQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuil } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows") } return &Domains{ diff --git a/internal/query/org_member.go b/internal/query/org_member.go index 4b5aed92d..ea452fe35 100644 --- a/internal/query/org_member.go +++ b/internal/query/org_member.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -73,7 +73,7 @@ func (q *Queries) OrgMembers(ctx context.Context, queries *OrgMembersQuery) (mem eq := sq.Eq{OrgMemberInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()} stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-PDAVB", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-PDAVB", "Errors.Query.InvalidRequest") } currentSequence, err := q.latestState(ctx, orgsTable) @@ -86,7 +86,7 @@ func (q *Queries) OrgMembers(ctx context.Context, queries *OrgMembersQuery) (mem return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-5g4yV", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-5g4yV", "Errors.Internal") } members.State = currentSequence @@ -175,7 +175,7 @@ func prepareOrgMembersQuery(ctx context.Context, db prepareDatabase) (sq.SelectB } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-N34NV", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-N34NV", "Errors.Query.CloseRows") } return &Members{ diff --git a/internal/query/org_metadata.go b/internal/query/org_metadata.go index d0c0e04c1..15007e0e5 100644 --- a/internal/query/org_metadata.go +++ b/internal/query/org_metadata.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -12,10 +12,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type OrgMetadataList struct { @@ -105,7 +105,7 @@ func (q *Queries) GetOrgMetadataByKey(ctx context.Context, shouldTriggerBulk boo } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-aDaG2", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-aDaG2", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -135,7 +135,7 @@ func (q *Queries) SearchOrgMetadata(ctx context.Context, shouldTriggerBulk bool, query, scan := prepareOrgMetadataListQuery(ctx, q.client) stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Egbld", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-Egbld", "Errors.Query.SQLStatment") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -143,7 +143,7 @@ func (q *Queries) SearchOrgMetadata(ctx context.Context, shouldTriggerBulk bool, return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Ho2wf", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Ho2wf", "Errors.Internal") } metadata.State, err = q.latestState(ctx, orgMetadataTable) @@ -198,10 +198,10 @@ func prepareOrgMetadataQuery(ctx context.Context, db prepareDatabase) (sq.Select ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-Rph32", "Errors.Metadata.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-Rph32", "Errors.Metadata.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Hajt2", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Hajt2", "Errors.Internal") } return m, nil } @@ -240,7 +240,7 @@ func prepareOrgMetadataListQuery(ctx context.Context, db prepareDatabase) (sq.Se } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-dd3gh", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-dd3gh", "Errors.Query.CloseRows") } return &OrgMetadataList{ diff --git a/internal/query/org_metadata_test.go b/internal/query/org_metadata_test.go index 600a2cca4..0225ef1c2 100644 --- a/internal/query/org_metadata_test.go +++ b/internal/query/org_metadata_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -69,7 +69,7 @@ func Test_OrgMetadataPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -130,7 +130,7 @@ func Test_OrgMetadataPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/org_test.go b/internal/query/org_test.go index 55e954629..fe9ba09f5 100644 --- a/internal/query/org_test.go +++ b/internal/query/org_test.go @@ -4,7 +4,7 @@ import ( "context" "database/sql" "database/sql/driver" - errs "errors" + "errors" "fmt" "regexp" "testing" @@ -13,7 +13,7 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -203,7 +203,7 @@ func Test_OrgPrepares(t *testing.T) { sql.ErrConnDone, ), err: func(err error) (error, bool) { - if !errs.Is(err, sql.ErrConnDone) { + if !errors.Is(err, sql.ErrConnDone) { return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false } return nil, true @@ -221,7 +221,7 @@ func Test_OrgPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errors.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -268,7 +268,7 @@ func Test_OrgPrepares(t *testing.T) { sql.ErrConnDone, ), err: func(err error) (error, bool) { - if !errs.Is(err, sql.ErrConnDone) { + if !errors.Is(err, sql.ErrConnDone) { return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false } return nil, true @@ -286,7 +286,7 @@ func Test_OrgPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errors.IsInternal(err) { + if !zerrors.IsInternal(err) { return fmt.Errorf("err should be zitadel.Internal got: %w", err), false } return nil, true @@ -317,7 +317,7 @@ func Test_OrgPrepares(t *testing.T) { sql.ErrConnDone, ), err: func(err error) (error, bool) { - if !errs.Is(err, sql.ErrConnDone) { + if !errors.Is(err, sql.ErrConnDone) { return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false } return nil, true @@ -400,7 +400,7 @@ func TestQueries_IsOrgUnique(t *testing.T) { }, want: want{ isUnique: false, - err: errors.IsErrorInvalidArgument, + err: zerrors.IsErrorInvalidArgument, }, }, } diff --git a/internal/query/password_age_policy.go b/internal/query/password_age_policy.go index dd22ed715..a74980686 100644 --- a/internal/query/password_age_policy.go +++ b/internal/query/password_age_policy.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -13,10 +13,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type PasswordAgePolicy struct { @@ -110,7 +110,7 @@ func (q *Queries) PasswordAgePolicyByOrg(ctx context.Context, shouldTriggerBulk OrderBy(PasswordAgeColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SKR6X", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-SKR6X", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -138,7 +138,7 @@ func (q *Queries) DefaultPasswordAgePolicy(ctx context.Context, shouldTriggerBul OrderBy(PasswordAgeColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-mN0Ci", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-mN0Ci", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -176,10 +176,10 @@ func preparePasswordAgePolicyQuery(ctx context.Context, db prepareDatabase) (sq. &policy.State, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-63mtI", "Errors.Org.PasswordComplexity.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-63mtI", "Errors.Org.PasswordComplexity.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-uulCZ", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-uulCZ", "Errors.Internal") } return policy, nil } diff --git a/internal/query/password_age_policy_test.go b/internal/query/password_age_policy_test.go index 738a8bb82..b140f82a0 100644 --- a/internal/query/password_age_policy_test.go +++ b/internal/query/password_age_policy_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -58,7 +58,7 @@ func Test_PasswordAgePolicyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/password_complexity_policy.go b/internal/query/password_complexity_policy.go index c72361f72..d9aba36c5 100644 --- a/internal/query/password_complexity_policy.go +++ b/internal/query/password_complexity_policy.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -13,10 +13,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type PasswordComplexityPolicy struct { @@ -62,7 +62,7 @@ func (q *Queries) PasswordComplexityPolicyByOrg(ctx context.Context, shouldTrigg OrderBy(PasswordComplexityColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-lDnrk", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-lDnrk", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -91,7 +91,7 @@ func (q *Queries) DefaultPasswordComplexityPolicy(ctx context.Context, shouldTri OrderBy(PasswordComplexityColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-h4Uyr", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-h4Uyr", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -198,10 +198,10 @@ func preparePasswordComplexityPolicyQuery(ctx context.Context, db prepareDatabas &policy.State, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-63mtI", "Errors.PasswordComplexity.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-63mtI", "Errors.PasswordComplexity.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-uulCZ", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-uulCZ", "Errors.Internal") } return policy, nil } diff --git a/internal/query/password_complexity_policy_test.go b/internal/query/password_complexity_policy_test.go index 3f3743831..ac471f399 100644 --- a/internal/query/password_complexity_policy_test.go +++ b/internal/query/password_complexity_policy_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -64,7 +64,7 @@ func Test_PasswordComplexityPolicyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/privacy_policy.go b/internal/query/privacy_policy.go index 1a08cfb02..2705f2b75 100644 --- a/internal/query/privacy_policy.go +++ b/internal/query/privacy_policy.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -13,10 +13,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type PrivacyPolicy struct { @@ -119,7 +119,7 @@ func (q *Queries) PrivacyPolicyByOrg(ctx context.Context, shouldTriggerBulk bool }). OrderBy(PrivacyColIsDefault.identifier()).Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-UXuPI", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-UXuPI", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -148,7 +148,7 @@ func (q *Queries) DefaultPrivacyPolicy(ctx context.Context, shouldTriggerBulk bo OrderBy(PrivacyColIsDefault.identifier()). Limit(1).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-LkFZ7", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-LkFZ7", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -190,10 +190,10 @@ func preparePrivacyPolicyQuery(ctx context.Context, db prepareDatabase) (sq.Sele &policy.State, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-vNMHL", "Errors.PrivacyPolicy.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-vNMHL", "Errors.PrivacyPolicy.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-csrdo", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-csrdo", "Errors.Internal") } return policy, nil } diff --git a/internal/query/privacy_policy_test.go b/internal/query/privacy_policy_test.go index 70b32723d..55671eef6 100644 --- a/internal/query/privacy_policy_test.go +++ b/internal/query/privacy_policy_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -62,7 +62,7 @@ func Test_PrivacyPolicyPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/project.go b/internal/query/project.go index 3876154b5..756039e9c 100644 --- a/internal/query/project.go +++ b/internal/query/project.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -13,10 +13,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -117,7 +117,7 @@ func (q *Queries) ProjectByID(ctx context.Context, shouldTriggerBulk bool, id st } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-2m00Q", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-2m00Q", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -135,7 +135,7 @@ func (q *Queries) SearchProjects(ctx context.Context, queries *ProjectSearchQuer eq := sq.Eq{ProjectColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()} stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-fn9ew", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-fn9ew", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -143,7 +143,7 @@ func (q *Queries) SearchProjects(ctx context.Context, queries *ProjectSearchQuer return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-2j00f", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-2j00f", "Errors.Internal") } projects.State, err = q.latestState(ctx, projectsTable) return projects, err @@ -225,10 +225,10 @@ func prepareProjectQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuil &p.PrivateLabelingSetting, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-fk2fs", "Errors.Project.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-fk2fs", "Errors.Project.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-dj2FF", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-dj2FF", "Errors.Internal") } return p, nil } @@ -276,7 +276,7 @@ func prepareProjectsQuery(ctx context.Context, db prepareDatabase) (sq.SelectBui } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-QMXJv", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-QMXJv", "Errors.Query.CloseRows") } return &Projects{ diff --git a/internal/query/project_grant.go b/internal/query/project_grant.go index 78fbc7cd6..ac2d8696e 100644 --- a/internal/query/project_grant.go +++ b/internal/query/project_grant.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -14,10 +14,10 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -124,7 +124,7 @@ func (q *Queries) ProjectGrantByID(ctx context.Context, shouldTriggerBulk bool, } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Nf93d", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-Nf93d", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -146,7 +146,7 @@ func (q *Queries) ProjectGrantByIDAndGrantedOrg(ctx context.Context, id, granted } query, args, err := stmt.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-MO9fs", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-MO9fs", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -166,7 +166,7 @@ func (q *Queries) SearchProjectGrants(ctx context.Context, queries *ProjectGrant } stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-N9fsg", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-N9fsg", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -174,7 +174,7 @@ func (q *Queries) SearchProjectGrants(ctx context.Context, queries *ProjectGrant return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-PP02n", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-PP02n", "Errors.Internal") } grants.State, err = q.latestState(ctx, projectGrantsTable) @@ -310,10 +310,10 @@ func prepareProjectGrantQuery(ctx context.Context, db prepareDatabase) (sq.Selec &resourceOwnerName, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-n98GGs", "Errors.ProjectGrant.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-n98GGs", "Errors.ProjectGrant.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-w9fsH", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-w9fsH", "Errors.Internal") } grant.ProjectName = projectName.String @@ -385,7 +385,7 @@ func prepareProjectGrantsQuery(ctx context.Context, db prepareDatabase) (sq.Sele } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-K9gEE", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-K9gEE", "Errors.Query.CloseRows") } return &ProjectGrants{ diff --git a/internal/query/project_grant_member.go b/internal/query/project_grant_member.go index 60eb0dc89..c13300713 100644 --- a/internal/query/project_grant_member.go +++ b/internal/query/project_grant_member.go @@ -9,8 +9,8 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -82,7 +82,7 @@ func (q *Queries) ProjectGrantMembers(ctx context.Context, queries *ProjectGrant eq := sq.Eq{ProjectGrantMemberInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()} stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-USNwM", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-USNwM", "Errors.Query.InvalidRequest") } currentSequence, err := q.latestState(ctx, projectGrantMemberTable) @@ -95,7 +95,7 @@ func (q *Queries) ProjectGrantMembers(ctx context.Context, queries *ProjectGrant return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Pdg1I", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Pdg1I", "Errors.Internal") } members.State = currentSequence @@ -185,7 +185,7 @@ func prepareProjectGrantMembersQuery(ctx context.Context, db prepareDatabase) (s } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-EqJFc", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-EqJFc", "Errors.Query.CloseRows") } return &Members{ diff --git a/internal/query/project_grant_test.go b/internal/query/project_grant_test.go index e76fd9611..6d2131dfc 100644 --- a/internal/query/project_grant_test.go +++ b/internal/query/project_grant_test.go @@ -10,7 +10,7 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -393,7 +393,7 @@ func Test_ProjectGrantPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/project_member.go b/internal/query/project_member.go index 989b60873..a86246bdd 100644 --- a/internal/query/project_member.go +++ b/internal/query/project_member.go @@ -9,9 +9,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -73,7 +73,7 @@ func (q *Queries) ProjectMembers(ctx context.Context, queries *ProjectMembersQue eq := sq.Eq{ProjectMemberInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()} stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-T8CuT", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-T8CuT", "Errors.Query.InvalidRequest") } currentSequence, err := q.latestState(ctx, projectMemberTable) @@ -86,7 +86,7 @@ func (q *Queries) ProjectMembers(ctx context.Context, queries *ProjectMembersQue return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-uh6pj", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-uh6pj", "Errors.Internal") } members.State = currentSequence @@ -175,7 +175,7 @@ func prepareProjectMembersQuery(ctx context.Context, db prepareDatabase) (sq.Sel } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-ZJ1Ii", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-ZJ1Ii", "Errors.Query.CloseRows") } return &Members{ diff --git a/internal/query/project_role.go b/internal/query/project_role.go index e7a3fe288..bca1957ef 100644 --- a/internal/query/project_role.go +++ b/internal/query/project_role.go @@ -11,10 +11,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -98,7 +98,7 @@ func (q *Queries) SearchProjectRoles(ctx context.Context, shouldTriggerBulk bool query, scan := prepareProjectRolesQuery(ctx, q.client) stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-3N9ff", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-3N9ff", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -106,7 +106,7 @@ func (q *Queries) SearchProjectRoles(ctx context.Context, shouldTriggerBulk bool return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-5Ngd9", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-5Ngd9", "Errors.Internal") } roles.State, err = q.latestState(ctx, projectRolesTable) return roles, err @@ -130,7 +130,7 @@ func (q *Queries) SearchGrantedProjectRoles(ctx context.Context, grantID, grante query, scan := prepareProjectRolesQuery(ctx, q.client) stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-3N9ff", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-3N9ff", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -138,7 +138,7 @@ func (q *Queries) SearchGrantedProjectRoles(ctx context.Context, grantID, grante return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-5Ngd9", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-5Ngd9", "Errors.Internal") } roles.State, err = q.latestState(ctx, projectRolesTable) @@ -244,7 +244,7 @@ func prepareProjectRolesQuery(ctx context.Context, db prepareDatabase) (sq.Selec } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-ML0Fs", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-ML0Fs", "Errors.Query.CloseRows") } return &ProjectRoles{ diff --git a/internal/query/project_test.go b/internal/query/project_test.go index eadc60430..a621c27f4 100644 --- a/internal/query/project_test.go +++ b/internal/query/project_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -250,7 +250,7 @@ func Test_ProjectPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/projection/action.go b/internal/query/projection/action.go index 0bdfccce0..13ff7437a 100644 --- a/internal/query/projection/action.go +++ b/internal/query/projection/action.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/action" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -113,7 +113,7 @@ func (p *actionProjection) Reducers() []handler.AggregateReducer { func (p *actionProjection) reduceActionAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*action.AddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Dff21", "reduce.wrong.event.type% s", action.AddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Dff21", "reduce.wrong.event.type% s", action.AddedEventType) } return handler.NewCreateStatement( e, @@ -136,7 +136,7 @@ func (p *actionProjection) reduceActionAdded(event eventstore.Event) (*handler.S func (p *actionProjection) reduceActionChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*action.ChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Gg43d", "reduce.wrong.event.type %s", action.ChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Gg43d", "reduce.wrong.event.type %s", action.ChangedEventType) } values := []handler.Column{ handler.NewCol(ActionChangeDateCol, e.CreationDate()), @@ -167,7 +167,7 @@ func (p *actionProjection) reduceActionChanged(event eventstore.Event) (*handler func (p *actionProjection) reduceActionDeactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*action.DeactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Fgh32", "reduce.wrong.event.type %s", action.DeactivatedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Fgh32", "reduce.wrong.event.type %s", action.DeactivatedEventType) } return handler.NewUpdateStatement( e, @@ -186,7 +186,7 @@ func (p *actionProjection) reduceActionDeactivated(event eventstore.Event) (*han func (p *actionProjection) reduceActionReactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*action.ReactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-hwdqa", "reduce.wrong.event.type %s", action.ReactivatedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-hwdqa", "reduce.wrong.event.type %s", action.ReactivatedEventType) } return handler.NewUpdateStatement( e, @@ -205,7 +205,7 @@ func (p *actionProjection) reduceActionReactivated(event eventstore.Event) (*han func (p *actionProjection) reduceActionRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*action.RemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Dgh2d", "reduce.wrong.event.type %s", action.RemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Dgh2d", "reduce.wrong.event.type %s", action.RemovedEventType) } return handler.NewDeleteStatement( e, @@ -219,7 +219,7 @@ func (p *actionProjection) reduceActionRemoved(event eventstore.Event) (*handler func (p *actionProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-mSmWM", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-mSmWM", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( e, diff --git a/internal/query/projection/action_test.go b/internal/query/projection/action_test.go index 71dacb9d8..0f5e38273 100644 --- a/internal/query/projection/action_test.go +++ b/internal/query/projection/action_test.go @@ -5,12 +5,12 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/action" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestActionProjection_reduces(t *testing.T) { @@ -249,7 +249,7 @@ func TestActionProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/app.go b/internal/query/projection/app.go index 97e7da21f..9198ecfb2 100644 --- a/internal/query/projection/app.go +++ b/internal/query/projection/app.go @@ -5,13 +5,13 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -232,7 +232,7 @@ func (p *appProjection) Reducers() []handler.AggregateReducer { func (p *appProjection) reduceAppAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ApplicationAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-1xYE6", "reduce.wrong.event.type %s", project.ApplicationAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-1xYE6", "reduce.wrong.event.type %s", project.ApplicationAddedType) } return handler.NewCreateStatement( e, @@ -253,7 +253,7 @@ func (p *appProjection) reduceAppAdded(event eventstore.Event) (*handler.Stateme func (p *appProjection) reduceAppChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ApplicationChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ZJ8JA", "reduce.wrong.event.type %s", project.ApplicationChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ZJ8JA", "reduce.wrong.event.type %s", project.ApplicationChangedType) } if e.Name == "" { return handler.NewNoOpStatement(event), nil @@ -275,7 +275,7 @@ func (p *appProjection) reduceAppChanged(event eventstore.Event) (*handler.State func (p *appProjection) reduceAppDeactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ApplicationDeactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-MVWxZ", "reduce.wrong.event.type %s", project.ApplicationDeactivatedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-MVWxZ", "reduce.wrong.event.type %s", project.ApplicationDeactivatedType) } return handler.NewUpdateStatement( e, @@ -294,7 +294,7 @@ func (p *appProjection) reduceAppDeactivated(event eventstore.Event) (*handler.S func (p *appProjection) reduceAppReactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ApplicationReactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-D0HZO", "reduce.wrong.event.type %s", project.ApplicationReactivatedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-D0HZO", "reduce.wrong.event.type %s", project.ApplicationReactivatedType) } return handler.NewUpdateStatement( e, @@ -313,7 +313,7 @@ func (p *appProjection) reduceAppReactivated(event eventstore.Event) (*handler.S func (p *appProjection) reduceAppRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ApplicationRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Y99aq", "reduce.wrong.event.type %s", project.ApplicationRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Y99aq", "reduce.wrong.event.type %s", project.ApplicationRemovedType) } return handler.NewDeleteStatement( e, @@ -327,7 +327,7 @@ func (p *appProjection) reduceAppRemoved(event eventstore.Event) (*handler.State func (p *appProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ProjectRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-DlUlO", "reduce.wrong.event.type %s", project.ProjectRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-DlUlO", "reduce.wrong.event.type %s", project.ProjectRemovedType) } return handler.NewDeleteStatement( e, @@ -341,7 +341,7 @@ func (p *appProjection) reduceProjectRemoved(event eventstore.Event) (*handler.S func (p *appProjection) reduceAPIConfigAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.APIConfigAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Y99aq", "reduce.wrong.event.type %s", project.APIConfigAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Y99aq", "reduce.wrong.event.type %s", project.APIConfigAddedType) } return handler.NewMultiStatement( e, @@ -371,7 +371,7 @@ func (p *appProjection) reduceAPIConfigAdded(event eventstore.Event) (*handler.S func (p *appProjection) reduceAPIConfigChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.APIConfigChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-vnZKi", "reduce.wrong.event.type %s", project.APIConfigChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-vnZKi", "reduce.wrong.event.type %s", project.APIConfigChangedType) } cols := make([]handler.Column, 0, 2) if e.ClientSecret != nil { @@ -409,7 +409,7 @@ func (p *appProjection) reduceAPIConfigChanged(event eventstore.Event) (*handler func (p *appProjection) reduceAPIConfigSecretChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.APIConfigSecretChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ttb0I", "reduce.wrong.event.type %s", project.APIConfigSecretChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ttb0I", "reduce.wrong.event.type %s", project.APIConfigSecretChangedType) } return handler.NewMultiStatement( e, @@ -439,7 +439,7 @@ func (p *appProjection) reduceAPIConfigSecretChanged(event eventstore.Event) (*h func (p *appProjection) reduceOIDCConfigAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.OIDCConfigAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-GNHU1", "reduce.wrong.event.type %s", project.OIDCConfigAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-GNHU1", "reduce.wrong.event.type %s", project.OIDCConfigAddedType) } return handler.NewMultiStatement( e, @@ -483,7 +483,7 @@ func (p *appProjection) reduceOIDCConfigAdded(event eventstore.Event) (*handler. func (p *appProjection) reduceOIDCConfigChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.OIDCConfigChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-GNHU1", "reduce.wrong.event.type %s", project.OIDCConfigChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-GNHU1", "reduce.wrong.event.type %s", project.OIDCConfigChangedType) } cols := make([]handler.Column, 0, 15) @@ -563,7 +563,7 @@ func (p *appProjection) reduceOIDCConfigChanged(event eventstore.Event) (*handle func (p *appProjection) reduceOIDCConfigSecretChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.OIDCConfigSecretChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-GNHU1", "reduce.wrong.event.type %s", project.OIDCConfigSecretChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-GNHU1", "reduce.wrong.event.type %s", project.OIDCConfigSecretChangedType) } return handler.NewMultiStatement( e, @@ -593,7 +593,7 @@ func (p *appProjection) reduceOIDCConfigSecretChanged(event eventstore.Event) (* func (p *appProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Hyd1f", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Hyd1f", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( @@ -608,7 +608,7 @@ func (p *appProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Sta func (p *appProjection) reduceSAMLConfigAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.SAMLConfigAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgument(nil, "HANDL-GMHU1", "reduce.wrong.event.type") + return nil, zerrors.ThrowInvalidArgument(nil, "HANDL-GMHU1", "reduce.wrong.event.type") } return handler.NewMultiStatement( e, @@ -638,7 +638,7 @@ func (p *appProjection) reduceSAMLConfigAdded(event eventstore.Event) (*handler. func (p *appProjection) reduceSAMLConfigChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.SAMLConfigChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgument(nil, "HANDL-GMHU2", "reduce.wrong.event.type") + return nil, zerrors.ThrowInvalidArgument(nil, "HANDL-GMHU2", "reduce.wrong.event.type") } cols := make([]handler.Column, 0, 3) diff --git a/internal/query/projection/app_test.go b/internal/query/projection/app_test.go index 8ce659be2..41d7fb24d 100644 --- a/internal/query/projection/app_test.go +++ b/internal/query/projection/app_test.go @@ -6,12 +6,12 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestAppProjection_reduces(t *testing.T) { @@ -645,7 +645,7 @@ func TestAppProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/assert.go b/internal/query/projection/assert.go index 369a6da69..96ed19543 100644 --- a/internal/query/projection/assert.go +++ b/internal/query/projection/assert.go @@ -1,14 +1,14 @@ package projection import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) func assertEvent[T eventstore.Event](event eventstore.Event) (T, error) { e, ok := event.(T) if !ok { - return e, errors.ThrowInvalidArgumentf(nil, "HANDL-1m9fS", "reduce.wrong.event.type %T", event) + return e, zerrors.ThrowInvalidArgumentf(nil, "HANDL-1m9fS", "reduce.wrong.event.type %T", event) } return e, nil } diff --git a/internal/query/projection/auth_request.go b/internal/query/projection/auth_request.go index 193f67c58..02a98094b 100644 --- a/internal/query/projection/auth_request.go +++ b/internal/query/projection/auth_request.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/authrequest" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -100,7 +100,7 @@ func (p *authRequestProjection) Reducers() []handler.AggregateReducer { func (p *authRequestProjection) reduceAuthRequestAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*authrequest.AddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Sfwfa", "reduce.wrong.event.type %s", authrequest.AddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Sfwfa", "reduce.wrong.event.type %s", authrequest.AddedType) } return handler.NewCreateStatement( @@ -131,7 +131,7 @@ func (p *authRequestProjection) reduceAuthRequestEnded(event eventstore.Event) ( *authrequest.FailedEvent: break default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ASF3h", "reduce.wrong.event.type %s", []eventstore.EventType{authrequest.SucceededType, authrequest.FailedType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ASF3h", "reduce.wrong.event.type %s", []eventstore.EventType{authrequest.SucceededType, authrequest.FailedType}) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/auth_request_test.go b/internal/query/projection/auth_request_test.go index bda25fdf3..66da1c0dc 100644 --- a/internal/query/projection/auth_request_test.go +++ b/internal/query/projection/auth_request_test.go @@ -7,10 +7,10 @@ import ( "github.com/muhlemmer/gu" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/authrequest" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestAuthRequestProjection_reduces(t *testing.T) { @@ -119,7 +119,7 @@ func TestAuthRequestProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/authn_key.go b/internal/query/projection/authn_key.go index bc14c917e..e2229ad33 100644 --- a/internal/query/projection/authn_key.go +++ b/internal/query/projection/authn_key.go @@ -5,7 +5,6 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" @@ -13,6 +12,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -163,7 +163,7 @@ func (p *authNKeyProjection) reduceAuthNKeyAdded(event eventstore.Event) (*handl authNKeyEvent.publicKey = e.PublicKey authNKeyEvent.keyType = e.KeyType default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Dgb32", "reduce.wrong.event.type %v", []eventstore.EventType{project.ApplicationKeyAddedEventType, user.MachineKeyAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Dgb32", "reduce.wrong.event.type %v", []eventstore.EventType{project.ApplicationKeyAddedEventType, user.MachineKeyAddedEventType}) } return handler.NewCreateStatement( &authNKeyEvent, @@ -207,7 +207,7 @@ func (p *authNKeyProjection) reduceAuthNKeyEnabledChanged(event eventstore.Event changeDate = e.CreationDate() sequence = e.Sequence() default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Dbrt1", "reduce.wrong.event.type %v", []eventstore.EventType{project.APIConfigChangedType, project.OIDCConfigChangedType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Dbrt1", "reduce.wrong.event.type %v", []eventstore.EventType{project.APIConfigChangedType, project.OIDCConfigChangedType}) } return handler.NewUpdateStatement( event, @@ -237,7 +237,7 @@ func (p *authNKeyProjection) reduceAuthNKeyRemoved(event eventstore.Event) (*han case *user.UserRemovedEvent: condition = handler.NewCond(AuthNKeyAggregateIDCol, e.Aggregate().ID) default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-BGge42", "reduce.wrong.event.type %v", []eventstore.EventType{project.ApplicationKeyRemovedEventType, project.ApplicationRemovedType, project.ProjectRemovedType, user.MachineKeyRemovedEventType, user.UserRemovedType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-BGge42", "reduce.wrong.event.type %v", []eventstore.EventType{project.ApplicationKeyRemovedEventType, project.ApplicationRemovedType, project.ProjectRemovedType, user.MachineKeyRemovedEventType, user.UserRemovedType}) } return handler.NewDeleteStatement( event, @@ -251,7 +251,7 @@ func (p *authNKeyProjection) reduceAuthNKeyRemoved(event eventstore.Event) (*han func (p *authNKeyProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Hyd1f", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Hyd1f", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/authn_key_test.go b/internal/query/projection/authn_key_test.go index bc016f375..81879995c 100644 --- a/internal/query/projection/authn_key_test.go +++ b/internal/query/projection/authn_key_test.go @@ -4,13 +4,13 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestAuthNKeyProjection_reduces(t *testing.T) { @@ -502,7 +502,7 @@ func TestAuthNKeyProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/custom_text.go b/internal/query/projection/custom_text.go index a406f4e50..255902dd7 100644 --- a/internal/query/projection/custom_text.go +++ b/internal/query/projection/custom_text.go @@ -3,13 +3,13 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -117,7 +117,7 @@ func (p *customTextProjection) reduceSet(event eventstore.Event) (*handler.State customTextEvent = e.CustomTextSetEvent isDefault = true default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-KKfw4", "reduce.wrong.event.type %v", []eventstore.EventType{org.CustomTextSetEventType, instance.CustomTextSetEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-KKfw4", "reduce.wrong.event.type %v", []eventstore.EventType{org.CustomTextSetEventType, instance.CustomTextSetEventType}) } return handler.NewUpsertStatement( &customTextEvent, @@ -150,7 +150,7 @@ func (p *customTextProjection) reduceRemoved(event eventstore.Event) (*handler.S case *instance.CustomTextRemovedEvent: customTextEvent = e.CustomTextRemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-n9wJg", "reduce.wrong.event.type %v", []eventstore.EventType{org.CustomTextRemovedEventType, instance.CustomTextRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-n9wJg", "reduce.wrong.event.type %v", []eventstore.EventType{org.CustomTextRemovedEventType, instance.CustomTextRemovedEventType}) } return handler.NewDeleteStatement( &customTextEvent, @@ -171,7 +171,7 @@ func (p *customTextProjection) reduceTemplateRemoved(event eventstore.Event) (*h case *instance.CustomTextTemplateRemovedEvent: customTextEvent = e.CustomTextTemplateRemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-29iPf", "reduce.wrong.event.type %v", []eventstore.EventType{org.CustomTextTemplateRemovedEventType, instance.CustomTextTemplateRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-29iPf", "reduce.wrong.event.type %v", []eventstore.EventType{org.CustomTextTemplateRemovedEventType, instance.CustomTextTemplateRemovedEventType}) } return handler.NewDeleteStatement( &customTextEvent, @@ -186,7 +186,7 @@ func (p *customTextProjection) reduceTemplateRemoved(event eventstore.Event) (*h func (p *customTextProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-V2T3z", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-V2T3z", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/custom_text_test.go b/internal/query/projection/custom_text_test.go index 951e236cf..d366eb35b 100644 --- a/internal/query/projection/custom_text_test.go +++ b/internal/query/projection/custom_text_test.go @@ -3,11 +3,11 @@ package projection import ( "testing" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestCustomTextProjection_reduces(t *testing.T) { @@ -292,7 +292,7 @@ func TestCustomTextProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } event = tt.args.event(t) diff --git a/internal/query/projection/debug_notification.go b/internal/query/projection/debug_notification.go index 7d553ed0b..eca16dce0 100644 --- a/internal/query/projection/debug_notification.go +++ b/internal/query/projection/debug_notification.go @@ -6,11 +6,11 @@ import ( "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/repository/settings" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -104,7 +104,7 @@ func (p *debugNotificationProviderProjection) reduceDebugNotificationProviderAdd providerEvent = e.DebugNotificationProviderAddedEvent providerType = domain.NotificationProviderTypeLog default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-pYPxS", "reduce.wrong.event.type %v", []eventstore.EventType{instance.DebugNotificationProviderFileAddedEventType, instance.DebugNotificationProviderLogAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-pYPxS", "reduce.wrong.event.type %v", []eventstore.EventType{instance.DebugNotificationProviderFileAddedEventType, instance.DebugNotificationProviderLogAddedEventType}) } return handler.NewCreateStatement(&providerEvent, []handler.Column{ @@ -131,7 +131,7 @@ func (p *debugNotificationProviderProjection) reduceDebugNotificationProviderCha providerEvent = e.DebugNotificationProviderChangedEvent providerType = domain.NotificationProviderTypeLog default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-pYPxS", "reduce.wrong.event.type %v", []eventstore.EventType{instance.DebugNotificationProviderFileChangedEventType, instance.DebugNotificationProviderLogChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-pYPxS", "reduce.wrong.event.type %v", []eventstore.EventType{instance.DebugNotificationProviderFileChangedEventType, instance.DebugNotificationProviderLogChangedEventType}) } cols := []handler.Column{ @@ -164,7 +164,7 @@ func (p *debugNotificationProviderProjection) reduceDebugNotificationProviderRem providerEvent = e.DebugNotificationProviderRemovedEvent providerType = domain.NotificationProviderTypeLog default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-dow9f", "reduce.wrong.event.type %v", []eventstore.EventType{instance.DebugNotificationProviderFileRemovedEventType, instance.DebugNotificationProviderLogRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-dow9f", "reduce.wrong.event.type %v", []eventstore.EventType{instance.DebugNotificationProviderFileRemovedEventType, instance.DebugNotificationProviderLogRemovedEventType}) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/debug_notification_provider_test.go b/internal/query/projection/debug_notification_provider_test.go index cbe943a7a..10d85678d 100644 --- a/internal/query/projection/debug_notification_provider_test.go +++ b/internal/query/projection/debug_notification_provider_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestDebugNotificationProviderProjection_reduces(t *testing.T) { @@ -245,7 +245,7 @@ func TestDebugNotificationProviderProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/device_auth.go b/internal/query/projection/device_auth.go index f0232192e..935d72005 100644 --- a/internal/query/projection/device_auth.go +++ b/internal/query/projection/device_auth.go @@ -4,11 +4,11 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/deviceauth" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -91,7 +91,7 @@ func (p *deviceAuthProjection) Reducers() []handler.AggregateReducer { func (p *deviceAuthProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*deviceauth.AddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-chu6O", "reduce.wrong.event.type %T != %s", event, deviceauth.AddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-chu6O", "reduce.wrong.event.type %T != %s", event, deviceauth.AddedEventType) } return handler.NewCreateStatement( e, @@ -113,7 +113,7 @@ func (p *deviceAuthProjection) reduceAdded(event eventstore.Event) (*handler.Sta func (p *deviceAuthProjection) reduceAppoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*deviceauth.ApprovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-kei0A", "reduce.wrong.event.type %T != %s", event, deviceauth.ApprovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-kei0A", "reduce.wrong.event.type %T != %s", event, deviceauth.ApprovedEventType) } return handler.NewUpdateStatement(e, []handler.Column{ @@ -132,7 +132,7 @@ func (p *deviceAuthProjection) reduceAppoved(event eventstore.Event) (*handler.S func (p *deviceAuthProjection) reduceCanceled(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*deviceauth.CanceledEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-eeS8d", "reduce.wrong.event.type %T != %s", event, deviceauth.CanceledEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-eeS8d", "reduce.wrong.event.type %T != %s", event, deviceauth.CanceledEventType) } return handler.NewUpdateStatement(e, []handler.Column{ @@ -150,7 +150,7 @@ func (p *deviceAuthProjection) reduceCanceled(event eventstore.Event) (*handler. func (p *deviceAuthProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*deviceauth.RemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-AJi1u", "reduce.wrong.event.type %T != %s", event, deviceauth.RemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-AJi1u", "reduce.wrong.event.type %T != %s", event, deviceauth.RemovedEventType) } return handler.NewDeleteStatement(e, []handler.Condition{ diff --git a/internal/query/projection/domain_policy.go b/internal/query/projection/domain_policy.go index b11fbf260..9277d342a 100644 --- a/internal/query/projection/domain_policy.go +++ b/internal/query/projection/domain_policy.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -116,7 +116,7 @@ func (p *domainPolicyProjection) reduceAdded(event eventstore.Event) (*handler.S policyEvent = e.DomainPolicyAddedEvent isDefault = true default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-CSE7A", "reduce.wrong.event.type %v", []eventstore.EventType{org.DomainPolicyAddedEventType, instance.DomainPolicyAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-CSE7A", "reduce.wrong.event.type %v", []eventstore.EventType{org.DomainPolicyAddedEventType, instance.DomainPolicyAddedEventType}) } return handler.NewCreateStatement( &policyEvent, @@ -143,7 +143,7 @@ func (p *domainPolicyProjection) reduceChanged(event eventstore.Event) (*handler case *instance.DomainPolicyChangedEvent: policyEvent = e.DomainPolicyChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-qgVug", "reduce.wrong.event.type %v", []eventstore.EventType{org.DomainPolicyChangedEventType, instance.DomainPolicyChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-qgVug", "reduce.wrong.event.type %v", []eventstore.EventType{org.DomainPolicyChangedEventType, instance.DomainPolicyChangedEventType}) } cols := []handler.Column{ handler.NewCol(DomainPolicyChangeDateCol, policyEvent.CreationDate()), @@ -170,7 +170,7 @@ func (p *domainPolicyProjection) reduceChanged(event eventstore.Event) (*handler func (p *domainPolicyProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { policyEvent, ok := event.(*org.DomainPolicyRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-JAENd", "reduce.wrong.event.type %s", org.DomainPolicyRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-JAENd", "reduce.wrong.event.type %s", org.DomainPolicyRemovedEventType) } return handler.NewDeleteStatement( policyEvent, @@ -183,7 +183,7 @@ func (p *domainPolicyProjection) reduceRemoved(event eventstore.Event) (*handler func (p *domainPolicyProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-JYD2K", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-JYD2K", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/domain_policy_test.go b/internal/query/projection/domain_policy_test.go index 0df5f786d..418640cb1 100644 --- a/internal/query/projection/domain_policy_test.go +++ b/internal/query/projection/domain_policy_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestDomainPolicyProjection_reduces(t *testing.T) { @@ -258,7 +258,7 @@ func TestDomainPolicyProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/executer_test.go b/internal/query/projection/executer_test.go index 8dca87a38..9c1dd021f 100644 --- a/internal/query/projection/executer_test.go +++ b/internal/query/projection/executer_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type testExecuter struct { @@ -30,7 +30,7 @@ func (e *testExecuter) Exec(stmt string, args ...interface{}) (sql.Result, error } if e.execIdx >= len(e.executions) { - return nil, errors.ThrowInternal(nil, "PROJE-8TNoE", "too many executions") + return nil, zerrors.ThrowInternal(nil, "PROJE-8TNoE", "too many executions") } e.executions[e.execIdx].gottenArgs = args e.executions[e.execIdx].gottenStmt = stmt diff --git a/internal/query/projection/flow.go b/internal/query/projection/flow.go index 5d03d8f07..2e954bca2 100644 --- a/internal/query/projection/flow.go +++ b/internal/query/projection/flow.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -84,7 +84,7 @@ func (p *flowProjection) Reducers() []handler.AggregateReducer { func (p *flowProjection) reduceTriggerActionsSetEventType(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.TriggerActionsSetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-uYq4r", "reduce.wrong.event.type %s", org.TriggerActionsSetEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-uYq4r", "reduce.wrong.event.type %s", org.TriggerActionsSetEventType) } stmts := make([]func(reader eventstore.Event) handler.Exec, len(e.ActionIDs)+1) stmts[0] = handler.AddDeleteStatement( @@ -115,7 +115,7 @@ func (p *flowProjection) reduceTriggerActionsSetEventType(event eventstore.Event func (p *flowProjection) reduceFlowClearedEventType(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.FlowClearedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-uYq4r", "reduce.wrong.event.type %s", org.FlowClearedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-uYq4r", "reduce.wrong.event.type %s", org.FlowClearedEventType) } return handler.NewDeleteStatement( e, @@ -130,7 +130,7 @@ func (p *flowProjection) reduceFlowClearedEventType(event eventstore.Event) (*ha func (p *flowProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Yd7WC", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Yd7WC", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/flow_test.go b/internal/query/projection/flow_test.go index 757aea548..add857b46 100644 --- a/internal/query/projection/flow_test.go +++ b/internal/query/projection/flow_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestFlowProjection_reduces(t *testing.T) { @@ -162,7 +162,7 @@ func TestFlowProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/idp.go b/internal/query/projection/idp.go index db5cc4319..32bb5abec 100644 --- a/internal/query/projection/idp.go +++ b/internal/query/projection/idp.go @@ -5,13 +5,13 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -223,7 +223,7 @@ func (p *idpProjection) reduceIDPAdded(event eventstore.Event) (*handler.Stateme idpEvent = e.IDPConfigAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-fcUdQ", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigAddedEventType, instance.IDPConfigAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-fcUdQ", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigAddedEventType, instance.IDPConfigAddedEventType}) } return handler.NewCreateStatement( @@ -252,7 +252,7 @@ func (p *idpProjection) reduceIDPChanged(event eventstore.Event) (*handler.State case *instance.IDPConfigChangedEvent: idpEvent = e.IDPConfigChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-NVvJD", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigChangedEventType, instance.IDPConfigChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-NVvJD", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigChangedEventType, instance.IDPConfigChangedEventType}) } cols := make([]handler.Column, 0, 5) @@ -292,7 +292,7 @@ func (p *idpProjection) reduceIDPDeactivated(event eventstore.Event) (*handler.S case *instance.IDPConfigDeactivatedEvent: idpEvent = e.IDPConfigDeactivatedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-94O5l", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigDeactivatedEventType, instance.IDPConfigDeactivatedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-94O5l", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigDeactivatedEventType, instance.IDPConfigDeactivatedEventType}) } return handler.NewUpdateStatement( @@ -317,7 +317,7 @@ func (p *idpProjection) reduceIDPReactivated(event eventstore.Event) (*handler.S case *instance.IDPConfigReactivatedEvent: idpEvent = e.IDPConfigReactivatedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-I8QyS", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigReactivatedEventType, instance.IDPConfigReactivatedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-I8QyS", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigReactivatedEventType, instance.IDPConfigReactivatedEventType}) } return handler.NewUpdateStatement( @@ -342,7 +342,7 @@ func (p *idpProjection) reduceIDPRemoved(event eventstore.Event) (*handler.State case *instance.IDPConfigRemovedEvent: idpEvent = e.IDPConfigRemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-B4zy8", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigRemovedEventType, instance.IDPConfigRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-B4zy8", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigRemovedEventType, instance.IDPConfigRemovedEventType}) } return handler.NewDeleteStatement( @@ -362,7 +362,7 @@ func (p *idpProjection) reduceOIDCConfigAdded(event eventstore.Event) (*handler. case *instance.IDPOIDCConfigAddedEvent: idpEvent = e.OIDCConfigAddedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-2FuAA", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPOIDCConfigAddedEventType, instance.IDPOIDCConfigAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-2FuAA", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPOIDCConfigAddedEventType, instance.IDPOIDCConfigAddedEventType}) } return handler.NewMultiStatement(&idpEvent, @@ -403,7 +403,7 @@ func (p *idpProjection) reduceOIDCConfigChanged(event eventstore.Event) (*handle case *instance.IDPOIDCConfigChangedEvent: idpEvent = e.OIDCConfigChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-x2IVI", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPOIDCConfigChangedEventType, instance.IDPOIDCConfigChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-x2IVI", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPOIDCConfigChangedEventType, instance.IDPOIDCConfigChangedEventType}) } cols := make([]handler.Column, 0, 8) @@ -467,7 +467,7 @@ func (p *idpProjection) reduceJWTConfigAdded(event eventstore.Event) (*handler.S case *instance.IDPJWTConfigAddedEvent: idpEvent = e.JWTConfigAddedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-qvPdb", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPJWTConfigAddedEventType, instance.IDPJWTConfigAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-qvPdb", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPJWTConfigAddedEventType, instance.IDPJWTConfigAddedEventType}) } return handler.NewMultiStatement(&idpEvent, @@ -505,7 +505,7 @@ func (p *idpProjection) reduceJWTConfigChanged(event eventstore.Event) (*handler case *instance.IDPJWTConfigChangedEvent: idpEvent = e.JWTConfigChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-x2IVI", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPJWTConfigChangedEventType, instance.IDPJWTConfigChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-x2IVI", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPJWTConfigChangedEventType, instance.IDPJWTConfigChangedEventType}) } cols := make([]handler.Column, 0, 4) @@ -552,7 +552,7 @@ func (p *idpProjection) reduceJWTConfigChanged(event eventstore.Event) (*handler func (p *idpProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-YsbQC", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-YsbQC", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/idp_login_policy_link.go b/internal/query/projection/idp_login_policy_link.go index 7fcdc5780..a72cd84fd 100644 --- a/internal/query/projection/idp_login_policy_link.go +++ b/internal/query/projection/idp_login_policy_link.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -138,7 +138,7 @@ func (p *idpLoginPolicyLinkProjection) reduceAdded(event eventstore.Event) (*han idp = e.IdentityProviderAddedEvent providerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Nlp55", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyIDPProviderAddedEventType, instance.LoginPolicyIDPProviderAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Nlp55", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyIDPProviderAddedEventType, instance.LoginPolicyIDPProviderAddedEventType}) } return handler.NewCreateStatement(&idp, @@ -164,7 +164,7 @@ func (p *idpLoginPolicyLinkProjection) reduceRemoved(event eventstore.Event) (*h case *instance.IdentityProviderRemovedEvent: idp = e.IdentityProviderRemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-tUMYY", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyIDPProviderRemovedEventType, instance.LoginPolicyIDPProviderRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-tUMYY", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyIDPProviderRemovedEventType, instance.LoginPolicyIDPProviderRemovedEventType}) } return handler.NewDeleteStatement(&idp, @@ -185,7 +185,7 @@ func (p *idpLoginPolicyLinkProjection) reduceCascadeRemoved(event eventstore.Eve case *instance.IdentityProviderCascadeRemovedEvent: idp = e.IdentityProviderCascadeRemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-iCKSj", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyIDPProviderCascadeRemovedEventType, instance.LoginPolicyIDPProviderCascadeRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-iCKSj", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyIDPProviderCascadeRemovedEventType, instance.LoginPolicyIDPProviderCascadeRemovedEventType}) } return handler.NewDeleteStatement(&idp, @@ -213,7 +213,7 @@ func (p *idpLoginPolicyLinkProjection) reduceIDPConfigRemoved(event eventstore.E handler.NewCond(IDPLoginPolicyLinkInstanceIDCol, event.Aggregate().InstanceID), } default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-u6tze", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigRemovedEventType, instance.IDPConfigRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-u6tze", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigRemovedEventType, instance.IDPConfigRemovedEventType}) } return handler.NewDeleteStatement(event, conditions), nil @@ -235,7 +235,7 @@ func (p *idpLoginPolicyLinkProjection) reduceIDPRemoved(event eventstore.Event) handler.NewCond(IDPLoginPolicyLinkInstanceIDCol, event.Aggregate().InstanceID), } default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SFED3", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPRemovedEventType, instance.IDPRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SFED3", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPRemovedEventType, instance.IDPRemovedEventType}) } return handler.NewDeleteStatement(event, conditions), nil @@ -244,7 +244,7 @@ func (p *idpLoginPolicyLinkProjection) reduceIDPRemoved(event eventstore.Event) func (p *idpLoginPolicyLinkProjection) reducePolicyRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.LoginPolicyRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SF3dg", "reduce.wrong.event.type %s", org.LoginPolicyRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SF3dg", "reduce.wrong.event.type %s", org.LoginPolicyRemovedEventType) } return handler.NewDeleteStatement(e, []handler.Condition{ @@ -257,7 +257,7 @@ func (p *idpLoginPolicyLinkProjection) reducePolicyRemoved(event eventstore.Even func (p *idpLoginPolicyLinkProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-YbhOv", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-YbhOv", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/idp_login_policy_link_test.go b/internal/query/projection/idp_login_policy_link_test.go index 4f58ec1fa..bfda5ac73 100644 --- a/internal/query/projection/idp_login_policy_link_test.go +++ b/internal/query/projection/idp_login_policy_link_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestIDPLoginPolicyLinkProjection_reduces(t *testing.T) { @@ -420,7 +420,7 @@ func TestIDPLoginPolicyLinkProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/idp_template.go b/internal/query/projection/idp_template.go index 181fecefb..00cac448a 100644 --- a/internal/query/projection/idp_template.go +++ b/internal/query/projection/idp_template.go @@ -6,7 +6,6 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" @@ -14,6 +13,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -679,7 +679,7 @@ func (p *idpTemplateProjection) reduceOAuthIDPAdded(event eventstore.Event) (*ha idpEvent = e.OAuthIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ap9ihb", "reduce.wrong.event.type %v", []eventstore.EventType{org.OAuthIDPAddedEventType, instance.OAuthIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ap9ihb", "reduce.wrong.event.type %v", []eventstore.EventType{org.OAuthIDPAddedEventType, instance.OAuthIDPAddedEventType}) } return handler.NewMultiStatement( @@ -727,7 +727,7 @@ func (p *idpTemplateProjection) reduceOAuthIDPChanged(event eventstore.Event) (* case *instance.OAuthIDPChangedEvent: idpEvent = e.OAuthIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.OAuthIDPChangedEventType, instance.OAuthIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.OAuthIDPChangedEventType, instance.OAuthIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -771,7 +771,7 @@ func (p *idpTemplateProjection) reduceOIDCIDPAdded(event eventstore.Event) (*han idpEvent = e.OIDCIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-9s02m1", "reduce.wrong.event.type %v", []eventstore.EventType{org.OIDCIDPAddedEventType, instance.OIDCIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-9s02m1", "reduce.wrong.event.type %v", []eventstore.EventType{org.OIDCIDPAddedEventType, instance.OIDCIDPAddedEventType}) } return handler.NewMultiStatement( @@ -817,7 +817,7 @@ func (p *idpTemplateProjection) reduceOIDCIDPChanged(event eventstore.Event) (*h case *instance.OIDCIDPChangedEvent: idpEvent = e.OIDCIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.OIDCIDPChangedEventType, instance.OIDCIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.OIDCIDPChangedEventType, instance.OIDCIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -858,7 +858,7 @@ func (p *idpTemplateProjection) reduceOIDCIDPMigratedAzureAD(event eventstore.Ev case *instance.OIDCIDPMigratedAzureADEvent: idpEvent = e.OIDCIDPMigratedAzureADEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.OIDCIDPMigratedAzureADEventType, instance.OIDCIDPMigratedAzureADEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.OIDCIDPMigratedAzureADEventType, instance.OIDCIDPMigratedAzureADEventType}) } return handler.NewMultiStatement( @@ -909,7 +909,7 @@ func (p *idpTemplateProjection) reduceOIDCIDPMigratedGoogle(event eventstore.Eve case *instance.OIDCIDPMigratedGoogleEvent: idpEvent = e.OIDCIDPMigratedGoogleEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.OIDCIDPMigratedGoogleEventType, instance.OIDCIDPMigratedGoogleEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.OIDCIDPMigratedGoogleEventType, instance.OIDCIDPMigratedGoogleEventType}) } return handler.NewMultiStatement( @@ -961,7 +961,7 @@ func (p *idpTemplateProjection) reduceJWTIDPAdded(event eventstore.Event) (*hand idpEvent = e.JWTIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-xopi2s", "reduce.wrong.event.type %v", []eventstore.EventType{org.JWTIDPAddedEventType, instance.JWTIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-xopi2s", "reduce.wrong.event.type %v", []eventstore.EventType{org.JWTIDPAddedEventType, instance.JWTIDPAddedEventType}) } return handler.NewMultiStatement( @@ -1006,7 +1006,7 @@ func (p *idpTemplateProjection) reduceJWTIDPChanged(event eventstore.Event) (*ha case *instance.JWTIDPChangedEvent: idpEvent = e.JWTIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.JWTIDPChangedEventType, instance.JWTIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.JWTIDPChangedEventType, instance.JWTIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -1050,7 +1050,7 @@ func (p *idpTemplateProjection) reduceOldConfigAdded(event eventstore.Event) (*h idpEvent = e.IDPConfigAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ADfeg", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigAddedEventType, instance.IDPConfigAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ADfeg", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigAddedEventType, instance.IDPConfigAddedEventType}) } return handler.NewCreateStatement( @@ -1082,7 +1082,7 @@ func (p *idpTemplateProjection) reduceOldConfigChanged(event eventstore.Event) ( case *instance.IDPConfigChangedEvent: idpEvent = e.IDPConfigChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAfg2", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigChangedEventType, instance.IDPConfigChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SAfg2", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigChangedEventType, instance.IDPConfigChangedEventType}) } cols := make([]handler.Column, 0, 4) @@ -1115,7 +1115,7 @@ func (p *idpTemplateProjection) reduceOldOIDCConfigAdded(event eventstore.Event) case *instance.IDPOIDCConfigAddedEvent: idpEvent = e.OIDCConfigAddedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ASFdq2", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPOIDCConfigAddedEventType, instance.IDPOIDCConfigAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ASFdq2", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPOIDCConfigAddedEventType, instance.IDPOIDCConfigAddedEventType}) } return handler.NewMultiStatement( @@ -1154,7 +1154,7 @@ func (p *idpTemplateProjection) reduceOldOIDCConfigChanged(event eventstore.Even case *instance.IDPOIDCConfigChangedEvent: idpEvent = e.OIDCConfigChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.OIDCIDPChangedEventType, instance.OIDCIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.OIDCIDPChangedEventType, instance.OIDCIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -1210,7 +1210,7 @@ func (p *idpTemplateProjection) reduceOldJWTConfigAdded(event eventstore.Event) case *instance.IDPJWTConfigAddedEvent: idpEvent = e.JWTConfigAddedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ASFdq2", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPJWTConfigAddedEventType, instance.IDPJWTConfigAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ASFdq2", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPJWTConfigAddedEventType, instance.IDPJWTConfigAddedEventType}) } return handler.NewMultiStatement( @@ -1248,7 +1248,7 @@ func (p *idpTemplateProjection) reduceOldJWTConfigChanged(event eventstore.Event case *instance.IDPJWTConfigChangedEvent: idpEvent = e.JWTConfigChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.JWTIDPChangedEventType, instance.JWTIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.JWTIDPChangedEventType, instance.JWTIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -1307,7 +1307,7 @@ func (p *idpTemplateProjection) reduceAzureADIDPAdded(event eventstore.Event) (* idpEvent = e.AzureADIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-x9a022b", "reduce.wrong.event.type %v", []eventstore.EventType{org.AzureADIDPAddedEventType, instance.AzureADIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-x9a022b", "reduce.wrong.event.type %v", []eventstore.EventType{org.AzureADIDPAddedEventType, instance.AzureADIDPAddedEventType}) } return handler.NewMultiStatement( @@ -1353,7 +1353,7 @@ func (p *idpTemplateProjection) reduceAzureADIDPChanged(event eventstore.Event) case *instance.AzureADIDPChangedEvent: idpEvent = e.AzureADIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.AzureADIDPChangedEventType, instance.AzureADIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.AzureADIDPChangedEventType, instance.AzureADIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -1397,7 +1397,7 @@ func (p *idpTemplateProjection) reduceGitHubIDPAdded(event eventstore.Event) (*h idpEvent = e.GitHubIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-x9a022b", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitHubIDPAddedEventType, instance.GitHubIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-x9a022b", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitHubIDPAddedEventType, instance.GitHubIDPAddedEventType}) } return handler.NewMultiStatement( @@ -1444,7 +1444,7 @@ func (p *idpTemplateProjection) reduceGitHubEnterpriseIDPAdded(event eventstore. idpEvent = e.GitHubEnterpriseIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Sf3g2a", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitHubEnterpriseIDPAddedEventType, instance.GitHubEnterpriseIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Sf3g2a", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitHubEnterpriseIDPAddedEventType, instance.GitHubEnterpriseIDPAddedEventType}) } return handler.NewMultiStatement( @@ -1491,7 +1491,7 @@ func (p *idpTemplateProjection) reduceGitHubIDPChanged(event eventstore.Event) ( case *instance.GitHubIDPChangedEvent: idpEvent = e.GitHubIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitHubIDPChangedEventType, instance.GitHubIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitHubIDPChangedEventType, instance.GitHubIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -1532,7 +1532,7 @@ func (p *idpTemplateProjection) reduceGitHubEnterpriseIDPChanged(event eventstor case *instance.GitHubEnterpriseIDPChangedEvent: idpEvent = e.GitHubEnterpriseIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SDg3g", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitHubEnterpriseIDPChangedEventType, instance.GitHubEnterpriseIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SDg3g", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitHubEnterpriseIDPChangedEventType, instance.GitHubEnterpriseIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -1576,7 +1576,7 @@ func (p *idpTemplateProjection) reduceGitLabIDPAdded(event eventstore.Event) (*h idpEvent = e.GitLabIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-x9a022b", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitLabIDPAddedEventType, instance.GitLabIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-x9a022b", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitLabIDPAddedEventType, instance.GitLabIDPAddedEventType}) } return handler.NewMultiStatement( @@ -1620,7 +1620,7 @@ func (p *idpTemplateProjection) reduceGitLabIDPChanged(event eventstore.Event) ( case *instance.GitLabIDPChangedEvent: idpEvent = e.GitLabIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitLabIDPChangedEventType, instance.GitLabIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitLabIDPChangedEventType, instance.GitLabIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -1664,7 +1664,7 @@ func (p *idpTemplateProjection) reduceGitLabSelfHostedIDPAdded(event eventstore. idpEvent = e.GitLabSelfHostedIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAF3gw", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitLabSelfHostedIDPAddedEventType, instance.GitLabSelfHostedIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SAF3gw", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitLabSelfHostedIDPAddedEventType, instance.GitLabSelfHostedIDPAddedEventType}) } return handler.NewMultiStatement( @@ -1709,7 +1709,7 @@ func (p *idpTemplateProjection) reduceGitLabSelfHostedIDPChanged(event eventstor case *instance.GitLabSelfHostedIDPChangedEvent: idpEvent = e.GitLabSelfHostedIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAf3g2", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitLabSelfHostedIDPChangedEventType, instance.GitLabSelfHostedIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SAf3g2", "reduce.wrong.event.type %v", []eventstore.EventType{org.GitLabSelfHostedIDPChangedEventType, instance.GitLabSelfHostedIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -1753,7 +1753,7 @@ func (p *idpTemplateProjection) reduceGoogleIDPAdded(event eventstore.Event) (*h idpEvent = e.GoogleIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ap9ihb", "reduce.wrong.event.type %v", []eventstore.EventType{org.GoogleIDPAddedEventType, instance.GoogleIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ap9ihb", "reduce.wrong.event.type %v", []eventstore.EventType{org.GoogleIDPAddedEventType, instance.GoogleIDPAddedEventType}) } return handler.NewMultiStatement( @@ -1797,7 +1797,7 @@ func (p *idpTemplateProjection) reduceGoogleIDPChanged(event eventstore.Event) ( case *instance.GoogleIDPChangedEvent: idpEvent = e.GoogleIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.GoogleIDPChangedEventType, instance.GoogleIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.GoogleIDPChangedEventType, instance.GoogleIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -1841,7 +1841,7 @@ func (p *idpTemplateProjection) reduceLDAPIDPAdded(event eventstore.Event) (*han idpEvent = e.LDAPIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-9s02m1", "reduce.wrong.event.type %v", []eventstore.EventType{org.LDAPIDPAddedEventType, instance.LDAPIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-9s02m1", "reduce.wrong.event.type %v", []eventstore.EventType{org.LDAPIDPAddedEventType, instance.LDAPIDPAddedEventType}) } return handler.NewMultiStatement( @@ -1904,7 +1904,7 @@ func (p *idpTemplateProjection) reduceLDAPIDPChanged(event eventstore.Event) (*h case *instance.LDAPIDPChangedEvent: idpEvent = e.LDAPIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.LDAPIDPChangedEventType, instance.LDAPIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-p1582ks", "reduce.wrong.event.type %v", []eventstore.EventType{org.LDAPIDPChangedEventType, instance.LDAPIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -1949,7 +1949,7 @@ func (p *idpTemplateProjection) reduceSAMLIDPAdded(event eventstore.Event) (*han idpEvent = e.SAMLIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-9s02m1", "reduce.wrong.event.type %v", []eventstore.EventType{org.SAMLIDPAddedEventType, instance.SAMLIDPAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-9s02m1", "reduce.wrong.event.type %v", []eventstore.EventType{org.SAMLIDPAddedEventType, instance.SAMLIDPAddedEventType}) } return handler.NewMultiStatement( @@ -1995,7 +1995,7 @@ func (p *idpTemplateProjection) reduceSAMLIDPChanged(event eventstore.Event) (*h case *instance.SAMLIDPChangedEvent: idpEvent = e.SAMLIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-o7c0fii4ad", "reduce.wrong.event.type %v", []eventstore.EventType{org.SAMLIDPChangedEventType, instance.SAMLIDPChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-o7c0fii4ad", "reduce.wrong.event.type %v", []eventstore.EventType{org.SAMLIDPChangedEventType, instance.SAMLIDPChangedEventType}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -2040,7 +2040,7 @@ func (p *idpTemplateProjection) reduceAppleIDPAdded(event eventstore.Event) (*ha idpEvent = e.AppleIDPAddedEvent idpOwnerType = domain.IdentityProviderTypeSystem default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SFvg3", "reduce.wrong.event.type %v", []eventstore.EventType{org.AppleIDPAddedEventType /*, instance.AppleIDPAddedEventType*/}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SFvg3", "reduce.wrong.event.type %v", []eventstore.EventType{org.AppleIDPAddedEventType /*, instance.AppleIDPAddedEventType*/}) } return handler.NewMultiStatement( @@ -2086,7 +2086,7 @@ func (p *idpTemplateProjection) reduceAppleIDPChanged(event eventstore.Event) (* case *instance.AppleIDPChangedEvent: idpEvent = e.AppleIDPChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-GBez3", "reduce.wrong.event.type %v", []eventstore.EventType{org.AppleIDPChangedEventType /*, instance.AppleIDPChangedEventType*/}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-GBez3", "reduce.wrong.event.type %v", []eventstore.EventType{org.AppleIDPChangedEventType /*, instance.AppleIDPChangedEventType*/}) } ops := make([]func(eventstore.Event) handler.Exec, 0, 2) @@ -2127,7 +2127,7 @@ func (p *idpTemplateProjection) reduceIDPConfigRemoved(event eventstore.Event) ( case *instance.IDPConfigRemovedEvent: idpEvent = e.IDPConfigRemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAFet", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigRemovedEventType, instance.IDPConfigRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SAFet", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigRemovedEventType, instance.IDPConfigRemovedEventType}) } return handler.NewDeleteStatement( @@ -2147,7 +2147,7 @@ func (p *idpTemplateProjection) reduceIDPRemoved(event eventstore.Event) (*handl case *instance.IDPRemovedEvent: idpEvent = e.RemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-xbcvwin2", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPRemovedEventType, instance.IDPRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-xbcvwin2", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPRemovedEventType, instance.IDPRemovedEventType}) } return handler.NewDeleteStatement( @@ -2162,7 +2162,7 @@ func (p *idpTemplateProjection) reduceIDPRemoved(event eventstore.Event) (*handl func (p *idpTemplateProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Jp0D2K", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Jp0D2K", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/idp_template_test.go b/internal/query/projection/idp_template_test.go index 5e33aebe8..8490810d8 100644 --- a/internal/query/projection/idp_template_test.go +++ b/internal/query/projection/idp_template_test.go @@ -7,11 +7,11 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -150,7 +150,7 @@ func TestIDPTemplateProjection_reducesRemove(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -426,7 +426,7 @@ func TestIDPTemplateProjection_reducesOAuth(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -750,7 +750,7 @@ func TestIDPTemplateProjection_reducesAzureAD(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -1002,7 +1002,7 @@ func TestIDPTemplateProjection_reducesGitHub(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -1272,7 +1272,7 @@ func TestIDPTemplateProjection_reducesGitHubEnterprise(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -1522,7 +1522,7 @@ func TestIDPTemplateProjection_reducesGitLab(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -1780,7 +1780,7 @@ func TestIDPTemplateProjection_reducesGitLabSelfHosted(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -2030,7 +2030,7 @@ func TestIDPTemplateProjection_reducesGoogle(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -2423,7 +2423,7 @@ func TestIDPTemplateProjection_reducesLDAP(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -2681,7 +2681,7 @@ func TestIDPTemplateProjection_reducesApple(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -2967,7 +2967,7 @@ func TestIDPTemplateProjection_reducesSAML(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -3497,7 +3497,7 @@ func TestIDPTemplateProjection_reducesOIDC(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -4084,7 +4084,7 @@ func TestIDPTemplateProjection_reducesOldConfig(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } @@ -4326,7 +4326,7 @@ func TestIDPTemplateProjection_reducesJWT(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/idp_test.go b/internal/query/projection/idp_test.go index bedd528cd..37c86b851 100644 --- a/internal/query/projection/idp_test.go +++ b/internal/query/projection/idp_test.go @@ -5,11 +5,11 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestIDPProjection_reduces(t *testing.T) { @@ -920,7 +920,7 @@ func TestIDPProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/idp_user_link.go b/internal/query/projection/idp_user_link.go index ce588a20e..0449d9d0b 100644 --- a/internal/query/projection/idp_user_link.go +++ b/internal/query/projection/idp_user_link.go @@ -3,13 +3,13 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -116,7 +116,7 @@ func (p *idpUserLinkProjection) Reducers() []handler.AggregateReducer { func (p *idpUserLinkProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserIDPLinkAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-DpmXq", "reduce.wrong.event.type %s", user.UserIDPLinkAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-DpmXq", "reduce.wrong.event.type %s", user.UserIDPLinkAddedType) } return handler.NewCreateStatement(e, @@ -137,7 +137,7 @@ func (p *idpUserLinkProjection) reduceAdded(event eventstore.Event) (*handler.St func (p *idpUserLinkProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserIDPLinkRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-AZmfJ", "reduce.wrong.event.type %s", user.UserIDPLinkRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-AZmfJ", "reduce.wrong.event.type %s", user.UserIDPLinkRemovedType) } return handler.NewDeleteStatement(e, @@ -153,7 +153,7 @@ func (p *idpUserLinkProjection) reduceRemoved(event eventstore.Event) (*handler. func (p *idpUserLinkProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserIDPLinkCascadeRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-jQpv9", "reduce.wrong.event.type %s", user.UserIDPLinkCascadeRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-jQpv9", "reduce.wrong.event.type %s", user.UserIDPLinkCascadeRemovedType) } return handler.NewDeleteStatement(e, @@ -169,7 +169,7 @@ func (p *idpUserLinkProjection) reduceCascadeRemoved(event eventstore.Event) (*h func (p *idpUserLinkProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-PGiAY", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-PGiAY", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( @@ -184,7 +184,7 @@ func (p *idpUserLinkProjection) reduceOwnerRemoved(event eventstore.Event) (*han func (p *idpUserLinkProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-uwlWE", "reduce.wrong.event.type %s", user.UserRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-uwlWE", "reduce.wrong.event.type %s", user.UserRemovedType) } return handler.NewDeleteStatement(e, @@ -198,7 +198,7 @@ func (p *idpUserLinkProjection) reduceUserRemoved(event eventstore.Event) (*hand func (p *idpUserLinkProjection) reduceExternalIDMigrated(event eventstore.Event) (*handler.Statement, error) { e, err := assertEvent[*user.UserIDPExternalIDMigratedEvent](event) if err != nil { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-AS3th", "reduce.wrong.event.type %s", user.UserIDPExternalIDMigratedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-AS3th", "reduce.wrong.event.type %s", user.UserIDPExternalIDMigratedType) } return handler.NewUpdateStatement(e, @@ -225,7 +225,7 @@ func (p *idpUserLinkProjection) reduceIDPConfigRemoved(event eventstore.Event) ( case *instance.IDPConfigRemovedEvent: idpID = e.ConfigID default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-iCKSj", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigRemovedEventType, instance.IDPConfigRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-iCKSj", "reduce.wrong.event.type %v", []eventstore.EventType{org.IDPConfigRemovedEventType, instance.IDPConfigRemovedEventType}) } return handler.NewDeleteStatement(event, diff --git a/internal/query/projection/idp_user_link_test.go b/internal/query/projection/idp_user_link_test.go index a5e860844..6024cbcbe 100644 --- a/internal/query/projection/idp_user_link_test.go +++ b/internal/query/projection/idp_user_link_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestIDPUserLinkProjection_reduces(t *testing.T) { @@ -303,7 +303,7 @@ func TestIDPUserLinkProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/instance.go b/internal/query/projection/instance.go index 68a110606..9f46ee22f 100644 --- a/internal/query/projection/instance.go +++ b/internal/query/projection/instance.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -95,7 +95,7 @@ func (p *instanceProjection) Reducers() []handler.AggregateReducer { func (p *instanceProjection) reduceInstanceAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.InstanceAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-29nlS", "reduce.wrong.event.type %s", instance.InstanceAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-29nlS", "reduce.wrong.event.type %s", instance.InstanceAddedEventType) } return handler.NewCreateStatement( e, @@ -113,7 +113,7 @@ func reduceInstanceRemovedHelper(instanceIDCol string) func(event eventstore.Eve return func(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.InstanceRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-22nlS", "reduce.wrong.event.type %s", instance.InstanceRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-22nlS", "reduce.wrong.event.type %s", instance.InstanceRemovedEventType) } return handler.NewDeleteStatement( e, @@ -127,7 +127,7 @@ func reduceInstanceRemovedHelper(instanceIDCol string) func(event eventstore.Eve func (p *instanceProjection) reduceInstanceChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.InstanceChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-so2am1", "reduce.wrong.event.type %s", instance.InstanceChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-so2am1", "reduce.wrong.event.type %s", instance.InstanceChangedEventType) } return handler.NewUpdateStatement( e, @@ -145,7 +145,7 @@ func (p *instanceProjection) reduceInstanceChanged(event eventstore.Event) (*han func (p *instanceProjection) reduceDefaultOrgSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.DefaultOrgSetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-2n9f2", "reduce.wrong.event.type %s", instance.DefaultOrgSetEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-2n9f2", "reduce.wrong.event.type %s", instance.DefaultOrgSetEventType) } return handler.NewUpdateStatement( e, @@ -163,7 +163,7 @@ func (p *instanceProjection) reduceDefaultOrgSet(event eventstore.Event) (*handl func (p *instanceProjection) reduceIAMProjectSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.ProjectSetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-30o0e", "reduce.wrong.event.type %s", instance.ProjectSetEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-30o0e", "reduce.wrong.event.type %s", instance.ProjectSetEventType) } return handler.NewUpdateStatement( e, @@ -181,7 +181,7 @@ func (p *instanceProjection) reduceIAMProjectSet(event eventstore.Event) (*handl func (p *instanceProjection) reduceConsoleSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.ConsoleSetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Dgf11", "reduce.wrong.event.type %s", instance.ConsoleSetEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Dgf11", "reduce.wrong.event.type %s", instance.ConsoleSetEventType) } return handler.NewUpdateStatement( e, @@ -200,7 +200,7 @@ func (p *instanceProjection) reduceConsoleSet(event eventstore.Event) (*handler. func (p *instanceProjection) reduceDefaultLanguageSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.DefaultLanguageSetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-30o0e", "reduce.wrong.event.type %s", instance.DefaultLanguageSetEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-30o0e", "reduce.wrong.event.type %s", instance.DefaultLanguageSetEventType) } return handler.NewUpdateStatement( e, diff --git a/internal/query/projection/instance_domain.go b/internal/query/projection/instance_domain.go index 8eff389ce..4be3c5834 100644 --- a/internal/query/projection/instance_domain.go +++ b/internal/query/projection/instance_domain.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -82,7 +82,7 @@ func (p *instanceDomainProjection) Reducers() []handler.AggregateReducer { func (p *instanceDomainProjection) reduceDomainAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.DomainAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-38nNf", "reduce.wrong.event.type %s", instance.InstanceDomainAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-38nNf", "reduce.wrong.event.type %s", instance.InstanceDomainAddedEventType) } return handler.NewCreateStatement( e, @@ -101,7 +101,7 @@ func (p *instanceDomainProjection) reduceDomainAdded(event eventstore.Event) (*h func (p *instanceDomainProjection) reduceDomainPrimarySet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.DomainPrimarySetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-f8nlw", "reduce.wrong.event.type %s", instance.InstanceDomainPrimarySetEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-f8nlw", "reduce.wrong.event.type %s", instance.InstanceDomainPrimarySetEventType) } return handler.NewMultiStatement( e, @@ -133,7 +133,7 @@ func (p *instanceDomainProjection) reduceDomainPrimarySet(event eventstore.Event func (p *instanceDomainProjection) reduceDomainRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.DomainRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-388Nk", "reduce.wrong.event.type %s", instance.InstanceDomainRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-388Nk", "reduce.wrong.event.type %s", instance.InstanceDomainRemovedEventType) } return handler.NewDeleteStatement( e, diff --git a/internal/query/projection/instance_domain_test.go b/internal/query/projection/instance_domain_test.go index 7997bc0a8..d8bf93a5f 100644 --- a/internal/query/projection/instance_domain_test.go +++ b/internal/query/projection/instance_domain_test.go @@ -3,10 +3,10 @@ package projection import ( "testing" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestInstanceDomainProjection_reduces(t *testing.T) { @@ -109,7 +109,7 @@ func TestInstanceDomainProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/instance_member.go b/internal/query/projection/instance_member.go index f58d09810..ef71a4bf5 100644 --- a/internal/query/projection/instance_member.go +++ b/internal/query/projection/instance_member.go @@ -3,13 +3,13 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -102,7 +102,7 @@ func (p *instanceMemberProjection) Reducers() []handler.AggregateReducer { func (p *instanceMemberProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.MemberAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-pGNCu", "reduce.wrong.event.type %s", instance.MemberAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-pGNCu", "reduce.wrong.event.type %s", instance.MemberAddedEventType) } ctx := setMemberContext(e.Aggregate()) userOwner, err := getResourceOwnerOfUser(ctx, p.es, e.Aggregate().InstanceID, e.UserID) @@ -115,7 +115,7 @@ func (p *instanceMemberProjection) reduceAdded(event eventstore.Event) (*handler func (p *instanceMemberProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.MemberChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-5WQcZ", "reduce.wrong.event.type %s", instance.MemberChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-5WQcZ", "reduce.wrong.event.type %s", instance.MemberChangedEventType) } return reduceMemberChanged(e.MemberChangedEvent) } @@ -123,7 +123,7 @@ func (p *instanceMemberProjection) reduceChanged(event eventstore.Event) (*handl func (p *instanceMemberProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.MemberCascadeRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Dmdf2", "reduce.wrong.event.type %s", instance.MemberCascadeRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Dmdf2", "reduce.wrong.event.type %s", instance.MemberCascadeRemovedEventType) } return reduceMemberCascadeRemoved(e.MemberCascadeRemovedEvent) } @@ -131,7 +131,7 @@ func (p *instanceMemberProjection) reduceCascadeRemoved(event eventstore.Event) func (p *instanceMemberProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.MemberRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-exVqy", "reduce.wrong.event.type %s", instance.MemberRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-exVqy", "reduce.wrong.event.type %s", instance.MemberRemovedEventType) } return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.UserID)) } @@ -139,7 +139,7 @@ func (p *instanceMemberProjection) reduceRemoved(event eventstore.Event) (*handl func (p *instanceMemberProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-mkDHF", "reduce.wrong.event.type %s", user.UserRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-mkDHF", "reduce.wrong.event.type %s", user.UserRemovedType) } return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.Aggregate().ID)) } @@ -147,7 +147,7 @@ func (p *instanceMemberProjection) reduceUserRemoved(event eventstore.Event) (*h func (p *instanceMemberProjection) reduceUserOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-mkDHa", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-mkDHa", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return reduceMemberUserOwnerRemoved(e) } diff --git a/internal/query/projection/instance_member_test.go b/internal/query/projection/instance_member_test.go index 563140743..22490ddc4 100644 --- a/internal/query/projection/instance_member_test.go +++ b/internal/query/projection/instance_member_test.go @@ -8,12 +8,12 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestInstanceMemberProjection_reduces(t *testing.T) { @@ -256,7 +256,7 @@ func TestInstanceMemberProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/instance_test.go b/internal/query/projection/instance_test.go index 274e28f3f..8228c2308 100644 --- a/internal/query/projection/instance_test.go +++ b/internal/query/projection/instance_test.go @@ -3,10 +3,10 @@ package projection import ( "testing" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestInstanceProjection_reduces(t *testing.T) { @@ -167,7 +167,7 @@ func TestInstanceProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/key.go b/internal/query/projection/key.go index d15cb62ea..37581aab3 100644 --- a/internal/query/projection/key.go +++ b/internal/query/projection/key.go @@ -5,12 +5,12 @@ import ( "time" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -141,7 +141,7 @@ func (p *keyProjection) Reducers() []handler.AggregateReducer { func (p *keyProjection) reduceKeyPairAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*keypair.AddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAbr2", "reduce.wrong.event.type %s", keypair.AddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SAbr2", "reduce.wrong.event.type %s", keypair.AddedEventType) } if e.PrivateKey.Expiry.Before(time.Now()) && e.PublicKey.Expiry.Before(time.Now()) { return handler.NewNoOpStatement(e), nil @@ -174,7 +174,7 @@ func (p *keyProjection) reduceKeyPairAdded(event eventstore.Event) (*handler.Sta if e.PublicKey.Expiry.After(time.Now()) { publicKey, err := crypto.Decrypt(e.PublicKey.Key, p.encryptionAlgorithm) if err != nil { - return nil, errors.ThrowInternal(err, "HANDL-DAg2f", "cannot decrypt public key") + return nil, zerrors.ThrowInternal(err, "HANDL-DAg2f", "cannot decrypt public key") } creates = append(creates, handler.AddCreateStatement( []handler.Column{ @@ -193,7 +193,7 @@ func (p *keyProjection) reduceKeyPairAdded(event eventstore.Event) (*handler.Sta func (p *keyProjection) reduceCertificateAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*keypair.AddedCertificateEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAbr09", "reduce.wrong.event.type %s", keypair.AddedCertificateEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SAbr09", "reduce.wrong.event.type %s", keypair.AddedCertificateEventType) } if e.Certificate.Expiry.Before(time.Now()) { @@ -202,7 +202,7 @@ func (p *keyProjection) reduceCertificateAdded(event eventstore.Event) (*handler certificate, err := crypto.Decrypt(e.Certificate.Key, p.certEncryptionAlgorithm) if err != nil { - return nil, errors.ThrowInternal(err, "HANDL-Dajwig2f", "cannot decrypt certificate") + return nil, zerrors.ThrowInternal(err, "HANDL-Dajwig2f", "cannot decrypt certificate") } creates := []func(eventstore.Event) handler.Exec{handler.AddCreateStatement( diff --git a/internal/query/projection/key_test.go b/internal/query/projection/key_test.go index 26e56b731..7022c1b9e 100644 --- a/internal/query/projection/key_test.go +++ b/internal/query/projection/key_test.go @@ -9,11 +9,11 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/keypair" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestKeyProjection_reduces(t *testing.T) { @@ -159,7 +159,7 @@ func TestKeyProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/label_policy.go b/internal/query/projection/label_policy.go index 49f69738e..dd9c1d07d 100644 --- a/internal/query/projection/label_policy.go +++ b/internal/query/projection/label_policy.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -242,7 +242,7 @@ func (p *labelPolicyProjection) reduceAdded(event eventstore.Event) (*handler.St policyEvent = e.LabelPolicyAddedEvent isDefault = true default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-CSE7A", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyAddedEventType, instance.LabelPolicyAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-CSE7A", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyAddedEventType, instance.LabelPolicyAddedEventType}) } return handler.NewCreateStatement( &policyEvent, @@ -278,7 +278,7 @@ func (p *labelPolicyProjection) reduceChanged(event eventstore.Event) (*handler. case *instance.LabelPolicyChangedEvent: policyEvent = e.LabelPolicyChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-qgVug", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyChangedEventType, instance.LabelPolicyChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-qgVug", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyChangedEventType, instance.LabelPolicyChangedEventType}) } cols := []handler.Column{ handler.NewCol(LabelPolicyChangeDateCol, policyEvent.CreatedAt()), @@ -333,7 +333,7 @@ func (p *labelPolicyProjection) reduceChanged(event eventstore.Event) (*handler. func (p *labelPolicyProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { policyEvent, ok := event.(*org.LabelPolicyRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-ATMBz", "reduce.wrong.event.type %s", org.LabelPolicyRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-ATMBz", "reduce.wrong.event.type %s", org.LabelPolicyRemovedEventType) } return handler.NewDeleteStatement( policyEvent, @@ -348,7 +348,7 @@ func (p *labelPolicyProjection) reduceActivated(event eventstore.Event) (*handle case *org.LabelPolicyActivatedEvent, *instance.LabelPolicyActivatedEvent: // everything ok default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-dldEU", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyActivatedEventType, instance.LabelPolicyActivatedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-dldEU", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyActivatedEventType, instance.LabelPolicyActivatedEventType}) } return handler.NewCopyStatement( event, @@ -430,7 +430,7 @@ func (p *labelPolicyProjection) reduceLogoAdded(event eventstore.Event) (*handle case *instance.LabelPolicyLogoDarkAddedEvent: storeKey = handler.NewCol(LabelPolicyDarkLogoURLCol, e.StoreKey) default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-4wbOI", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyLogoAddedEventType, instance.LabelPolicyLogoAddedEventType, org.LabelPolicyLogoDarkAddedEventType, instance.LabelPolicyLogoDarkAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-4wbOI", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyLogoAddedEventType, instance.LabelPolicyLogoAddedEventType, org.LabelPolicyLogoDarkAddedEventType, instance.LabelPolicyLogoDarkAddedEventType}) } return handler.NewUpdateStatement( @@ -459,7 +459,7 @@ func (p *labelPolicyProjection) reduceLogoRemoved(event eventstore.Event) (*hand case *instance.LabelPolicyLogoDarkRemovedEvent: col = LabelPolicyDarkLogoURLCol default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-kg8H4", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyLogoRemovedEventType, instance.LabelPolicyLogoRemovedEventType, org.LabelPolicyLogoDarkRemovedEventType, instance.LabelPolicyLogoDarkRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-kg8H4", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyLogoRemovedEventType, instance.LabelPolicyLogoRemovedEventType, org.LabelPolicyLogoDarkRemovedEventType, instance.LabelPolicyLogoDarkRemovedEventType}) } return handler.NewUpdateStatement( @@ -488,7 +488,7 @@ func (p *labelPolicyProjection) reduceIconAdded(event eventstore.Event) (*handle case *instance.LabelPolicyIconDarkAddedEvent: storeKey = handler.NewCol(LabelPolicyDarkIconURLCol, e.StoreKey) default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-e2JFz", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyIconAddedEventType, instance.LabelPolicyIconAddedEventType, org.LabelPolicyIconDarkAddedEventType, instance.LabelPolicyIconDarkAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-e2JFz", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyIconAddedEventType, instance.LabelPolicyIconAddedEventType, org.LabelPolicyIconDarkAddedEventType, instance.LabelPolicyIconDarkAddedEventType}) } return handler.NewUpdateStatement( @@ -517,7 +517,7 @@ func (p *labelPolicyProjection) reduceIconRemoved(event eventstore.Event) (*hand case *instance.LabelPolicyIconDarkRemovedEvent: col = LabelPolicyDarkIconURLCol default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-gfgbY", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyIconRemovedEventType, instance.LabelPolicyIconRemovedEventType, org.LabelPolicyIconDarkRemovedEventType, instance.LabelPolicyIconDarkRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-gfgbY", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyIconRemovedEventType, instance.LabelPolicyIconRemovedEventType, org.LabelPolicyIconDarkRemovedEventType, instance.LabelPolicyIconDarkRemovedEventType}) } return handler.NewUpdateStatement( @@ -542,7 +542,7 @@ func (p *labelPolicyProjection) reduceFontAdded(event eventstore.Event) (*handle case *instance.LabelPolicyFontAddedEvent: storeKey = handler.NewCol(LabelPolicyFontURLCol, e.StoreKey) default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-65i9W", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyFontAddedEventType, instance.LabelPolicyFontAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-65i9W", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyFontAddedEventType, instance.LabelPolicyFontAddedEventType}) } return handler.NewUpdateStatement( @@ -567,7 +567,7 @@ func (p *labelPolicyProjection) reduceFontRemoved(event eventstore.Event) (*hand case *instance.LabelPolicyFontRemovedEvent: col = LabelPolicyFontURLCol default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-xf32J", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyFontRemovedEventType, instance.LabelPolicyFontRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-xf32J", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyFontRemovedEventType, instance.LabelPolicyFontRemovedEventType}) } return handler.NewUpdateStatement( @@ -589,7 +589,7 @@ func (p *labelPolicyProjection) reduceAssetsRemoved(event eventstore.Event) (*ha case *org.LabelPolicyAssetsRemovedEvent, *instance.LabelPolicyAssetsRemovedEvent: //ok default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-qi39A", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyAssetsRemovedEventType, instance.LabelPolicyAssetsRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-qi39A", "reduce.wrong.event.type %v", []eventstore.EventType{org.LabelPolicyAssetsRemovedEventType, instance.LabelPolicyAssetsRemovedEventType}) } return handler.NewUpdateStatement( @@ -613,7 +613,7 @@ func (p *labelPolicyProjection) reduceAssetsRemoved(event eventstore.Event) (*ha func (p *labelPolicyProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Su6pX", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Su6pX", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/label_policy_test.go b/internal/query/projection/label_policy_test.go index 202e8cd32..4fbc8b17a 100644 --- a/internal/query/projection/label_policy_test.go +++ b/internal/query/projection/label_policy_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestLabelPolicyProjection_reduces(t *testing.T) { @@ -1025,7 +1025,7 @@ func TestLabelPolicyProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/limits_test.go b/internal/query/projection/limits_test.go index 0277e2924..b5b8e0ad4 100644 --- a/internal/query/projection/limits_test.go +++ b/internal/query/projection/limits_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/limits" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestLimitsProjection_reduces(t *testing.T) { @@ -85,7 +85,7 @@ func TestLimitsProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } event = tt.args.event(t) diff --git a/internal/query/projection/lockout_policy.go b/internal/query/projection/lockout_policy.go index 9ab9f6f51..ceb99c2aa 100644 --- a/internal/query/projection/lockout_policy.go +++ b/internal/query/projection/lockout_policy.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -114,7 +114,7 @@ func (p *lockoutPolicyProjection) reduceAdded(event eventstore.Event) (*handler. policyEvent = e.LockoutPolicyAddedEvent isDefault = true default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-d8mZO", "reduce.wrong.event.type, %v", []eventstore.EventType{org.LockoutPolicyAddedEventType, instance.LockoutPolicyAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-d8mZO", "reduce.wrong.event.type, %v", []eventstore.EventType{org.LockoutPolicyAddedEventType, instance.LockoutPolicyAddedEventType}) } return handler.NewCreateStatement( &policyEvent, @@ -140,7 +140,7 @@ func (p *lockoutPolicyProjection) reduceChanged(event eventstore.Event) (*handle case *instance.LockoutPolicyChangedEvent: policyEvent = e.LockoutPolicyChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-pT3mQ", "reduce.wrong.event.type, %v", []eventstore.EventType{org.LockoutPolicyChangedEventType, instance.LockoutPolicyChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-pT3mQ", "reduce.wrong.event.type, %v", []eventstore.EventType{org.LockoutPolicyChangedEventType, instance.LockoutPolicyChangedEventType}) } cols := []handler.Column{ handler.NewCol(LockoutPolicyChangeDateCol, policyEvent.CreationDate()), @@ -164,7 +164,7 @@ func (p *lockoutPolicyProjection) reduceChanged(event eventstore.Event) (*handle func (p *lockoutPolicyProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { policyEvent, ok := event.(*org.LockoutPolicyRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Bqut9", "reduce.wrong.event.type %s", org.LockoutPolicyRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Bqut9", "reduce.wrong.event.type %s", org.LockoutPolicyRemovedEventType) } return handler.NewDeleteStatement( policyEvent, @@ -177,7 +177,7 @@ func (p *lockoutPolicyProjection) reduceRemoved(event eventstore.Event) (*handle func (p *lockoutPolicyProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-IoW0x", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-IoW0x", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/lockout_policy_test.go b/internal/query/projection/lockout_policy_test.go index 65e712574..781f3a48c 100644 --- a/internal/query/projection/lockout_policy_test.go +++ b/internal/query/projection/lockout_policy_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestLockoutPolicyProjection_reduces(t *testing.T) { @@ -250,7 +250,7 @@ func TestLockoutPolicyProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/login_name.go b/internal/query/projection/login_name.go index 44058e587..3c31928af 100644 --- a/internal/query/projection/login_name.go +++ b/internal/query/projection/login_name.go @@ -6,7 +6,6 @@ import ( sq "github.com/Masterminds/squirrel" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" @@ -14,6 +13,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -340,7 +340,7 @@ func (p *loginNameProjection) reduceUserCreated(event eventstore.Event) (*handle case *user.MachineAddedEvent: userName = e.UserName default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ayo69", "reduce.wrong.event.type %v", []eventstore.EventType{user.UserV1AddedType, user.HumanAddedType, user.UserV1RegisteredType, user.HumanRegisteredType, user.MachineAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ayo69", "reduce.wrong.event.type %v", []eventstore.EventType{user.UserV1AddedType, user.HumanAddedType, user.UserV1RegisteredType, user.HumanRegisteredType, user.MachineAddedEventType}) } return handler.NewCreateStatement( @@ -358,7 +358,7 @@ func (p *loginNameProjection) reduceUserCreated(event eventstore.Event) (*handle func (p *loginNameProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-QIe3C", "reduce.wrong.event.type %s", user.UserRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-QIe3C", "reduce.wrong.event.type %s", user.UserRemovedType) } return handler.NewDeleteStatement( @@ -374,7 +374,7 @@ func (p *loginNameProjection) reduceUserRemoved(event eventstore.Event) (*handle func (p *loginNameProjection) reduceUserNameChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UsernameChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-QlwjC", "reduce.wrong.event.type %s", user.UserUserNameChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-QlwjC", "reduce.wrong.event.type %s", user.UserUserNameChangedType) } return handler.NewUpdateStatement( @@ -393,7 +393,7 @@ func (p *loginNameProjection) reduceUserNameChanged(event eventstore.Event) (*ha func (p *loginNameProjection) reduceUserDomainClaimed(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.DomainClaimedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-AQMBY", "reduce.wrong.event.type %s", user.UserDomainClaimedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-AQMBY", "reduce.wrong.event.type %s", user.UserDomainClaimedType) } return handler.NewUpdateStatement( @@ -423,7 +423,7 @@ func (p *loginNameProjection) reduceOrgIAMPolicyAdded(event eventstore.Event) (* policyEvent = &e.DomainPolicyAddedEvent isDefault = true default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-yCV6S", "reduce.wrong.event.type %v", []eventstore.EventType{org.DomainPolicyAddedEventType, instance.DomainPolicyAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-yCV6S", "reduce.wrong.event.type %v", []eventstore.EventType{org.DomainPolicyAddedEventType, instance.DomainPolicyAddedEventType}) } return handler.NewCreateStatement( @@ -447,7 +447,7 @@ func (p *loginNameProjection) reduceDomainPolicyChanged(event eventstore.Event) case *instance.DomainPolicyChangedEvent: policyEvent = &e.DomainPolicyChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ArFDd", "reduce.wrong.event.type %v", []eventstore.EventType{org.DomainPolicyChangedEventType, instance.DomainPolicyChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ArFDd", "reduce.wrong.event.type %v", []eventstore.EventType{org.DomainPolicyChangedEventType, instance.DomainPolicyChangedEventType}) } if policyEvent.UserLoginMustBeDomain == nil { @@ -470,7 +470,7 @@ func (p *loginNameProjection) reduceDomainPolicyChanged(event eventstore.Event) func (p *loginNameProjection) reduceDomainPolicyRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.DomainPolicyRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ysEeB", "reduce.wrong.event.type %s", org.DomainPolicyRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ysEeB", "reduce.wrong.event.type %s", org.DomainPolicyRemovedEventType) } return handler.NewDeleteStatement( @@ -486,7 +486,7 @@ func (p *loginNameProjection) reduceDomainPolicyRemoved(event eventstore.Event) func (p *loginNameProjection) reduceDomainVerified(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.DomainVerifiedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-weGAh", "reduce.wrong.event.type %s", org.OrgDomainVerifiedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-weGAh", "reduce.wrong.event.type %s", org.OrgDomainVerifiedEventType) } return handler.NewCreateStatement( @@ -503,7 +503,7 @@ func (p *loginNameProjection) reduceDomainVerified(event eventstore.Event) (*han func (p *loginNameProjection) reducePrimaryDomainSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.DomainPrimarySetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-eOXPN", "reduce.wrong.event.type %s", org.OrgDomainPrimarySetEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-eOXPN", "reduce.wrong.event.type %s", org.OrgDomainPrimarySetEventType) } return handler.NewMultiStatement( @@ -536,7 +536,7 @@ func (p *loginNameProjection) reducePrimaryDomainSet(event eventstore.Event) (*h func (p *loginNameProjection) reduceDomainRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.DomainRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-4RHYq", "reduce.wrong.event.type %s", org.OrgDomainRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-4RHYq", "reduce.wrong.event.type %s", org.OrgDomainRemovedEventType) } return handler.NewDeleteStatement( @@ -553,7 +553,7 @@ func (p *loginNameProjection) reduceDomainRemoved(event eventstore.Event) (*hand func (p *loginNameProjection) reduceInstanceRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.InstanceRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ASeg3", "reduce.wrong.event.type %s", instance.InstanceRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ASeg3", "reduce.wrong.event.type %s", instance.InstanceRemovedEventType) } return handler.NewMultiStatement( @@ -582,7 +582,7 @@ func (p *loginNameProjection) reduceInstanceRemoved(event eventstore.Event) (*ha func (p *loginNameProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-px02mo", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-px02mo", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewMultiStatement( diff --git a/internal/query/projection/login_name_test.go b/internal/query/projection/login_name_test.go index 019f6fd0a..dcab0a857 100644 --- a/internal/query/projection/login_name_test.go +++ b/internal/query/projection/login_name_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestLoginNameProjection_reduces(t *testing.T) { @@ -572,7 +572,7 @@ func TestLoginNameProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/login_policy.go b/internal/query/projection/login_policy.go index 3101accbe..024f727d6 100644 --- a/internal/query/projection/login_policy.go +++ b/internal/query/projection/login_policy.go @@ -3,13 +3,13 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -175,7 +175,7 @@ func (p *loginPolicyProjection) reduceLoginPolicyAdded(event eventstore.Event) ( policyEvent = e.LoginPolicyAddedEvent isDefault = false default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-pYPxS", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyAddedEventType, instance.LoginPolicyAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-pYPxS", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyAddedEventType, instance.LoginPolicyAddedEventType}) } return handler.NewCreateStatement(&policyEvent, []handler.Column{ @@ -213,7 +213,7 @@ func (p *loginPolicyProjection) reduceLoginPolicyChanged(event eventstore.Event) case *org.LoginPolicyChangedEvent: policyEvent = e.LoginPolicyChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-BpaO6", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyChangedEventType, instance.LoginPolicyChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-BpaO6", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyChangedEventType, instance.LoginPolicyChangedEventType}) } cols := []handler.Column{ @@ -290,7 +290,7 @@ func (p *loginPolicyProjection) reduceMFAAdded(event eventstore.Event) (*handler case *org.LoginPolicyMultiFactorAddedEvent: policyEvent = e.MultiFactorAddedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-WMhAV", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyMultiFactorAddedEventType, instance.LoginPolicyMultiFactorAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-WMhAV", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyMultiFactorAddedEventType, instance.LoginPolicyMultiFactorAddedEventType}) } return handler.NewUpdateStatement( @@ -315,7 +315,7 @@ func (p *loginPolicyProjection) reduceMFARemoved(event eventstore.Event) (*handl case *org.LoginPolicyMultiFactorRemovedEvent: policyEvent = e.MultiFactorRemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-czU7n", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyMultiFactorRemovedEventType, instance.LoginPolicyMultiFactorRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-czU7n", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicyMultiFactorRemovedEventType, instance.LoginPolicyMultiFactorRemovedEventType}) } return handler.NewUpdateStatement( @@ -335,7 +335,7 @@ func (p *loginPolicyProjection) reduceMFARemoved(event eventstore.Event) (*handl func (p *loginPolicyProjection) reduceLoginPolicyRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.LoginPolicyRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-oRSvD", "reduce.wrong.event.type %s", org.LoginPolicyRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-oRSvD", "reduce.wrong.event.type %s", org.LoginPolicyRemovedEventType) } return handler.NewDeleteStatement( e, @@ -354,7 +354,7 @@ func (p *loginPolicyProjection) reduceSecondFactorAdded(event eventstore.Event) case *org.LoginPolicySecondFactorAddedEvent: policyEvent = e.SecondFactorAddedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-agB2E", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicySecondFactorAddedEventType, instance.LoginPolicySecondFactorAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-agB2E", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicySecondFactorAddedEventType, instance.LoginPolicySecondFactorAddedEventType}) } return handler.NewUpdateStatement( @@ -379,7 +379,7 @@ func (p *loginPolicyProjection) reduceSecondFactorRemoved(event eventstore.Event case *org.LoginPolicySecondFactorRemovedEvent: policyEvent = e.SecondFactorRemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-KYJvA", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicySecondFactorRemovedEventType, instance.LoginPolicySecondFactorRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-KYJvA", "reduce.wrong.event.type %v", []eventstore.EventType{org.LoginPolicySecondFactorRemovedEventType, instance.LoginPolicySecondFactorRemovedEventType}) } return handler.NewUpdateStatement( @@ -399,7 +399,7 @@ func (p *loginPolicyProjection) reduceSecondFactorRemoved(event eventstore.Event func (p *loginPolicyProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-B8NZW", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-B8NZW", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/login_policy_test.go b/internal/query/projection/login_policy_test.go index 4ebfa3483..1f10e63be 100644 --- a/internal/query/projection/login_policy_test.go +++ b/internal/query/projection/login_policy_test.go @@ -5,11 +5,11 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestLoginPolicyProjection_reduces(t *testing.T) { @@ -739,7 +739,7 @@ func TestLoginPolicyProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/mail_template.go b/internal/query/projection/mail_template.go index 91bab4c65..e5b4e0b90 100644 --- a/internal/query/projection/mail_template.go +++ b/internal/query/projection/mail_template.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -110,7 +110,7 @@ func (p *mailTemplateProjection) reduceAdded(event eventstore.Event) (*handler.S templateEvent = e.MailTemplateAddedEvent isDefault = true default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-0pJ3f", "reduce.wrong.event.type, %v", []eventstore.EventType{org.MailTemplateAddedEventType, instance.MailTemplateAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-0pJ3f", "reduce.wrong.event.type, %v", []eventstore.EventType{org.MailTemplateAddedEventType, instance.MailTemplateAddedEventType}) } return handler.NewCreateStatement( &templateEvent, @@ -134,7 +134,7 @@ func (p *mailTemplateProjection) reduceChanged(event eventstore.Event) (*handler case *instance.MailTemplateChangedEvent: policyEvent = e.MailTemplateChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-gJ03f", "reduce.wrong.event.type, %v", []eventstore.EventType{org.MailTemplateChangedEventType, instance.MailTemplateChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-gJ03f", "reduce.wrong.event.type, %v", []eventstore.EventType{org.MailTemplateChangedEventType, instance.MailTemplateChangedEventType}) } cols := []handler.Column{ handler.NewCol(MailTemplateChangeDateCol, policyEvent.CreationDate()), @@ -155,7 +155,7 @@ func (p *mailTemplateProjection) reduceChanged(event eventstore.Event) (*handler func (p *mailTemplateProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { policyEvent, ok := event.(*org.MailTemplateRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-3jJGs", "reduce.wrong.event.type %s", org.MailTemplateRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-3jJGs", "reduce.wrong.event.type %s", org.MailTemplateRemovedEventType) } return handler.NewDeleteStatement( policyEvent, @@ -168,7 +168,7 @@ func (p *mailTemplateProjection) reduceRemoved(event eventstore.Event) (*handler func (p *mailTemplateProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-CThXR", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-CThXR", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/mail_template_test.go b/internal/query/projection/mail_template_test.go index 336ad394f..39a7e4526 100644 --- a/internal/query/projection/mail_template_test.go +++ b/internal/query/projection/mail_template_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestMailTemplateProjection_reduces(t *testing.T) { @@ -240,7 +240,7 @@ func TestMailTemplateProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/message_text_test.go b/internal/query/projection/message_text_test.go index 0fb3f1441..7f67f946a 100644 --- a/internal/query/projection/message_text_test.go +++ b/internal/query/projection/message_text_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestMessageTextProjection_reduces(t *testing.T) { @@ -712,7 +712,7 @@ func TestMessageTextProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/message_texts.go b/internal/query/projection/message_texts.go index fd6af6c1a..4b2a2b16c 100644 --- a/internal/query/projection/message_texts.go +++ b/internal/query/projection/message_texts.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -125,7 +125,7 @@ func (p *messageTextProjection) reduceAdded(event eventstore.Event) (*handler.St case *instance.CustomTextSetEvent: templateEvent = e.CustomTextSetEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-2n90r", "reduce.wrong.event.type %v", []eventstore.EventType{org.CustomTextSetEventType, instance.CustomTextSetEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-2n90r", "reduce.wrong.event.type %v", []eventstore.EventType{org.CustomTextSetEventType, instance.CustomTextSetEventType}) } if !isMessageTemplate(templateEvent.Template) { return handler.NewNoOpStatement(event), nil @@ -182,7 +182,7 @@ func (p *messageTextProjection) reduceRemoved(event eventstore.Event) (*handler. case *instance.CustomTextRemovedEvent: templateEvent = e.CustomTextRemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-fm0ge", "reduce.wrong.event.type %v", []eventstore.EventType{org.CustomTextRemovedEventType, instance.CustomTextRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-fm0ge", "reduce.wrong.event.type %v", []eventstore.EventType{org.CustomTextRemovedEventType, instance.CustomTextRemovedEventType}) } if !isMessageTemplate(templateEvent.Template) { return handler.NewNoOpStatement(event), nil @@ -232,7 +232,7 @@ func (p *messageTextProjection) reduceTemplateRemoved(event eventstore.Event) (* case *instance.CustomTextTemplateRemovedEvent: templateEvent = e.CustomTextTemplateRemovedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-2n9rs", "reduce.wrong.event.type %s", org.CustomTextTemplateRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-2n9rs", "reduce.wrong.event.type %s", org.CustomTextTemplateRemovedEventType) } if !isMessageTemplate(templateEvent.Template) { return handler.NewNoOpStatement(event), nil @@ -251,7 +251,7 @@ func (p *messageTextProjection) reduceTemplateRemoved(event eventstore.Event) (* func (p *messageTextProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-mLsQw", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-mLsQw", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/milestones_test.go b/internal/query/projection/milestones_test.go index fd606538a..884c7e27d 100644 --- a/internal/query/projection/milestones_test.go +++ b/internal/query/projection/milestones_test.go @@ -5,13 +5,13 @@ import ( "time" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/milestone" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestMilestonesProjection_reduces(t *testing.T) { @@ -380,7 +380,7 @@ func TestMilestonesProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } event = tt.args.event(t) diff --git a/internal/query/projection/notification_policy.go b/internal/query/projection/notification_policy.go index 49c8618a2..4b4d50f69 100644 --- a/internal/query/projection/notification_policy.go +++ b/internal/query/projection/notification_policy.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -111,7 +111,7 @@ func (p *notificationPolicyProjection) reduceAdded(event eventstore.Event) (*han policyEvent = e.NotificationPolicyAddedEvent isDefault = true default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-x02s1m", "reduce.wrong.event.type %v", []eventstore.EventType{org.NotificationPolicyAddedEventType, instance.NotificationPolicyAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-x02s1m", "reduce.wrong.event.type %v", []eventstore.EventType{org.NotificationPolicyAddedEventType, instance.NotificationPolicyAddedEventType}) } return handler.NewCreateStatement( &policyEvent, @@ -136,7 +136,7 @@ func (p *notificationPolicyProjection) reduceChanged(event eventstore.Event) (*h case *instance.NotificationPolicyChangedEvent: policyEvent = e.NotificationPolicyChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-psom2h19", "reduce.wrong.event.type %v", []eventstore.EventType{org.NotificationPolicyChangedEventType, instance.NotificationPolicyChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-psom2h19", "reduce.wrong.event.type %v", []eventstore.EventType{org.NotificationPolicyChangedEventType, instance.NotificationPolicyChangedEventType}) } cols := []handler.Column{ handler.NewCol(NotificationPolicyColumnChangeDate, policyEvent.CreationDate()), @@ -157,7 +157,7 @@ func (p *notificationPolicyProjection) reduceChanged(event eventstore.Event) (*h func (p *notificationPolicyProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { policyEvent, ok := event.(*org.NotificationPolicyRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Po2iso2", "reduce.wrong.event.type %s", org.NotificationPolicyRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Po2iso2", "reduce.wrong.event.type %s", org.NotificationPolicyRemovedEventType) } return handler.NewDeleteStatement( policyEvent, @@ -170,7 +170,7 @@ func (p *notificationPolicyProjection) reduceRemoved(event eventstore.Event) (*h func (p *notificationPolicyProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-poxi9a", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-poxi9a", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/notification_policy_test.go b/internal/query/projection/notification_policy_test.go index b21f33b74..3da507fd2 100644 --- a/internal/query/projection/notification_policy_test.go +++ b/internal/query/projection/notification_policy_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestNotificationPolicyProjection_reduces(t *testing.T) { @@ -242,7 +242,7 @@ func TestNotificationPolicyProjection_reduces(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if ok := errors.IsErrorInvalidArgument(err); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/oidc_settings.go b/internal/query/projection/oidc_settings.go index fc53b5260..8b24b926d 100644 --- a/internal/query/projection/oidc_settings.go +++ b/internal/query/projection/oidc_settings.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -79,7 +79,7 @@ func (p *oidcSettingsProjection) Reducers() []handler.AggregateReducer { func (p *oidcSettingsProjection) reduceOIDCSettingsAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.OIDCSettingsAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-f9nwf", "reduce.wrong.event.type %s", instance.OIDCSettingsAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-f9nwf", "reduce.wrong.event.type %s", instance.OIDCSettingsAddedEventType) } return handler.NewCreateStatement( e, @@ -101,7 +101,7 @@ func (p *oidcSettingsProjection) reduceOIDCSettingsAdded(event eventstore.Event) func (p *oidcSettingsProjection) reduceOIDCSettingsChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.OIDCSettingsChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-8JJ2d", "reduce.wrong.event.type %s", instance.OIDCSettingsChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-8JJ2d", "reduce.wrong.event.type %s", instance.OIDCSettingsChangedEventType) } columns := make([]handler.Column, 0, 6) diff --git a/internal/query/projection/oidc_settings_test.go b/internal/query/projection/oidc_settings_test.go index c4d5c7b8e..b78d38d04 100644 --- a/internal/query/projection/oidc_settings_test.go +++ b/internal/query/projection/oidc_settings_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestOIDCSettingsProjection_reduces(t *testing.T) { @@ -119,7 +119,7 @@ func TestOIDCSettingsProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/org.go b/internal/query/projection/org.go index 9db19403c..271aae145 100644 --- a/internal/query/projection/org.go +++ b/internal/query/projection/org.go @@ -4,12 +4,12 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -103,7 +103,7 @@ func (p *orgProjection) Reducers() []handler.AggregateReducer { func (p *orgProjection) reduceOrgAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-uYq4r", "reduce.wrong.event.type %s", org.OrgAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-uYq4r", "reduce.wrong.event.type %s", org.OrgAddedEventType) } return handler.NewCreateStatement( e, @@ -123,7 +123,7 @@ func (p *orgProjection) reduceOrgAdded(event eventstore.Event) (*handler.Stateme func (p *orgProjection) reduceOrgChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Bg8oM", "reduce.wrong.event.type %s", org.OrgChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Bg8oM", "reduce.wrong.event.type %s", org.OrgChangedEventType) } if e.Name == "" { return handler.NewNoOpStatement(e), nil @@ -145,7 +145,7 @@ func (p *orgProjection) reduceOrgChanged(event eventstore.Event) (*handler.State func (p *orgProjection) reduceOrgDeactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgDeactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-BApK4", "reduce.wrong.event.type %s", org.OrgDeactivatedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-BApK4", "reduce.wrong.event.type %s", org.OrgDeactivatedEventType) } return handler.NewUpdateStatement( e, @@ -164,7 +164,7 @@ func (p *orgProjection) reduceOrgDeactivated(event eventstore.Event) (*handler.S func (p *orgProjection) reduceOrgReactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgReactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-o37De", "reduce.wrong.event.type %s", org.OrgReactivatedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-o37De", "reduce.wrong.event.type %s", org.OrgReactivatedEventType) } return handler.NewUpdateStatement( e, @@ -183,7 +183,7 @@ func (p *orgProjection) reduceOrgReactivated(event eventstore.Event) (*handler.S func (p *orgProjection) reducePrimaryDomainSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.DomainPrimarySetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-4TbKT", "reduce.wrong.event.type %s", org.OrgDomainPrimarySetEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-4TbKT", "reduce.wrong.event.type %s", org.OrgDomainPrimarySetEventType) } return handler.NewUpdateStatement( e, @@ -202,7 +202,7 @@ func (p *orgProjection) reducePrimaryDomainSet(event eventstore.Event) (*handler func (p *orgProjection) reduceOrgRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-DgMSg", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-DgMSg", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( e, diff --git a/internal/query/projection/org_domain.go b/internal/query/projection/org_domain.go index 21e03e922..b412b7fa3 100644 --- a/internal/query/projection/org_domain.go +++ b/internal/query/projection/org_domain.go @@ -4,12 +4,12 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -103,7 +103,7 @@ func (p *orgDomainProjection) Reducers() []handler.AggregateReducer { func (p *orgDomainProjection) reduceDomainAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.DomainAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-DM2DI", "reduce.wrong.event.type %s", org.OrgDomainAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-DM2DI", "reduce.wrong.event.type %s", org.OrgDomainAddedEventType) } return handler.NewCreateStatement( e, @@ -124,7 +124,7 @@ func (p *orgDomainProjection) reduceDomainAdded(event eventstore.Event) (*handle func (p *orgDomainProjection) reduceDomainVerificationAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.DomainVerificationAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-EBzyu", "reduce.wrong.event.type %s", org.OrgDomainVerificationAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-EBzyu", "reduce.wrong.event.type %s", org.OrgDomainVerificationAddedEventType) } return handler.NewUpdateStatement( e, @@ -144,7 +144,7 @@ func (p *orgDomainProjection) reduceDomainVerificationAdded(event eventstore.Eve func (p *orgDomainProjection) reduceDomainVerified(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.DomainVerifiedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-3Rvkr", "reduce.wrong.event.type %s", org.OrgDomainVerifiedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-3Rvkr", "reduce.wrong.event.type %s", org.OrgDomainVerifiedEventType) } return handler.NewUpdateStatement( e, @@ -164,7 +164,7 @@ func (p *orgDomainProjection) reduceDomainVerified(event eventstore.Event) (*han func (p *orgDomainProjection) reducePrimaryDomainSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.DomainPrimarySetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-aIuei", "reduce.wrong.event.type %s", org.OrgDomainPrimarySetEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-aIuei", "reduce.wrong.event.type %s", org.OrgDomainPrimarySetEventType) } return handler.NewMultiStatement( e, @@ -198,7 +198,7 @@ func (p *orgDomainProjection) reducePrimaryDomainSet(event eventstore.Event) (*h func (p *orgDomainProjection) reduceDomainRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.DomainRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-gh1Mx", "reduce.wrong.event.type %s", org.OrgDomainRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-gh1Mx", "reduce.wrong.event.type %s", org.OrgDomainRemovedEventType) } return handler.NewDeleteStatement( e, @@ -213,7 +213,7 @@ func (p *orgDomainProjection) reduceDomainRemoved(event eventstore.Event) (*hand func (p *orgDomainProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-dMUKJ", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-dMUKJ", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/org_domain_test.go b/internal/query/projection/org_domain_test.go index 0494177eb..df01b502f 100644 --- a/internal/query/projection/org_domain_test.go +++ b/internal/query/projection/org_domain_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestOrgDomainProjection_reduces(t *testing.T) { @@ -245,7 +245,7 @@ func TestOrgDomainProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/org_member.go b/internal/query/projection/org_member.go index 801b68248..37c6d241a 100644 --- a/internal/query/projection/org_member.go +++ b/internal/query/projection/org_member.go @@ -3,13 +3,13 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -101,7 +101,7 @@ func (p *orgMemberProjection) Reducers() []handler.AggregateReducer { func (p *orgMemberProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.MemberAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-uYq4r", "reduce.wrong.event.type %s", org.MemberAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-uYq4r", "reduce.wrong.event.type %s", org.MemberAddedEventType) } ctx := setMemberContext(e.Aggregate()) userOwner, err := getResourceOwnerOfUser(ctx, p.es, e.Aggregate().InstanceID, e.UserID) @@ -114,7 +114,7 @@ func (p *orgMemberProjection) reduceAdded(event eventstore.Event) (*handler.Stat func (p *orgMemberProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.MemberChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Bg8oM", "reduce.wrong.event.type %s", org.MemberChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Bg8oM", "reduce.wrong.event.type %s", org.MemberChangedEventType) } return reduceMemberChanged(e.MemberChangedEvent, withMemberCond(OrgMemberOrgIDCol, e.Aggregate().ID)) } @@ -122,7 +122,7 @@ func (p *orgMemberProjection) reduceChanged(event eventstore.Event) (*handler.St func (p *orgMemberProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.MemberCascadeRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-4twP2", "reduce.wrong.event.type %s", org.MemberCascadeRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-4twP2", "reduce.wrong.event.type %s", org.MemberCascadeRemovedEventType) } return reduceMemberCascadeRemoved(e.MemberCascadeRemovedEvent, withMemberCond(OrgMemberOrgIDCol, e.Aggregate().ID)) } @@ -130,7 +130,7 @@ func (p *orgMemberProjection) reduceCascadeRemoved(event eventstore.Event) (*han func (p *orgMemberProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.MemberRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-avatH", "reduce.wrong.event.type %s", org.MemberRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-avatH", "reduce.wrong.event.type %s", org.MemberRemovedEventType) } return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.UserID), @@ -141,7 +141,7 @@ func (p *orgMemberProjection) reduceRemoved(event eventstore.Event) (*handler.St func (p *orgMemberProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-eBMqH", "reduce.wrong.event.type %s", user.UserRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-eBMqH", "reduce.wrong.event.type %s", user.UserRemovedType) } return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.Aggregate().ID)) } @@ -149,7 +149,7 @@ func (p *orgMemberProjection) reduceUserRemoved(event eventstore.Event) (*handle func (p *orgMemberProjection) reduceOrgRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-jnGAV", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-jnGAV", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewMultiStatement( e, diff --git a/internal/query/projection/org_member_test.go b/internal/query/projection/org_member_test.go index 5737c30e8..7c8fd8679 100644 --- a/internal/query/projection/org_member_test.go +++ b/internal/query/projection/org_member_test.go @@ -8,12 +8,12 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestOrgMemberProjection_reduces(t *testing.T) { @@ -264,7 +264,7 @@ func TestOrgMemberProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/org_metadata.go b/internal/query/projection/org_metadata.go index e2e21f4e1..7e4e90882 100644 --- a/internal/query/projection/org_metadata.go +++ b/internal/query/projection/org_metadata.go @@ -3,12 +3,12 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -92,7 +92,7 @@ func (p *orgMetadataProjection) Reducers() []handler.AggregateReducer { func (p *orgMetadataProjection) reduceMetadataSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.MetadataSetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Ghn53", "reduce.wrong.event.type %s", org.MetadataSetType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Ghn53", "reduce.wrong.event.type %s", org.MetadataSetType) } return handler.NewUpsertStatement( e, @@ -117,7 +117,7 @@ func (p *orgMetadataProjection) reduceMetadataSet(event eventstore.Event) (*hand func (p *orgMetadataProjection) reduceMetadataRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.MetadataRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Bm542", "reduce.wrong.event.type %s", org.MetadataRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Bm542", "reduce.wrong.event.type %s", org.MetadataRemovedType) } return handler.NewDeleteStatement( e, @@ -135,7 +135,7 @@ func (p *orgMetadataProjection) reduceMetadataRemovedAll(event eventstore.Event) *org.OrgRemovedEvent: //ok default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Bmnf3", "reduce.wrong.event.type %v", []eventstore.EventType{org.MetadataRemovedAllType, org.OrgRemovedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Bmnf3", "reduce.wrong.event.type %v", []eventstore.EventType{org.MetadataRemovedAllType, org.OrgRemovedEventType}) } return handler.NewDeleteStatement( event, @@ -149,7 +149,7 @@ func (p *orgMetadataProjection) reduceMetadataRemovedAll(event eventstore.Event) func (p *orgMetadataProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Hkd1f", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Hkd1f", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewUpdateStatement( diff --git a/internal/query/projection/org_metadata_test.go b/internal/query/projection/org_metadata_test.go index b0fce9911..1883afac4 100644 --- a/internal/query/projection/org_metadata_test.go +++ b/internal/query/projection/org_metadata_test.go @@ -3,11 +3,11 @@ package projection import ( "testing" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestOrgMetadataProjection_reduces(t *testing.T) { @@ -174,7 +174,7 @@ func TestOrgMetadataProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/org_test.go b/internal/query/projection/org_test.go index 94d72469a..eec60de1f 100644 --- a/internal/query/projection/org_test.go +++ b/internal/query/projection/org_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestOrgProjection_reduces(t *testing.T) { @@ -249,7 +249,7 @@ func TestOrgProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/password_age_policy.go b/internal/query/projection/password_age_policy.go index 03e0aee33..5a1bbbdc7 100644 --- a/internal/query/projection/password_age_policy.go +++ b/internal/query/projection/password_age_policy.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -114,7 +114,7 @@ func (p *passwordAgeProjection) reduceAdded(event eventstore.Event) (*handler.St policyEvent = e.PasswordAgePolicyAddedEvent isDefault = true default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-CJqF0", "reduce.wrong.event.type %v", []eventstore.EventType{org.PasswordAgePolicyAddedEventType, instance.PasswordAgePolicyAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-CJqF0", "reduce.wrong.event.type %v", []eventstore.EventType{org.PasswordAgePolicyAddedEventType, instance.PasswordAgePolicyAddedEventType}) } return handler.NewCreateStatement( &policyEvent, @@ -140,7 +140,7 @@ func (p *passwordAgeProjection) reduceChanged(event eventstore.Event) (*handler. case *instance.PasswordAgePolicyChangedEvent: policyEvent = e.PasswordAgePolicyChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-i7FZt", "reduce.wrong.event.type %v", []eventstore.EventType{org.PasswordAgePolicyChangedEventType, instance.PasswordAgePolicyChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-i7FZt", "reduce.wrong.event.type %v", []eventstore.EventType{org.PasswordAgePolicyChangedEventType, instance.PasswordAgePolicyChangedEventType}) } cols := []handler.Column{ handler.NewCol(AgePolicyChangeDateCol, policyEvent.CreationDate()), @@ -164,7 +164,7 @@ func (p *passwordAgeProjection) reduceChanged(event eventstore.Event) (*handler. func (p *passwordAgeProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { policyEvent, ok := event.(*org.PasswordAgePolicyRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-EtHWB", "reduce.wrong.event.type %s", org.PasswordAgePolicyRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-EtHWB", "reduce.wrong.event.type %s", org.PasswordAgePolicyRemovedEventType) } return handler.NewDeleteStatement( policyEvent, @@ -177,7 +177,7 @@ func (p *passwordAgeProjection) reduceRemoved(event eventstore.Event) (*handler. func (p *passwordAgeProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-edLs2", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-edLs2", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/password_age_policy_test.go b/internal/query/projection/password_age_policy_test.go index 8ce044e78..a1a240b98 100644 --- a/internal/query/projection/password_age_policy_test.go +++ b/internal/query/projection/password_age_policy_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestPasswordAgeProjection_reduces(t *testing.T) { @@ -250,7 +250,7 @@ func TestPasswordAgeProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/password_complexity_policy.go b/internal/query/projection/password_complexity_policy.go index 96072017d..2072ba636 100644 --- a/internal/query/projection/password_complexity_policy.go +++ b/internal/query/projection/password_complexity_policy.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -120,7 +120,7 @@ func (p *passwordComplexityProjection) reduceAdded(event eventstore.Event) (*han policyEvent = e.PasswordComplexityPolicyAddedEvent isDefault = true default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-KTHmJ", "reduce.wrong.event.type %v", []eventstore.EventType{org.PasswordComplexityPolicyAddedEventType, instance.PasswordComplexityPolicyAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-KTHmJ", "reduce.wrong.event.type %v", []eventstore.EventType{org.PasswordComplexityPolicyAddedEventType, instance.PasswordComplexityPolicyAddedEventType}) } return handler.NewCreateStatement( &policyEvent, @@ -149,7 +149,7 @@ func (p *passwordComplexityProjection) reduceChanged(event eventstore.Event) (*h case *instance.PasswordComplexityPolicyChangedEvent: policyEvent = e.PasswordComplexityPolicyChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-cf3Xb", "reduce.wrong.event.type %v", []eventstore.EventType{org.PasswordComplexityPolicyChangedEventType, instance.PasswordComplexityPolicyChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-cf3Xb", "reduce.wrong.event.type %v", []eventstore.EventType{org.PasswordComplexityPolicyChangedEventType, instance.PasswordComplexityPolicyChangedEventType}) } cols := []handler.Column{ handler.NewCol(ComplexityPolicyChangeDateCol, policyEvent.CreationDate()), @@ -182,7 +182,7 @@ func (p *passwordComplexityProjection) reduceChanged(event eventstore.Event) (*h func (p *passwordComplexityProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { policyEvent, ok := event.(*org.PasswordComplexityPolicyRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-wttCd", "reduce.wrong.event.type %s", org.PasswordComplexityPolicyRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-wttCd", "reduce.wrong.event.type %s", org.PasswordComplexityPolicyRemovedEventType) } return handler.NewDeleteStatement( policyEvent, @@ -195,7 +195,7 @@ func (p *passwordComplexityProjection) reduceRemoved(event eventstore.Event) (*h func (p *passwordComplexityProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-pGTz9", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-pGTz9", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/password_complexity_policy_test.go b/internal/query/projection/password_complexity_policy_test.go index 0428d1ae2..f9cb0b75a 100644 --- a/internal/query/projection/password_complexity_policy_test.go +++ b/internal/query/projection/password_complexity_policy_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestPasswordComplexityProjection_reduces(t *testing.T) { @@ -274,7 +274,7 @@ func TestPasswordComplexityProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/privacy_policy.go b/internal/query/projection/privacy_policy.go index 44ac5794f..2bec8fea1 100644 --- a/internal/query/projection/privacy_policy.go +++ b/internal/query/projection/privacy_policy.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -118,7 +118,7 @@ func (p *privacyPolicyProjection) reduceAdded(event eventstore.Event) (*handler. policyEvent = e.PrivacyPolicyAddedEvent isDefault = true default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-kRNh8", "reduce.wrong.event.type %v", []eventstore.EventType{org.PrivacyPolicyAddedEventType, instance.PrivacyPolicyAddedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-kRNh8", "reduce.wrong.event.type %v", []eventstore.EventType{org.PrivacyPolicyAddedEventType, instance.PrivacyPolicyAddedEventType}) } return handler.NewCreateStatement( &policyEvent, @@ -146,7 +146,7 @@ func (p *privacyPolicyProjection) reduceChanged(event eventstore.Event) (*handle case *instance.PrivacyPolicyChangedEvent: policyEvent = e.PrivacyPolicyChangedEvent default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-91weZ", "reduce.wrong.event.type %v", []eventstore.EventType{org.PrivacyPolicyChangedEventType, instance.PrivacyPolicyChangedEventType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-91weZ", "reduce.wrong.event.type %v", []eventstore.EventType{org.PrivacyPolicyChangedEventType, instance.PrivacyPolicyChangedEventType}) } cols := []handler.Column{ handler.NewCol(PrivacyPolicyChangeDateCol, policyEvent.CreationDate()), @@ -176,7 +176,7 @@ func (p *privacyPolicyProjection) reduceChanged(event eventstore.Event) (*handle func (p *privacyPolicyProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { policyEvent, ok := event.(*org.PrivacyPolicyRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-FvtGO", "reduce.wrong.event.type %s", org.PrivacyPolicyRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-FvtGO", "reduce.wrong.event.type %s", org.PrivacyPolicyRemovedEventType) } return handler.NewDeleteStatement( policyEvent, @@ -189,7 +189,7 @@ func (p *privacyPolicyProjection) reduceRemoved(event eventstore.Event) (*handle func (p *privacyPolicyProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-bxJCY", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-bxJCY", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/privacy_policy_test.go b/internal/query/projection/privacy_policy_test.go index 53c147507..2d768f7e4 100644 --- a/internal/query/projection/privacy_policy_test.go +++ b/internal/query/projection/privacy_policy_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestPrivacyPolicyProjection_reduces(t *testing.T) { @@ -261,7 +261,7 @@ func TestPrivacyPolicyProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/project.go b/internal/query/projection/project.go index 95f62cdc7..b894c37ce 100644 --- a/internal/query/projection/project.go +++ b/internal/query/projection/project.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -113,7 +113,7 @@ func (p *projectProjection) Reducers() []handler.AggregateReducer { func (p *projectProjection) reduceProjectAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ProjectAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-l000S", "reduce.wrong.event.type %s", project.ProjectAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-l000S", "reduce.wrong.event.type %s", project.ProjectAddedType) } return handler.NewCreateStatement( e, @@ -137,7 +137,7 @@ func (p *projectProjection) reduceProjectAdded(event eventstore.Event) (*handler func (p *projectProjection) reduceProjectChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ProjectChangeEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-s00Fs", "reduce.wrong.event.type %s", project.ProjectChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-s00Fs", "reduce.wrong.event.type %s", project.ProjectChangedType) } if e.Name == nil && e.HasProjectCheck == nil && e.ProjectRoleAssertion == nil && e.ProjectRoleCheck == nil && e.PrivateLabelingSetting == nil { return handler.NewNoOpStatement(e), nil @@ -174,7 +174,7 @@ func (p *projectProjection) reduceProjectChanged(event eventstore.Event) (*handl func (p *projectProjection) reduceProjectDeactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ProjectDeactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-LLp0f", "reduce.wrong.event.type %s", project.ProjectDeactivatedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-LLp0f", "reduce.wrong.event.type %s", project.ProjectDeactivatedType) } return handler.NewUpdateStatement( e, @@ -193,7 +193,7 @@ func (p *projectProjection) reduceProjectDeactivated(event eventstore.Event) (*h func (p *projectProjection) reduceProjectReactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ProjectReactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-9J98f", "reduce.wrong.event.type %s", project.ProjectReactivatedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-9J98f", "reduce.wrong.event.type %s", project.ProjectReactivatedType) } return handler.NewUpdateStatement( e, @@ -212,7 +212,7 @@ func (p *projectProjection) reduceProjectReactivated(event eventstore.Event) (*h func (p *projectProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ProjectRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-5N9fs", "reduce.wrong.event.type %s", project.ProjectRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-5N9fs", "reduce.wrong.event.type %s", project.ProjectRemovedType) } return handler.NewDeleteStatement( e, @@ -226,7 +226,7 @@ func (p *projectProjection) reduceProjectRemoved(event eventstore.Event) (*handl func (p *projectProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-sbgru", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-sbgru", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/project_grant.go b/internal/query/projection/project_grant.go index 7923299e3..d6fbde855 100644 --- a/internal/query/projection/project_grant.go +++ b/internal/query/projection/project_grant.go @@ -5,13 +5,13 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -119,7 +119,7 @@ func (p *projectGrantProjection) Reducers() []handler.AggregateReducer { func (p *projectGrantProjection) reduceProjectGrantAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-g92Fg", "reduce.wrong.event.type %s", project.GrantAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-g92Fg", "reduce.wrong.event.type %s", project.GrantAddedType) } return handler.NewCreateStatement( e, @@ -141,7 +141,7 @@ func (p *projectGrantProjection) reduceProjectGrantAdded(event eventstore.Event) func (p *projectGrantProjection) reduceProjectGrantChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-g0fg4", "reduce.wrong.event.type %s", project.GrantChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-g0fg4", "reduce.wrong.event.type %s", project.GrantChangedType) } return handler.NewUpdateStatement( e, @@ -161,7 +161,7 @@ func (p *projectGrantProjection) reduceProjectGrantChanged(event eventstore.Even func (p *projectGrantProjection) reduceProjectGrantCascadeChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantCascadeChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ll9Ts", "reduce.wrong.event.type %s", project.GrantCascadeChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ll9Ts", "reduce.wrong.event.type %s", project.GrantCascadeChangedType) } return handler.NewUpdateStatement( e, @@ -181,7 +181,7 @@ func (p *projectGrantProjection) reduceProjectGrantCascadeChanged(event eventsto func (p *projectGrantProjection) reduceProjectGrantDeactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantDeactivateEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-0fj2f", "reduce.wrong.event.type %s", project.GrantDeactivatedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-0fj2f", "reduce.wrong.event.type %s", project.GrantDeactivatedType) } return handler.NewUpdateStatement( e, @@ -201,7 +201,7 @@ func (p *projectGrantProjection) reduceProjectGrantDeactivated(event eventstore. func (p *projectGrantProjection) reduceProjectGrantReactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantReactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-2M0ve", "reduce.wrong.event.type %s", project.GrantReactivatedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-2M0ve", "reduce.wrong.event.type %s", project.GrantReactivatedType) } return handler.NewUpdateStatement( e, @@ -221,7 +221,7 @@ func (p *projectGrantProjection) reduceProjectGrantReactivated(event eventstore. func (p *projectGrantProjection) reduceProjectGrantRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-o0w4f", "reduce.wrong.event.type %s", project.GrantRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-o0w4f", "reduce.wrong.event.type %s", project.GrantRemovedType) } return handler.NewDeleteStatement( e, @@ -236,7 +236,7 @@ func (p *projectGrantProjection) reduceProjectGrantRemoved(event eventstore.Even func (p *projectGrantProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ProjectRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-gn9rw", "reduce.wrong.event.type %s", project.ProjectRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-gn9rw", "reduce.wrong.event.type %s", project.ProjectRemovedType) } return handler.NewDeleteStatement( e, @@ -250,7 +250,7 @@ func (p *projectGrantProjection) reduceProjectRemoved(event eventstore.Event) (* func (p *projectGrantProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-HDgW3", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-HDgW3", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewMultiStatement( diff --git a/internal/query/projection/project_grant_member.go b/internal/query/projection/project_grant_member.go index cf357ba91..b86c02531 100644 --- a/internal/query/projection/project_grant_member.go +++ b/internal/query/projection/project_grant_member.go @@ -3,7 +3,6 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" @@ -12,6 +11,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -122,7 +122,7 @@ func (p *projectGrantMemberProjection) Reducers() []handler.AggregateReducer { func (p *projectGrantMemberProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantMemberAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-0EBQf", "reduce.wrong.event.type %s", project.GrantMemberAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-0EBQf", "reduce.wrong.event.type %s", project.GrantMemberAddedType) } ctx := setMemberContext(e.Aggregate()) userOwner, err := getResourceOwnerOfUser(ctx, p.es, e.Aggregate().InstanceID, e.UserID) @@ -145,7 +145,7 @@ func (p *projectGrantMemberProjection) reduceAdded(event eventstore.Event) (*han func (p *projectGrantMemberProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantMemberChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-YX5Tk", "reduce.wrong.event.type %s", project.GrantMemberChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-YX5Tk", "reduce.wrong.event.type %s", project.GrantMemberChangedType) } return reduceMemberChanged( *member.NewMemberChangedEvent(&e.BaseEvent, e.UserID, e.Roles...), @@ -157,7 +157,7 @@ func (p *projectGrantMemberProjection) reduceChanged(event eventstore.Event) (*h func (p *projectGrantMemberProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantMemberCascadeRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-adnHG", "reduce.wrong.event.type %s", project.GrantMemberCascadeRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-adnHG", "reduce.wrong.event.type %s", project.GrantMemberCascadeRemovedType) } return reduceMemberCascadeRemoved( *member.NewCascadeRemovedEvent(&e.BaseEvent, e.UserID), @@ -169,7 +169,7 @@ func (p *projectGrantMemberProjection) reduceCascadeRemoved(event eventstore.Eve func (p *projectGrantMemberProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantMemberRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-MGNnA", "reduce.wrong.event.type %s", project.GrantMemberRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-MGNnA", "reduce.wrong.event.type %s", project.GrantMemberRemovedType) } return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.UserID), @@ -181,7 +181,7 @@ func (p *projectGrantMemberProjection) reduceRemoved(event eventstore.Event) (*h func (p *projectGrantMemberProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-rufJr", "reduce.wrong.event.type %s", user.UserRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-rufJr", "reduce.wrong.event.type %s", user.UserRemovedType) } return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.Aggregate().ID)) } @@ -189,7 +189,7 @@ func (p *projectGrantMemberProjection) reduceUserRemoved(event eventstore.Event) func (p *projectGrantMemberProjection) reduceInstanceRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.InstanceRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Z2p6o", "reduce.wrong.event.type %s", instance.InstanceRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Z2p6o", "reduce.wrong.event.type %s", instance.InstanceRemovedEventType) } return reduceMemberRemoved(e, withMemberCond(MemberInstanceID, e.Aggregate().ID)) } @@ -197,7 +197,7 @@ func (p *projectGrantMemberProjection) reduceInstanceRemoved(event eventstore.Ev func (p *projectGrantMemberProjection) reduceOrgRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Zzp6o", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Zzp6o", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewMultiStatement( e, @@ -215,7 +215,7 @@ func (p *projectGrantMemberProjection) reduceOrgRemoved(event eventstore.Event) func (p *projectGrantMemberProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ProjectRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-JLODy", "reduce.wrong.event.type %s", project.ProjectRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-JLODy", "reduce.wrong.event.type %s", project.ProjectRemovedType) } return reduceMemberRemoved(e, withMemberCond(ProjectGrantMemberProjectIDCol, e.Aggregate().ID)) } @@ -223,7 +223,7 @@ func (p *projectGrantMemberProjection) reduceProjectRemoved(event eventstore.Eve func (p *projectGrantMemberProjection) reduceProjectGrantRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-D1J9R", "reduce.wrong.event.type %s", project.GrantRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-D1J9R", "reduce.wrong.event.type %s", project.GrantRemovedType) } return reduceMemberRemoved(e, withMemberCond(ProjectGrantMemberGrantIDCol, e.GrantID), diff --git a/internal/query/projection/project_grant_member_test.go b/internal/query/projection/project_grant_member_test.go index b9425d789..3b7839fe8 100644 --- a/internal/query/projection/project_grant_member_test.go +++ b/internal/query/projection/project_grant_member_test.go @@ -8,13 +8,13 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestProjectGrantMemberProjection_reduces(t *testing.T) { @@ -344,7 +344,7 @@ func TestProjectGrantMemberProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/project_grant_test.go b/internal/query/projection/project_grant_test.go index af8692db9..1ea910570 100644 --- a/internal/query/projection/project_grant_test.go +++ b/internal/query/projection/project_grant_test.go @@ -5,12 +5,12 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestProjectGrantProjection_reduces(t *testing.T) { @@ -302,7 +302,7 @@ func TestProjectGrantProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/project_member.go b/internal/query/projection/project_member.go index 1a5660574..bf1f82f85 100644 --- a/internal/query/projection/project_member.go +++ b/internal/query/projection/project_member.go @@ -3,7 +3,6 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" @@ -12,6 +11,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -114,7 +114,7 @@ func (p *projectMemberProjection) Reducers() []handler.AggregateReducer { func (p *projectMemberProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.MemberAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-bgx5Q", "reduce.wrong.event.type %s", project.MemberAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-bgx5Q", "reduce.wrong.event.type %s", project.MemberAddedType) } ctx := setMemberContext(e.Aggregate()) userOwner, err := getResourceOwnerOfUser(ctx, p.es, e.Aggregate().InstanceID, e.UserID) @@ -131,7 +131,7 @@ func (p *projectMemberProjection) reduceAdded(event eventstore.Event) (*handler. func (p *projectMemberProjection) reduceChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.MemberChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-90WJ1", "reduce.wrong.event.type %s", project.MemberChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-90WJ1", "reduce.wrong.event.type %s", project.MemberChangedType) } return reduceMemberChanged( *member.NewMemberChangedEvent(&e.BaseEvent, e.UserID, e.Roles...), @@ -142,7 +142,7 @@ func (p *projectMemberProjection) reduceChanged(event eventstore.Event) (*handle func (p *projectMemberProjection) reduceCascadeRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.MemberCascadeRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-aGd43", "reduce.wrong.event.type %s", project.MemberCascadeRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-aGd43", "reduce.wrong.event.type %s", project.MemberCascadeRemovedType) } return reduceMemberCascadeRemoved( *member.NewCascadeRemovedEvent(&e.BaseEvent, e.UserID), @@ -153,7 +153,7 @@ func (p *projectMemberProjection) reduceCascadeRemoved(event eventstore.Event) ( func (p *projectMemberProjection) reduceRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.MemberRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-eJZPh", "reduce.wrong.event.type %s", project.MemberRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-eJZPh", "reduce.wrong.event.type %s", project.MemberRemovedType) } return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.UserID), @@ -164,7 +164,7 @@ func (p *projectMemberProjection) reduceRemoved(event eventstore.Event) (*handle func (p *projectMemberProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-aYA60", "reduce.wrong.event.type %s", user.UserRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-aYA60", "reduce.wrong.event.type %s", user.UserRemovedType) } return reduceMemberRemoved(e, withMemberCond(MemberUserIDCol, e.Aggregate().ID)) } @@ -172,7 +172,7 @@ func (p *projectMemberProjection) reduceUserRemoved(event eventstore.Event) (*ha func (p *projectMemberProjection) reduceOrgRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-NGUEL", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-NGUEL", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewMultiStatement( e, @@ -184,7 +184,7 @@ func (p *projectMemberProjection) reduceOrgRemoved(event eventstore.Event) (*han func (p *projectMemberProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ProjectRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-NGUEL", "reduce.wrong.event.type %s", project.ProjectRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-NGUEL", "reduce.wrong.event.type %s", project.ProjectRemovedType) } return reduceMemberRemoved(e, withMemberCond(ProjectMemberProjectIDCol, e.Aggregate().ID)) } diff --git a/internal/query/projection/project_member_test.go b/internal/query/projection/project_member_test.go index 49a910c1b..28faa07e6 100644 --- a/internal/query/projection/project_member_test.go +++ b/internal/query/projection/project_member_test.go @@ -8,13 +8,13 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestProjectMemberProjection_reduces(t *testing.T) { @@ -294,7 +294,7 @@ func TestProjectMemberProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/project_role.go b/internal/query/projection/project_role.go index f1d4d4541..633c35efd 100644 --- a/internal/query/projection/project_role.go +++ b/internal/query/projection/project_role.go @@ -3,13 +3,13 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -101,7 +101,7 @@ func (p *projectRoleProjection) Reducers() []handler.AggregateReducer { func (p *projectRoleProjection) reduceProjectRoleAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.RoleAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-g92Fg", "reduce.wrong.event.type %s", project.RoleAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-g92Fg", "reduce.wrong.event.type %s", project.RoleAddedType) } return handler.NewCreateStatement( e, @@ -122,7 +122,7 @@ func (p *projectRoleProjection) reduceProjectRoleAdded(event eventstore.Event) ( func (p *projectRoleProjection) reduceProjectRoleChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.RoleChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-sM0f", "reduce.wrong.event.type %s", project.GrantChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-sM0f", "reduce.wrong.event.type %s", project.GrantChangedType) } if e.DisplayName == nil && e.Group == nil { return handler.NewNoOpStatement(e), nil @@ -150,7 +150,7 @@ func (p *projectRoleProjection) reduceProjectRoleChanged(event eventstore.Event) func (p *projectRoleProjection) reduceProjectRoleRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.RoleRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-L0fJf", "reduce.wrong.event.type %s", project.GrantRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-L0fJf", "reduce.wrong.event.type %s", project.GrantRemovedType) } return handler.NewDeleteStatement( e, @@ -165,7 +165,7 @@ func (p *projectRoleProjection) reduceProjectRoleRemoved(event eventstore.Event) func (p *projectRoleProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.ProjectRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-l0geG", "reduce.wrong.event.type %s", project.ProjectRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-l0geG", "reduce.wrong.event.type %s", project.ProjectRemovedType) } return handler.NewDeleteStatement( e, @@ -179,7 +179,7 @@ func (p *projectRoleProjection) reduceProjectRemoved(event eventstore.Event) (*h func (p *projectRoleProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-3XrHY", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-3XrHY", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/project_role_test.go b/internal/query/projection/project_role_test.go index ee4ace10b..b6a6d8195 100644 --- a/internal/query/projection/project_role_test.go +++ b/internal/query/projection/project_role_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestProjectRoleProjection_reduces(t *testing.T) { @@ -217,7 +217,7 @@ func TestProjectRoleProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/project_test.go b/internal/query/projection/project_test.go index af7e85c6e..f8e693c7a 100644 --- a/internal/query/projection/project_test.go +++ b/internal/query/projection/project_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestProjectProjection_reduces(t *testing.T) { @@ -255,7 +255,7 @@ func TestProjectProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/quota.go b/internal/query/projection/quota.go index d92ad0b49..84721f5d3 100644 --- a/internal/query/projection/quota.go +++ b/internal/query/projection/quota.go @@ -5,12 +5,12 @@ import ( "time" "github.com/zitadel/zitadel/internal/database" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/quota" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -300,7 +300,7 @@ func (q *quotaProjection) IncrementUsage(ctx context.Context, unit quota.Unit, i instanceID, unit, periodStart, count, ).Scan(&sum) if err != nil { - return 0, zitadel_errors.ThrowInternalf(err, "PROJ-SJL3h", "incrementing usage for unit %d failed for at least one quota period", unit) + return 0, zerrors.ThrowInternalf(err, "PROJ-SJL3h", "incrementing usage for unit %d failed for at least one quota period", unit) } return sum, err } diff --git a/internal/query/projection/quota_test.go b/internal/query/projection/quota_test.go index fb44901e0..e4c290812 100644 --- a/internal/query/projection/quota_test.go +++ b/internal/query/projection/quota_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/quota" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestQuotasProjection_reduces(t *testing.T) { @@ -348,7 +348,7 @@ func TestQuotasProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } event = tt.args.event(t) diff --git a/internal/query/projection/restrictions_test.go b/internal/query/projection/restrictions_test.go index a9058b17b..d67459e34 100644 --- a/internal/query/projection/restrictions_test.go +++ b/internal/query/projection/restrictions_test.go @@ -3,10 +3,10 @@ package projection import ( "testing" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/restrictions" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestRestrictionsProjection_reduces(t *testing.T) { @@ -85,7 +85,7 @@ func TestRestrictionsProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } event = tt.args.event(t) diff --git a/internal/query/projection/secret_generator.go b/internal/query/projection/secret_generator.go index d81937d67..839dcb5d0 100644 --- a/internal/query/projection/secret_generator.go +++ b/internal/query/projection/secret_generator.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -89,7 +89,7 @@ func (p *secretGeneratorProjection) Reducers() []handler.AggregateReducer { func (p *secretGeneratorProjection) reduceSecretGeneratorAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SecretGeneratorAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-sk99F", "reduce.wrong.event.type %s", instance.SecretGeneratorAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-sk99F", "reduce.wrong.event.type %s", instance.SecretGeneratorAddedEventType) } return handler.NewCreateStatement( e, @@ -114,7 +114,7 @@ func (p *secretGeneratorProjection) reduceSecretGeneratorAdded(event eventstore. func (p *secretGeneratorProjection) reduceSecretGeneratorChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SecretGeneratorChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-s00Fs", "reduce.wrong.event.type %s", instance.SecretGeneratorChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-s00Fs", "reduce.wrong.event.type %s", instance.SecretGeneratorChangedEventType) } columns := make([]handler.Column, 0, 7) @@ -152,7 +152,7 @@ func (p *secretGeneratorProjection) reduceSecretGeneratorChanged(event eventstor func (p *secretGeneratorProjection) reduceSecretGeneratorRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SecretGeneratorRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-fmiIf", "reduce.wrong.event.type %s", instance.SecretGeneratorRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-fmiIf", "reduce.wrong.event.type %s", instance.SecretGeneratorRemovedEventType) } return handler.NewDeleteStatement( e, diff --git a/internal/query/projection/secret_generator_test.go b/internal/query/projection/secret_generator_test.go index 4f808d051..8ddb109b9 100644 --- a/internal/query/projection/secret_generator_test.go +++ b/internal/query/projection/secret_generator_test.go @@ -5,10 +5,10 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestSecretGeneratorProjection_reduces(t *testing.T) { @@ -154,7 +154,7 @@ func TestSecretGeneratorProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/security_policy.go b/internal/query/projection/security_policy.go index 4c30cfc86..c8776ed0b 100644 --- a/internal/query/projection/security_policy.go +++ b/internal/query/projection/security_policy.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -66,7 +66,7 @@ func (p *securityPolicyProjection) Reducers() []handler.AggregateReducer { func (p *securityPolicyProjection) reduceSecurityPolicySet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SecurityPolicySetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-D3g87", "reduce.wrong.event.type %s", instance.SecurityPolicySetEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-D3g87", "reduce.wrong.event.type %s", instance.SecurityPolicySetEventType) } changes := []handler.Column{ handler.NewCol(SecurityPolicyColumnCreationDate, e.CreationDate()), diff --git a/internal/query/projection/session.go b/internal/query/projection/session.go index 90736523f..196a35219 100644 --- a/internal/query/projection/session.go +++ b/internal/query/projection/session.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/session" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -170,7 +170,7 @@ func (p *sessionProjection) Reducers() []handler.AggregateReducer { func (p *sessionProjection) reduceSessionAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.AddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Sfrgf", "reduce.wrong.event.type %s", session.AddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Sfrgf", "reduce.wrong.event.type %s", session.AddedType) } cols := make([]handler.Column, 0, 12) @@ -207,7 +207,7 @@ func (p *sessionProjection) reduceSessionAdded(event eventstore.Event) (*handler func (p *sessionProjection) reduceUserChecked(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.UserCheckedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-saDg5", "reduce.wrong.event.type %s", session.UserCheckedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-saDg5", "reduce.wrong.event.type %s", session.UserCheckedType) } return handler.NewUpdateStatement( e, @@ -228,7 +228,7 @@ func (p *sessionProjection) reduceUserChecked(event eventstore.Event) (*handler. func (p *sessionProjection) reducePasswordChecked(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.PasswordCheckedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SDgrb", "reduce.wrong.event.type %s", session.PasswordCheckedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SDgrb", "reduce.wrong.event.type %s", session.PasswordCheckedType) } return handler.NewUpdateStatement( @@ -248,7 +248,7 @@ func (p *sessionProjection) reducePasswordChecked(event eventstore.Event) (*hand func (p *sessionProjection) reduceIntentChecked(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.IntentCheckedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SDgr2", "reduce.wrong.event.type %s", session.IntentCheckedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SDgr2", "reduce.wrong.event.type %s", session.IntentCheckedType) } return handler.NewUpdateStatement( @@ -268,7 +268,7 @@ func (p *sessionProjection) reduceIntentChecked(event eventstore.Event) (*handle func (p *sessionProjection) reduceWebAuthNChecked(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.WebAuthNCheckedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-WieM4", "reduce.wrong.event.type %s", session.WebAuthNCheckedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-WieM4", "reduce.wrong.event.type %s", session.WebAuthNCheckedType) } return handler.NewUpdateStatement( e, @@ -288,7 +288,7 @@ func (p *sessionProjection) reduceWebAuthNChecked(event eventstore.Event) (*hand func (p *sessionProjection) reduceTOTPChecked(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.TOTPCheckedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Oqu8i", "reduce.wrong.event.type %s", session.TOTPCheckedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Oqu8i", "reduce.wrong.event.type %s", session.TOTPCheckedType) } return handler.NewUpdateStatement( @@ -348,7 +348,7 @@ func (p *sessionProjection) reduceOTPEmailChecked(event eventstore.Event) (*hand func (p *sessionProjection) reduceTokenSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.TokenSetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAfd3", "reduce.wrong.event.type %s", session.TokenSetType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SAfd3", "reduce.wrong.event.type %s", session.TokenSetType) } return handler.NewUpdateStatement( @@ -368,7 +368,7 @@ func (p *sessionProjection) reduceTokenSet(event eventstore.Event) (*handler.Sta func (p *sessionProjection) reduceMetadataSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.MetadataSetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAfd3", "reduce.wrong.event.type %s", session.MetadataSetType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SAfd3", "reduce.wrong.event.type %s", session.MetadataSetType) } return handler.NewUpdateStatement( @@ -408,7 +408,7 @@ func (p *sessionProjection) reduceLifetimeSet(event eventstore.Event) (*handler. func (p *sessionProjection) reduceSessionTerminated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*session.TerminateEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAftn", "reduce.wrong.event.type %s", session.TerminateType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-SAftn", "reduce.wrong.event.type %s", session.TerminateType) } return handler.NewDeleteStatement( @@ -423,7 +423,7 @@ func (p *sessionProjection) reduceSessionTerminated(event eventstore.Event) (*ha func (p *sessionProjection) reducePasswordChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanPasswordChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Deg3d", "reduce.wrong.event.type %s", user.HumanPasswordChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Deg3d", "reduce.wrong.event.type %s", user.HumanPasswordChangedType) } return handler.NewUpdateStatement( diff --git a/internal/query/projection/session_test.go b/internal/query/projection/session_test.go index 78218c88a..ecd9ca5f1 100644 --- a/internal/query/projection/session_test.go +++ b/internal/query/projection/session_test.go @@ -7,12 +7,12 @@ import ( "github.com/muhlemmer/gu" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/session" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestSessionProjection_reduces(t *testing.T) { @@ -419,7 +419,7 @@ func TestSessionProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if !errors.IsErrorInvalidArgument(err) { + if !zerrors.IsErrorInvalidArgument(err) { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/sms.go b/internal/query/projection/sms.go index eb173a4cf..13059203f 100644 --- a/internal/query/projection/sms.go +++ b/internal/query/projection/sms.go @@ -4,11 +4,11 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -111,7 +111,7 @@ func (p *smsConfigProjection) Reducers() []handler.AggregateReducer { func (p *smsConfigProjection) reduceSMSConfigTwilioAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SMSConfigTwilioAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-s8efs", "reduce.wrong.event.type %s", instance.SMSConfigTwilioAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-s8efs", "reduce.wrong.event.type %s", instance.SMSConfigTwilioAddedEventType) } return handler.NewMultiStatement( @@ -144,7 +144,7 @@ func (p *smsConfigProjection) reduceSMSConfigTwilioAdded(event eventstore.Event) func (p *smsConfigProjection) reduceSMSConfigTwilioChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SMSConfigTwilioChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-fi99F", "reduce.wrong.event.type %s", instance.SMSConfigTwilioChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-fi99F", "reduce.wrong.event.type %s", instance.SMSConfigTwilioChangedEventType) } columns := make([]handler.Column, 0) if e.SID != nil { @@ -180,7 +180,7 @@ func (p *smsConfigProjection) reduceSMSConfigTwilioChanged(event eventstore.Even func (p *smsConfigProjection) reduceSMSConfigTwilioTokenChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SMSConfigTwilioTokenChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-fi99F", "reduce.wrong.event.type %s", instance.SMSConfigTwilioTokenChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-fi99F", "reduce.wrong.event.type %s", instance.SMSConfigTwilioTokenChangedEventType) } columns := make([]handler.Column, 0) if e.Token != nil { @@ -213,7 +213,7 @@ func (p *smsConfigProjection) reduceSMSConfigTwilioTokenChanged(event eventstore func (p *smsConfigProjection) reduceSMSConfigActivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SMSConfigActivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-fj9Ef", "reduce.wrong.event.type %s", instance.SMSConfigActivatedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-fj9Ef", "reduce.wrong.event.type %s", instance.SMSConfigActivatedEventType) } return handler.NewUpdateStatement( e, @@ -232,7 +232,7 @@ func (p *smsConfigProjection) reduceSMSConfigActivated(event eventstore.Event) ( func (p *smsConfigProjection) reduceSMSConfigDeactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SMSConfigDeactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-dj9Js", "reduce.wrong.event.type %s", instance.SMSConfigDeactivatedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-dj9Js", "reduce.wrong.event.type %s", instance.SMSConfigDeactivatedEventType) } return handler.NewUpdateStatement( e, @@ -251,7 +251,7 @@ func (p *smsConfigProjection) reduceSMSConfigDeactivated(event eventstore.Event) func (p *smsConfigProjection) reduceSMSConfigRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SMSConfigRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-s9JJf", "reduce.wrong.event.type %s", instance.SMSConfigRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-s9JJf", "reduce.wrong.event.type %s", instance.SMSConfigRemovedEventType) } return handler.NewDeleteStatement( e, diff --git a/internal/query/projection/sms_test.go b/internal/query/projection/sms_test.go index c3ca8f99f..1e1a384ed 100644 --- a/internal/query/projection/sms_test.go +++ b/internal/query/projection/sms_test.go @@ -5,10 +5,10 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestSMSProjection_reduces(t *testing.T) { @@ -295,7 +295,7 @@ func TestSMSProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/smtp.go b/internal/query/projection/smtp.go index 40f151950..b753df7f5 100644 --- a/internal/query/projection/smtp.go +++ b/internal/query/projection/smtp.go @@ -3,11 +3,11 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -93,7 +93,7 @@ func (p *smtpConfigProjection) Reducers() []handler.AggregateReducer { func (p *smtpConfigProjection) reduceSMTPConfigAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SMTPConfigAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-sk99F", "reduce.wrong.event.type %s", instance.SMTPConfigAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-sk99F", "reduce.wrong.event.type %s", instance.SMTPConfigAddedEventType) } return handler.NewCreateStatement( e, @@ -118,7 +118,7 @@ func (p *smtpConfigProjection) reduceSMTPConfigAdded(event eventstore.Event) (*h func (p *smtpConfigProjection) reduceSMTPConfigChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SMTPConfigChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-wl0wd", "reduce.wrong.event.type %s", instance.SMTPConfigChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-wl0wd", "reduce.wrong.event.type %s", instance.SMTPConfigChangedEventType) } columns := make([]handler.Column, 0, 8) @@ -155,7 +155,7 @@ func (p *smtpConfigProjection) reduceSMTPConfigChanged(event eventstore.Event) ( func (p *smtpConfigProjection) reduceSMTPConfigPasswordChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*instance.SMTPConfigPasswordChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-fk02f", "reduce.wrong.event.type %s", instance.SMTPConfigChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-fk02f", "reduce.wrong.event.type %s", instance.SMTPConfigChangedEventType) } return handler.NewUpdateStatement( diff --git a/internal/query/projection/smtp_test.go b/internal/query/projection/smtp_test.go index 922ef1247..3fd78c7bc 100644 --- a/internal/query/projection/smtp_test.go +++ b/internal/query/projection/smtp_test.go @@ -3,10 +3,10 @@ package projection import ( "testing" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestSMTPConfigProjection_reduces(t *testing.T) { @@ -205,7 +205,7 @@ func TestSMTPConfigProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/user.go b/internal/query/projection/user.go index d9813f180..61a970854 100644 --- a/internal/query/projection/user.go +++ b/internal/query/projection/user.go @@ -5,13 +5,13 @@ import ( "database/sql" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -312,7 +312,7 @@ func (p *userProjection) Reducers() []handler.AggregateReducer { func (p *userProjection) reduceHumanAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Ebynp", "reduce.wrong.event.type %s", user.HumanAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Ebynp", "reduce.wrong.event.type %s", user.HumanAddedType) } return handler.NewMultiStatement( e, @@ -360,7 +360,7 @@ func (p *userProjection) reduceHumanAdded(event eventstore.Event) (*handler.Stat func (p *userProjection) reduceHumanRegistered(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanRegisteredEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-xE53M", "reduce.wrong.event.type %s", user.HumanRegisteredType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-xE53M", "reduce.wrong.event.type %s", user.HumanRegisteredType) } return handler.NewMultiStatement( e, @@ -408,7 +408,7 @@ func (p *userProjection) reduceHumanRegistered(event eventstore.Event) (*handler func (p *userProjection) reduceHumanInitCodeAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanInitialCodeAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Dvgws", "reduce.wrong.event.type %s", user.HumanInitialCodeAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Dvgws", "reduce.wrong.event.type %s", user.HumanInitialCodeAddedType) } return handler.NewUpdateStatement( e, @@ -425,7 +425,7 @@ func (p *userProjection) reduceHumanInitCodeAdded(event eventstore.Event) (*hand func (p *userProjection) reduceHumanInitCodeSucceeded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanInitializedCheckSucceededEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Dfvwq", "reduce.wrong.event.type %s", user.HumanInitializedCheckSucceededType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Dfvwq", "reduce.wrong.event.type %s", user.HumanInitializedCheckSucceededType) } return handler.NewUpdateStatement( e, @@ -442,7 +442,7 @@ func (p *userProjection) reduceHumanInitCodeSucceeded(event eventstore.Event) (* func (p *userProjection) reduceUserLocked(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserLockedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-exyBF", "reduce.wrong.event.type %s", user.UserLockedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-exyBF", "reduce.wrong.event.type %s", user.UserLockedType) } return handler.NewUpdateStatement( @@ -462,7 +462,7 @@ func (p *userProjection) reduceUserLocked(event eventstore.Event) (*handler.Stat func (p *userProjection) reduceUserUnlocked(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserUnlockedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-JIyRl", "reduce.wrong.event.type %s", user.UserUnlockedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-JIyRl", "reduce.wrong.event.type %s", user.UserUnlockedType) } return handler.NewUpdateStatement( @@ -482,7 +482,7 @@ func (p *userProjection) reduceUserUnlocked(event eventstore.Event) (*handler.St func (p *userProjection) reduceUserDeactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserDeactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-6BNjj", "reduce.wrong.event.type %s", user.UserDeactivatedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-6BNjj", "reduce.wrong.event.type %s", user.UserDeactivatedType) } return handler.NewUpdateStatement( @@ -502,7 +502,7 @@ func (p *userProjection) reduceUserDeactivated(event eventstore.Event) (*handler func (p *userProjection) reduceUserReactivated(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserReactivatedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-IoF6j", "reduce.wrong.event.type %s", user.UserReactivatedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-IoF6j", "reduce.wrong.event.type %s", user.UserReactivatedType) } return handler.NewUpdateStatement( @@ -522,7 +522,7 @@ func (p *userProjection) reduceUserReactivated(event eventstore.Event) (*handler func (p *userProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-BQB2t", "reduce.wrong.event.type %s", user.UserRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-BQB2t", "reduce.wrong.event.type %s", user.UserRemovedType) } return handler.NewDeleteStatement( @@ -537,7 +537,7 @@ func (p *userProjection) reduceUserRemoved(event eventstore.Event) (*handler.Sta func (p *userProjection) reduceUserNameChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UsernameChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-QNKyV", "reduce.wrong.event.type %s", user.UserUserNameChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-QNKyV", "reduce.wrong.event.type %s", user.UserUserNameChangedType) } return handler.NewUpdateStatement( @@ -557,7 +557,7 @@ func (p *userProjection) reduceUserNameChanged(event eventstore.Event) (*handler func (p *userProjection) reduceDomainClaimed(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.DomainClaimedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-ASwf3", "reduce.wrong.event.type %s", user.UserDomainClaimedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-ASwf3", "reduce.wrong.event.type %s", user.UserDomainClaimedType) } return handler.NewUpdateStatement( @@ -577,7 +577,7 @@ func (p *userProjection) reduceDomainClaimed(event eventstore.Event) (*handler.S func (p *userProjection) reduceHumanProfileChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanProfileChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-769v4", "reduce.wrong.event.type %s", user.HumanProfileChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-769v4", "reduce.wrong.event.type %s", user.HumanProfileChangedType) } cols := make([]handler.Column, 0, 6) if e.FirstName != "" { @@ -630,7 +630,7 @@ func (p *userProjection) reduceHumanProfileChanged(event eventstore.Event) (*han func (p *userProjection) reduceHumanPhoneChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanPhoneChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-xOGIA", "reduce.wrong.event.type %s", user.HumanPhoneChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-xOGIA", "reduce.wrong.event.type %s", user.HumanPhoneChangedType) } return handler.NewMultiStatement( @@ -672,7 +672,7 @@ func (p *userProjection) reduceHumanPhoneChanged(event eventstore.Event) (*handl func (p *userProjection) reduceHumanPhoneRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanPhoneRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-JI4S1", "reduce.wrong.event.type %s", user.HumanPhoneRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-JI4S1", "reduce.wrong.event.type %s", user.HumanPhoneRemovedType) } return handler.NewMultiStatement( @@ -715,7 +715,7 @@ func (p *userProjection) reduceHumanPhoneRemoved(event eventstore.Event) (*handl func (p *userProjection) reduceHumanPhoneVerified(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanPhoneVerifiedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-LBnqG", "reduce.wrong.event.type %s", user.HumanPhoneVerifiedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-LBnqG", "reduce.wrong.event.type %s", user.HumanPhoneVerifiedType) } return handler.NewMultiStatement( @@ -756,7 +756,7 @@ func (p *userProjection) reduceHumanPhoneVerified(event eventstore.Event) (*hand func (p *userProjection) reduceHumanEmailChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanEmailChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-KwiHa", "reduce.wrong.event.type %s", user.HumanEmailChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-KwiHa", "reduce.wrong.event.type %s", user.HumanEmailChangedType) } return handler.NewMultiStatement( @@ -798,7 +798,7 @@ func (p *userProjection) reduceHumanEmailChanged(event eventstore.Event) (*handl func (p *userProjection) reduceHumanEmailVerified(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanEmailVerifiedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-JzcDq", "reduce.wrong.event.type %s", user.HumanEmailVerifiedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-JzcDq", "reduce.wrong.event.type %s", user.HumanEmailVerifiedType) } return handler.NewMultiStatement( @@ -839,7 +839,7 @@ func (p *userProjection) reduceHumanEmailVerified(event eventstore.Event) (*hand func (p *userProjection) reduceHumanAvatarAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanAvatarAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-eDEdt", "reduce.wrong.event.type %s", user.HumanAvatarAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-eDEdt", "reduce.wrong.event.type %s", user.HumanAvatarAddedType) } return handler.NewMultiStatement( @@ -870,7 +870,7 @@ func (p *userProjection) reduceHumanAvatarAdded(event eventstore.Event) (*handle func (p *userProjection) reduceHumanAvatarRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanAvatarRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-KhETX", "reduce.wrong.event.type %s", user.HumanAvatarRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-KhETX", "reduce.wrong.event.type %s", user.HumanAvatarRemovedType) } return handler.NewMultiStatement( @@ -901,7 +901,7 @@ func (p *userProjection) reduceHumanAvatarRemoved(event eventstore.Event) (*hand func (p *userProjection) reduceHumanPasswordChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.HumanPasswordChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-jqXUY", "reduce.wrong.event.type %s", user.HumanPasswordChangedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-jqXUY", "reduce.wrong.event.type %s", user.HumanPasswordChangedType) } return handler.NewUpdateStatement( @@ -920,7 +920,7 @@ func (p *userProjection) reduceHumanPasswordChanged(event eventstore.Event) (*ha func (p *userProjection) reduceMachineSecretSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.MachineSecretSetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-x0p1n1i", "reduce.wrong.event.type %s", user.MachineSecretSetType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-x0p1n1i", "reduce.wrong.event.type %s", user.MachineSecretSetType) } return handler.NewMultiStatement( e, @@ -950,7 +950,7 @@ func (p *userProjection) reduceMachineSecretSet(event eventstore.Event) (*handle func (p *userProjection) reduceMachineSecretRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.MachineSecretRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-x0p6n1i", "reduce.wrong.event.type %s", user.MachineSecretRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-x0p6n1i", "reduce.wrong.event.type %s", user.MachineSecretRemovedType) } return handler.NewMultiStatement( @@ -981,7 +981,7 @@ func (p *userProjection) reduceMachineSecretRemoved(event eventstore.Event) (*ha func (p *userProjection) reduceMachineAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.MachineAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-q7ier", "reduce.wrong.event.type %s", user.MachineAddedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-q7ier", "reduce.wrong.event.type %s", user.MachineAddedEventType) } return handler.NewMultiStatement( @@ -1015,7 +1015,7 @@ func (p *userProjection) reduceMachineAdded(event eventstore.Event) (*handler.St func (p *userProjection) reduceMachineChanged(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.MachineChangedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-qYHvj", "reduce.wrong.event.type %s", user.MachineChangedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-qYHvj", "reduce.wrong.event.type %s", user.MachineChangedEventType) } cols := make([]handler.Column, 0, 2) @@ -1059,7 +1059,7 @@ func (p *userProjection) reduceMachineChanged(event eventstore.Event) (*handler. func (p *userProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-NCsdV", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-NCsdV", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/user_auth_method.go b/internal/query/projection/user_auth_method.go index 49455c81b..c545d41c1 100644 --- a/internal/query/projection/user_auth_method.go +++ b/internal/query/projection/user_auth_method.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -162,7 +162,7 @@ func (p *userAuthMethodProjection) reduceInitAuthMethod(event eventstore.Event) case *user.HumanOTPAddedEvent: methodType = domain.UserAuthMethodTypeTOTP default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-f92f", "reduce.wrong.event.type %v", []eventstore.EventType{user.HumanPasswordlessTokenAddedType, user.HumanU2FTokenAddedType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-f92f", "reduce.wrong.event.type %v", []eventstore.EventType{user.HumanPasswordlessTokenAddedType, user.HumanU2FTokenAddedType}) } return handler.NewUpsertStatement( @@ -206,7 +206,7 @@ func (p *userAuthMethodProjection) reduceActivateEvent(event eventstore.Event) ( methodType = domain.UserAuthMethodTypeTOTP default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-f92f", "reduce.wrong.event.type %v", []eventstore.EventType{user.HumanPasswordlessTokenAddedType, user.HumanU2FTokenAddedType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-f92f", "reduce.wrong.event.type %v", []eventstore.EventType{user.HumanPasswordlessTokenAddedType, user.HumanU2FTokenAddedType}) } return handler.NewUpdateStatement( @@ -235,7 +235,7 @@ func (p *userAuthMethodProjection) reduceAddAuthMethod(event eventstore.Event) ( case *user.HumanOTPEmailAddedEvent: methodType = domain.UserAuthMethodTypeOTPEmail default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-DS4g3", "reduce.wrong.event.type %v", []eventstore.EventType{user.HumanOTPSMSAddedType, user.HumanOTPEmailAddedType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-DS4g3", "reduce.wrong.event.type %v", []eventstore.EventType{user.HumanOTPSMSAddedType, user.HumanOTPEmailAddedType}) } return handler.NewCreateStatement( @@ -274,7 +274,7 @@ func (p *userAuthMethodProjection) reduceRemoveAuthMethod(event eventstore.Event methodType = domain.UserAuthMethodTypeOTPEmail default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-f92f", "reduce.wrong.event.type %v", + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-f92f", "reduce.wrong.event.type %v", []eventstore.EventType{user.HumanPasswordlessTokenAddedType, user.HumanU2FTokenAddedType, user.HumanMFAOTPRemovedType, user.HumanOTPSMSRemovedType, user.HumanPhoneRemovedType, user.HumanOTPEmailRemovedType}) } @@ -296,7 +296,7 @@ func (p *userAuthMethodProjection) reduceRemoveAuthMethod(event eventstore.Event func (p *userAuthMethodProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-FwDZ8", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-FwDZ8", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/user_auth_method_test.go b/internal/query/projection/user_auth_method_test.go index e3d52f253..4902fba82 100644 --- a/internal/query/projection/user_auth_method_test.go +++ b/internal/query/projection/user_auth_method_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestUserAuthMethodProjection_reduces(t *testing.T) { @@ -541,7 +541,7 @@ func TestUserAuthMethodProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/user_grant.go b/internal/query/projection/user_grant.go index 43f8ae8b9..c3ae22c48 100644 --- a/internal/query/projection/user_grant.go +++ b/internal/query/projection/user_grant.go @@ -6,7 +6,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" @@ -15,6 +14,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -178,7 +178,7 @@ func (p *userGrantProjection) Reducers() []handler.AggregateReducer { func (p *userGrantProjection) reduceAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*usergrant.UserGrantAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-MQHVB", "reduce.wrong.event.type %s", usergrant.UserGrantAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-MQHVB", "reduce.wrong.event.type %s", usergrant.UserGrantAddedType) } ctx := setUserGrantContext(e.Aggregate()) @@ -231,7 +231,7 @@ func (p *userGrantProjection) reduceChanged(event eventstore.Event) (*handler.St case *usergrant.UserGrantCascadeChangedEvent: roles = e.RoleKeys default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-hOr1E", "reduce.wrong.event.type %v", []eventstore.EventType{usergrant.UserGrantChangedType, usergrant.UserGrantCascadeChangedType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-hOr1E", "reduce.wrong.event.type %v", []eventstore.EventType{usergrant.UserGrantChangedType, usergrant.UserGrantCascadeChangedType}) } return handler.NewUpdateStatement( @@ -253,7 +253,7 @@ func (p *userGrantProjection) reduceRemoved(event eventstore.Event) (*handler.St case *usergrant.UserGrantRemovedEvent, *usergrant.UserGrantCascadeRemovedEvent: // ok default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-7OBEC", "reduce.wrong.event.type %v", []eventstore.EventType{usergrant.UserGrantRemovedType, usergrant.UserGrantCascadeRemovedType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-7OBEC", "reduce.wrong.event.type %v", []eventstore.EventType{usergrant.UserGrantRemovedType, usergrant.UserGrantCascadeRemovedType}) } return handler.NewDeleteStatement( @@ -267,7 +267,7 @@ func (p *userGrantProjection) reduceRemoved(event eventstore.Event) (*handler.St func (p *userGrantProjection) reduceDeactivated(event eventstore.Event) (*handler.Statement, error) { if _, ok := event.(*usergrant.UserGrantDeactivatedEvent); !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-oP7Gm", "reduce.wrong.event.type %s", usergrant.UserGrantDeactivatedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-oP7Gm", "reduce.wrong.event.type %s", usergrant.UserGrantDeactivatedType) } return handler.NewUpdateStatement( @@ -286,7 +286,7 @@ func (p *userGrantProjection) reduceDeactivated(event eventstore.Event) (*handle func (p *userGrantProjection) reduceReactivated(event eventstore.Event) (*handler.Statement, error) { if _, ok := event.(*usergrant.UserGrantDeactivatedEvent); !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-DGsKh", "reduce.wrong.event.type %s", usergrant.UserGrantReactivatedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-DGsKh", "reduce.wrong.event.type %s", usergrant.UserGrantReactivatedType) } return handler.NewUpdateStatement( @@ -305,7 +305,7 @@ func (p *userGrantProjection) reduceReactivated(event eventstore.Event) (*handle func (p *userGrantProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) { if _, ok := event.(*user.UserRemovedEvent); !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Bner2a", "reduce.wrong.event.type %s", user.UserRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Bner2a", "reduce.wrong.event.type %s", user.UserRemovedType) } return handler.NewDeleteStatement( @@ -319,7 +319,7 @@ func (p *userGrantProjection) reduceUserRemoved(event eventstore.Event) (*handle func (p *userGrantProjection) reduceProjectRemoved(event eventstore.Event) (*handler.Statement, error) { if _, ok := event.(*project.ProjectRemovedEvent); !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Bne2a", "reduce.wrong.event.type %s", project.ProjectRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Bne2a", "reduce.wrong.event.type %s", project.ProjectRemovedType) } return handler.NewDeleteStatement( @@ -334,7 +334,7 @@ func (p *userGrantProjection) reduceProjectRemoved(event eventstore.Event) (*han func (p *userGrantProjection) reduceProjectGrantRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.GrantRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-dGr2a", "reduce.wrong.event.type %s", project.GrantRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-dGr2a", "reduce.wrong.event.type %s", project.GrantRemovedType) } return handler.NewDeleteStatement( @@ -349,7 +349,7 @@ func (p *userGrantProjection) reduceProjectGrantRemoved(event eventstore.Event) func (p *userGrantProjection) reduceRoleRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*project.RoleRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-dswg2", "reduce.wrong.event.type %s", project.RoleRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-dswg2", "reduce.wrong.event.type %s", project.RoleRemovedType) } return handler.NewUpdateStatement( @@ -375,7 +375,7 @@ func (p *userGrantProjection) reduceProjectGrantChanged(event eventstore.Event) grantID = e.GrantID keys = e.RoleKeys default: - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-Fh3gw", "reduce.wrong.event.type %v", []eventstore.EventType{project.GrantChangedType, project.GrantCascadeChangedType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-Fh3gw", "reduce.wrong.event.type %v", []eventstore.EventType{project.GrantChangedType, project.GrantCascadeChangedType}) } return handler.NewUpdateStatement( @@ -393,7 +393,7 @@ func (p *userGrantProjection) reduceProjectGrantChanged(event eventstore.Event) func (p *userGrantProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-jpIvp", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-jpIvp", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewMultiStatement( @@ -441,7 +441,7 @@ func getResourceOwnerOfUser(ctx context.Context, es handler.EventStore, instance return "", err } if len(events) != 1 { - return "", errors.ThrowNotFound(nil, "PROJ-0I92sp", "Errors.User.NotFound") + return "", zerrors.ThrowNotFound(nil, "PROJ-0I92sp", "Errors.User.NotFound") } return events[0].Aggregate().ResourceOwner, nil } @@ -462,7 +462,7 @@ func getResourceOwnerOfProject(ctx context.Context, es handler.EventStore, insta return "", err } if len(events) != 1 { - return "", errors.ThrowNotFound(nil, "PROJ-0I91sp", "Errors.Project.NotFound") + return "", zerrors.ThrowNotFound(nil, "PROJ-0I91sp", "Errors.Project.NotFound") } return events[0].Aggregate().ResourceOwner, nil } @@ -486,11 +486,11 @@ func getGrantedOrgOfGrantedProject(ctx context.Context, es handler.EventStore, i return "", err } if len(events) != 1 { - return "", errors.ThrowNotFound(nil, "PROJ-MoaSpw", "Errors.Grant.NotFound") + return "", zerrors.ThrowNotFound(nil, "PROJ-MoaSpw", "Errors.Grant.NotFound") } grantAddedEvent, ok := events[0].(*project.GrantAddedEvent) if !ok { - return "", errors.ThrowNotFound(nil, "PROJ-P0s2o0", "Errors.Grant.NotFound") + return "", zerrors.ThrowNotFound(nil, "PROJ-P0s2o0", "Errors.Grant.NotFound") } return grantAddedEvent.GrantedOrgID, nil } diff --git a/internal/query/projection/user_grant_test.go b/internal/query/projection/user_grant_test.go index 97a464e37..128a97fe5 100644 --- a/internal/query/projection/user_grant_test.go +++ b/internal/query/projection/user_grant_test.go @@ -8,7 +8,6 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" @@ -16,6 +15,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/repository/usergrant" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestUserGrantProjection_reduces(t *testing.T) { @@ -557,7 +557,7 @@ func TestUserGrantProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/user_metadata.go b/internal/query/projection/user_metadata.go index e1b155294..6599e1d2c 100644 --- a/internal/query/projection/user_metadata.go +++ b/internal/query/projection/user_metadata.go @@ -3,13 +3,13 @@ package projection import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -100,7 +100,7 @@ func (p *userMetadataProjection) Reducers() []handler.AggregateReducer { func (p *userMetadataProjection) reduceMetadataSet(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.MetadataSetEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Ghn52", "reduce.wrong.event.type %s", user.MetadataSetType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Ghn52", "reduce.wrong.event.type %s", user.MetadataSetType) } return handler.NewUpsertStatement( e, @@ -125,7 +125,7 @@ func (p *userMetadataProjection) reduceMetadataSet(event eventstore.Event) (*han func (p *userMetadataProjection) reduceMetadataRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.MetadataRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Bm542", "reduce.wrong.event.type %s", user.MetadataRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Bm542", "reduce.wrong.event.type %s", user.MetadataRemovedType) } return handler.NewDeleteStatement( e, @@ -143,7 +143,7 @@ func (p *userMetadataProjection) reduceMetadataRemovedAll(event eventstore.Event *user.UserRemovedEvent: //ok default: - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Bmnf2", "reduce.wrong.event.type %v", []eventstore.EventType{user.MetadataRemovedAllType, user.UserRemovedType}) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Bmnf2", "reduce.wrong.event.type %v", []eventstore.EventType{user.MetadataRemovedAllType, user.UserRemovedType}) } return handler.NewDeleteStatement( event, @@ -157,7 +157,7 @@ func (p *userMetadataProjection) reduceMetadataRemovedAll(event eventstore.Event func (p *userMetadataProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-oqwul", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-oqwul", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/user_metadata_test.go b/internal/query/projection/user_metadata_test.go index 9d0bb60ce..a6d0ac7a4 100644 --- a/internal/query/projection/user_metadata_test.go +++ b/internal/query/projection/user_metadata_test.go @@ -3,12 +3,12 @@ package projection import ( "testing" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestUserMetadataProjection_reduces(t *testing.T) { @@ -199,7 +199,7 @@ func TestUserMetadataProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/user_personal_access_token.go b/internal/query/projection/user_personal_access_token.go index 2c072d3bd..0efb5d641 100644 --- a/internal/query/projection/user_personal_access_token.go +++ b/internal/query/projection/user_personal_access_token.go @@ -4,13 +4,13 @@ import ( "context" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" old_handler "github.com/zitadel/zitadel/internal/eventstore/handler" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -103,7 +103,7 @@ func (p *personalAccessTokenProjection) Reducers() []handler.AggregateReducer { func (p *personalAccessTokenProjection) reducePersonalAccessTokenAdded(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.PersonalAccessTokenAddedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-DVgf7", "reduce.wrong.event.type %s", user.PersonalAccessTokenAddedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-DVgf7", "reduce.wrong.event.type %s", user.PersonalAccessTokenAddedType) } return handler.NewCreateStatement( e, @@ -124,7 +124,7 @@ func (p *personalAccessTokenProjection) reducePersonalAccessTokenAdded(event eve func (p *personalAccessTokenProjection) reducePersonalAccessTokenRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.PersonalAccessTokenRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-g7u3F", "reduce.wrong.event.type %s", user.PersonalAccessTokenRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-g7u3F", "reduce.wrong.event.type %s", user.PersonalAccessTokenRemovedType) } return handler.NewDeleteStatement( e, @@ -138,7 +138,7 @@ func (p *personalAccessTokenProjection) reducePersonalAccessTokenRemoved(event e func (p *personalAccessTokenProjection) reduceUserRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*user.UserRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-Dff3h", "reduce.wrong.event.type %s", user.UserRemovedType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "HANDL-Dff3h", "reduce.wrong.event.type %s", user.UserRemovedType) } return handler.NewDeleteStatement( e, @@ -152,7 +152,7 @@ func (p *personalAccessTokenProjection) reduceUserRemoved(event eventstore.Event func (p *personalAccessTokenProjection) reduceOwnerRemoved(event eventstore.Event) (*handler.Statement, error) { e, ok := event.(*org.OrgRemovedEvent) if !ok { - return nil, errors.ThrowInvalidArgumentf(nil, "PROJE-zQVhl", "reduce.wrong.event.type %s", org.OrgRemovedEventType) + return nil, zerrors.ThrowInvalidArgumentf(nil, "PROJE-zQVhl", "reduce.wrong.event.type %s", org.OrgRemovedEventType) } return handler.NewDeleteStatement( diff --git a/internal/query/projection/user_personal_access_token_test.go b/internal/query/projection/user_personal_access_token_test.go index 4cb7e3162..43d7638a6 100644 --- a/internal/query/projection/user_personal_access_token_test.go +++ b/internal/query/projection/user_personal_access_token_test.go @@ -5,12 +5,12 @@ import ( "time" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestPersonalAccessTokenProjection_reduces(t *testing.T) { @@ -169,7 +169,7 @@ func TestPersonalAccessTokenProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/projection/user_test.go b/internal/query/projection/user_test.go index fe0a8dad4..9aaec46cf 100644 --- a/internal/query/projection/user_test.go +++ b/internal/query/projection/user_test.go @@ -6,12 +6,12 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestUserProjection_reduces(t *testing.T) { @@ -1758,7 +1758,7 @@ func TestUserProjection_reduces(t *testing.T) { t.Run(tt.name, func(t *testing.T) { event := baseEvent(t) got, err := tt.reduce(event) - if _, ok := err.(errors.InvalidArgument); !ok { + if ok := zerrors.IsErrorInvalidArgument(err); !ok { t.Errorf("no wrong event mapping: %v, got: %v", err, got) } diff --git a/internal/query/quota.go b/internal/query/quota.go index 1919902a2..1af5be8f8 100644 --- a/internal/query/quota.go +++ b/internal/query/quota.go @@ -3,16 +3,16 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/repository/quota" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -70,7 +70,7 @@ func (q *Queries) GetQuota(ctx context.Context, instanceID string, unit quota.Un }, ).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-XmYn9", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-XmYn9", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { qu, err = scan(row) @@ -96,10 +96,10 @@ func prepareQuotaQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilde var now time.Time err := row.Scan(&q.ID, &q.From, &interval, &q.Amount, &q.Limit, &now) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-rDTM6", "Errors.Quota.NotExisting") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-rDTM6", "Errors.Quota.NotExisting") } - return nil, errors.ThrowInternal(err, "QUERY-LqySK", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-LqySK", "Errors.Internal") } q.ResetInterval = time.Duration(interval) q.CurrentPeriodStart = pushPeriodStart(q.From, q.ResetInterval, now) diff --git a/internal/query/quota_notifications.go b/internal/query/quota_notifications.go index fb85f9373..0015278b2 100644 --- a/internal/query/quota_notifications.go +++ b/internal/query/quota_notifications.go @@ -10,10 +10,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/zitadel/zitadel/internal/api/call" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/repository/quota" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -84,7 +84,7 @@ func (q *Queries) GetDueQuotaNotifications(ctx context.Context, instanceID strin }, ).ToSql() if err != nil { - return nil, zitadel_errors.ThrowInternal(err, "QUERY-XmYn9", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-XmYn9", "Errors.Query.SQLStatement") } var notifications *QuotaNotifications err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -166,9 +166,9 @@ func prepareQuotaNotificationsQuery(ctx context.Context, db prepareDatabase) (sq err := rows.Scan(&cfg.ID, &cfg.CallURL, &cfg.Percent, &cfg.Repeat, &nextDueThreshold) if err != nil { if errors.Is(err, sql.ErrNoRows) { - return nil, zitadel_errors.ThrowNotFound(err, "QUERY-bbqWb", "Errors.QuotaNotification.NotExisting") + return nil, zerrors.ThrowNotFound(err, "QUERY-bbqWb", "Errors.QuotaNotification.NotExisting") } - return nil, zitadel_errors.ThrowInternal(err, "QUERY-8copS", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-8copS", "Errors.Internal") } if nextDueThreshold.Valid { cfg.NextDueThreshold = uint16(nextDueThreshold.Int16) diff --git a/internal/query/quota_periods.go b/internal/query/quota_periods.go index ce1b76cd0..6ec42deba 100644 --- a/internal/query/quota_periods.go +++ b/internal/query/quota_periods.go @@ -8,10 +8,10 @@ import ( sq "github.com/Masterminds/squirrel" "github.com/zitadel/zitadel/internal/api/call" - zitadel_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/repository/quota" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -54,13 +54,13 @@ func (q *Queries) GetRemainingQuotaUsage(ctx context.Context, instanceID string, }). ToSql() if err != nil { - return nil, zitadel_errors.ThrowInternal(err, "QUERY-FSA3g", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-FSA3g", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { remaining, err = scan(row) return err }, query, args...) - if zitadel_errors.IsNotFound(err) { + if zerrors.IsNotFound(err) { return nil, nil } return remaining, err @@ -78,9 +78,9 @@ func prepareRemainingQuotaUsageQuery(ctx context.Context, db prepareDatabase) (s err := row.Scan(remaining) if err != nil { if errors.Is(err, sql.ErrNoRows) { - return nil, zitadel_errors.ThrowNotFound(err, "QUERY-quiowi2", "Errors.Internal") + return nil, zerrors.ThrowNotFound(err, "QUERY-quiowi2", "Errors.Internal") } - return nil, zitadel_errors.ThrowInternal(err, "QUERY-81j1jn2", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-81j1jn2", "Errors.Internal") } return remaining, nil } diff --git a/internal/query/quota_periods_test.go b/internal/query/quota_periods_test.go index 25ea2056e..0f44c5e54 100644 --- a/internal/query/quota_periods_test.go +++ b/internal/query/quota_periods_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -42,7 +42,7 @@ func Test_prepareRemainingQuotaUsageQuery(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/quota_test.go b/internal/query/quota_test.go index c96af861a..5a75310b7 100644 --- a/internal/query/quota_test.go +++ b/internal/query/quota_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -52,7 +52,7 @@ func Test_QuotaPrepare(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/restrictions.go b/internal/query/restrictions.go index e24a5e409..9e0dd37aa 100644 --- a/internal/query/restrictions.go +++ b/internal/query/restrictions.go @@ -13,9 +13,9 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - zitade_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + zitade_errors "github.com/zitadel/zitadel/internal/zerrors" ) var ( diff --git a/internal/query/secret_generator_test.go b/internal/query/secret_generator_test.go index 44d2015c1..683dc3441 100644 --- a/internal/query/secret_generator_test.go +++ b/internal/query/secret_generator_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -246,7 +246,7 @@ func Test_SecretGeneratorsPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/secret_generators.go b/internal/query/secret_generators.go index f339668a2..d8f838b82 100644 --- a/internal/query/secret_generators.go +++ b/internal/query/secret_generators.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -12,9 +12,9 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -144,7 +144,7 @@ func (q *Queries) SecretGeneratorByType(ctx context.Context, generatorType domai SecretGeneratorColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-3k99f", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-3k99f", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -164,7 +164,7 @@ func (q *Queries) SearchSecretGenerators(ctx context.Context, queries *SecretGen SecretGeneratorColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-sn9lw", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-sn9lw", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -172,7 +172,7 @@ func (q *Queries) SearchSecretGenerators(ctx context.Context, queries *SecretGen return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-4miii", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-4miii", "Errors.Internal") } secretGenerators.State, err = q.latestState(ctx, secretGeneratorsTable) return secretGenerators, err @@ -223,10 +223,10 @@ func prepareSecretGeneratorQuery(ctx context.Context, db prepareDatabase) (sq.Se &secretGenerator.IncludeSymbols, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-m9wff", "Errors.SecretGenerator.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-m9wff", "Errors.SecretGenerator.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-2k99d", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-2k99d", "Errors.Internal") } return secretGenerator, nil } @@ -276,7 +276,7 @@ func prepareSecretGeneratorsQuery(ctx context.Context, db prepareDatabase) (sq.S } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-em9fs", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-em9fs", "Errors.Query.CloseRows") } return &SecretGenerators{ diff --git a/internal/query/security_policy.go b/internal/query/security_policy.go index 49f355a45..3a4a3abb2 100644 --- a/internal/query/security_policy.go +++ b/internal/query/security_policy.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -11,8 +11,8 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -63,7 +63,7 @@ func (q *Queries) SecurityPolicy(ctx context.Context) (policy *SecurityPolicy, e SecurityPolicyColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Sf6d1", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-Sf6d1", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -95,8 +95,8 @@ func prepareSecurityPolicyQuery(ctx context.Context, db prepareDatabase) (sq.Sel &securityPolicy.Enabled, &securityPolicy.AllowedOrigins, ) - if err != nil && !errs.Is(err, sql.ErrNoRows) { // ignore not found errors - return nil, errors.ThrowInternal(err, "QUERY-Dfrt2", "Errors.Internal") + if err != nil && !errors.Is(err, sql.ErrNoRows) { // ignore not found errors + return nil, zerrors.ThrowInternal(err, "QUERY-Dfrt2", "Errors.Internal") } return securityPolicy, nil } diff --git a/internal/query/session.go b/internal/query/session.go index 4507320ab..5aa7c177b 100644 --- a/internal/query/session.go +++ b/internal/query/session.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "net" "net/http" "time" @@ -16,10 +16,10 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type Sessions struct { @@ -215,7 +215,7 @@ func (q *Queries) SessionByID(ctx context.Context, shouldTriggerBulk bool, id, s }, ).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-dn9JW", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-dn9JW", "Errors.Query.SQLStatement") } var tokenID string @@ -230,7 +230,7 @@ func (q *Queries) SessionByID(ctx context.Context, shouldTriggerBulk bool, id, s return session, nil } if err := q.sessionTokenVerifier(ctx, sessionToken, session.ID, tokenID); err != nil { - return nil, errors.ThrowPermissionDenied(nil, "QUERY-dsfr3", "Errors.PermissionDenied") + return nil, zerrors.ThrowPermissionDenied(nil, "QUERY-dsfr3", "Errors.PermissionDenied") } return session, nil } @@ -246,7 +246,7 @@ func (q *Queries) SearchSessions(ctx context.Context, queries *SessionsSearchQue }). ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-sn9Jf", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-sn9Jf", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -254,7 +254,7 @@ func (q *Queries) SearchSessions(ctx context.Context, queries *SessionsSearchQue return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Sfg42", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Sfg42", "Errors.Internal") } sessions.State, err = q.latestState(ctx, sessionsTable) @@ -366,10 +366,10 @@ func prepareSessionQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuil ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, "", errors.ThrowNotFound(err, "QUERY-SFeaa", "Errors.Session.NotExisting") + if errors.Is(err, sql.ErrNoRows) { + return nil, "", zerrors.ThrowNotFound(err, "QUERY-SFeaa", "Errors.Session.NotExisting") } - return nil, "", errors.ThrowInternal(err, "QUERY-SAder", "Errors.Internal") + return nil, "", zerrors.ThrowInternal(err, "QUERY-SAder", "Errors.Internal") } session.UserFactor.UserID = userID.String @@ -471,7 +471,7 @@ func prepareSessionsQuery(ctx context.Context, db prepareDatabase) (sq.SelectBui ) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-SAfeg", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-SAfeg", "Errors.Internal") } session.UserFactor.UserID = userID.String session.UserFactor.ResourceOwner = userResourceOwner.String diff --git a/internal/query/sessions_test.go b/internal/query/sessions_test.go index 2bb90bbca..711e95232 100644 --- a/internal/query/sessions_test.go +++ b/internal/query/sessions_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -427,7 +427,7 @@ func Test_SessionPrepare(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/sms.go b/internal/query/sms.go index 898f34a4d..38c798ba1 100644 --- a/internal/query/sms.go +++ b/internal/query/sms.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -12,9 +12,9 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type SMSConfigs struct { @@ -127,7 +127,7 @@ func (q *Queries) SMSProviderConfigByID(ctx context.Context, id string) (config }, ).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-dn9JW", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-dn9JW", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -151,7 +151,7 @@ func (q *Queries) SMSProviderConfig(ctx context.Context, queries ...SearchQuery) }, ).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-dn9JW", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-dn9JW", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -171,7 +171,7 @@ func (q *Queries) SearchSMSConfigs(ctx context.Context, queries *SMSConfigsSearc SMSConfigColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-sn9Jf", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-sn9Jf", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -179,7 +179,7 @@ func (q *Queries) SearchSMSConfigs(ctx context.Context, queries *SMSConfigsSearc return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-aJnZL", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-aJnZL", "Errors.Internal") } configs.State, err = q.latestState(ctx, smsConfigsTable) return configs, err @@ -228,10 +228,10 @@ func prepareSMSConfigQuery(ctx context.Context, db prepareDatabase) (sq.SelectBu ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-fn99w", "Errors.SMSConfig.NotExisting") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-fn99w", "Errors.SMSConfig.NotExisting") } - return nil, errors.ThrowInternal(err, "QUERY-3n9Js", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-3n9Js", "Errors.Internal") } twilioConfig.set(config) @@ -283,7 +283,7 @@ func prepareSMSConfigsQuery(ctx context.Context, db prepareDatabase) (sq.SelectB ) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-d9jJd", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-d9jJd", "Errors.Internal") } twilioConfig.set(config) diff --git a/internal/query/sms_test.go b/internal/query/sms_test.go index 9f6c906c7..56bb97e2e 100644 --- a/internal/query/sms_test.go +++ b/internal/query/sms_test.go @@ -10,7 +10,7 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -256,7 +256,7 @@ func Test_SMSConfigPrepare(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/smtp.go b/internal/query/smtp.go index e1d6430ea..81202f2e5 100644 --- a/internal/query/smtp.go +++ b/internal/query/smtp.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -11,9 +11,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -106,7 +106,7 @@ func (q *Queries) SMTPConfigByAggregateID(ctx context.Context, aggregateID strin SMTPConfigColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(), }).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-3m9sl", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-3m9sl", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -151,10 +151,10 @@ func prepareSMTPConfigQuery(ctx context.Context, db prepareDatabase) (sq.SelectB &password, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-fwofw", "Errors.SMTPConfig.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-fwofw", "Errors.SMTPConfig.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-9k87F", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-9k87F", "Errors.Internal") } config.Password = password return config, nil diff --git a/internal/query/smtp_test.go b/internal/query/smtp_test.go index bbfc757db..1e72fcdde 100644 --- a/internal/query/smtp_test.go +++ b/internal/query/smtp_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/zitadel/zitadel/internal/crypto" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -64,7 +64,7 @@ func Test_SMTPConfigsPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/user.go b/internal/query/user.go index 0c5df22b2..371d5c000 100644 --- a/internal/query/user.go +++ b/internal/query/user.go @@ -4,7 +4,7 @@ import ( "context" "database/sql" _ "embed" - errs "errors" + "errors" "strings" "time" @@ -16,9 +16,9 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type Users struct { @@ -392,7 +392,7 @@ func (q *Queries) GetUser(ctx context.Context, shouldTriggerBulk bool, queries . } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dnhr2", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-Dnhr2", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -416,7 +416,7 @@ func (q *Queries) GetHumanProfile(ctx context.Context, userID string, queries .. } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dgbg2", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-Dgbg2", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -440,7 +440,7 @@ func (q *Queries) GetHumanEmail(ctx context.Context, userID string, queries ...S } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-BHhj3", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-BHhj3", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -464,7 +464,7 @@ func (q *Queries) GetHumanPhone(ctx context.Context, userID string, queries ...S } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dg43g", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-Dg43g", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -550,7 +550,7 @@ func (q *Queries) GetNotifyUser(ctx context.Context, shouldTriggered bool, queri } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Err3g", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-Err3g", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -569,7 +569,7 @@ func (q *Queries) SearchUsers(ctx context.Context, queries *UserSearchQueries) ( stmt, args, err := queries.toQuery(query).Where(eq). ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dgbg2", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-Dgbg2", "Errors.Query.SQLStatment") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -577,7 +577,7 @@ func (q *Queries) SearchUsers(ctx context.Context, queries *UserSearchQueries) ( return err }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-AG4gs", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-AG4gs", "Errors.Internal") } users.State, err = q.latestState(ctx, userTable) @@ -617,7 +617,7 @@ func (q *Queries) IsUserUnique(ctx context.Context, username, email, resourceOwn eq := sq.Eq{UserInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID()} stmt, args, err := query.Where(eq).ToSql() if err != nil { - return false, errors.ThrowInternal(err, "QUERY-Dg43g", "Errors.Query.SQLStatment") + return false, zerrors.ThrowInternal(err, "QUERY-Dg43g", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -826,10 +826,10 @@ func scanUser(row *sql.Row) (*User, error) { ) if err != nil || count != 1 { - if errs.Is(err, sql.ErrNoRows) || count != 1 { - return nil, errors.ThrowNotFound(err, "QUERY-Dfbg2", "Errors.User.NotFound") + if errors.Is(err, sql.ErrNoRows) || count != 1 { + return nil, zerrors.ThrowNotFound(err, "QUERY-Dfbg2", "Errors.User.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Bgah2", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Bgah2", "Errors.Internal") } u.PreferredLoginName = preferredLoginName.String @@ -910,6 +910,7 @@ func prepareUserQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder userPreferredLoginNameInstanceIDCol.identifier()+" = "+UserInstanceIDCol.identifier()+db.Timetravel(call.Took(ctx)), preferredLoginNameArgs...). PlaceholderFormat(sq.Dollar), + scanUser } @@ -958,13 +959,13 @@ func prepareProfileQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuil &avatarKey, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-HNhb3", "Errors.User.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-HNhb3", "Errors.User.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Rfheq", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Rfheq", "Errors.Internal") } if !humanID.Valid { - return nil, errors.ThrowPreconditionFailed(nil, "QUERY-WLTce", "Errors.User.NotHuman") + return nil, zerrors.ThrowPreconditionFailed(nil, "QUERY-WLTce", "Errors.User.NotHuman") } p.FirstName = firstName.String @@ -1010,13 +1011,13 @@ func prepareEmailQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilde &isEmailVerified, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-Hms2s", "Errors.User.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-Hms2s", "Errors.User.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Nu42d", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Nu42d", "Errors.Internal") } if !humanID.Valid { - return nil, errors.ThrowPreconditionFailed(nil, "QUERY-pt7HY", "Errors.User.NotHuman") + return nil, zerrors.ThrowPreconditionFailed(nil, "QUERY-pt7HY", "Errors.User.NotHuman") } e.Email = domain.EmailAddress(email.String) @@ -1057,13 +1058,13 @@ func preparePhoneQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilde &isPhoneVerified, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-DAvb3", "Errors.User.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-DAvb3", "Errors.User.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Bmf2h", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Bmf2h", "Errors.Internal") } if !humanID.Valid { - return nil, errors.ThrowPreconditionFailed(nil, "QUERY-hliQl", "Errors.User.NotHuman") + return nil, zerrors.ThrowPreconditionFailed(nil, "QUERY-hliQl", "Errors.User.NotHuman") } e.Phone = phone.String @@ -1175,14 +1176,14 @@ func scanNotifyUser(row *sql.Row) (*NotifyUser, error) { ) if err != nil || count != 1 { - if errs.Is(err, sql.ErrNoRows) || count != 1 { - return nil, errors.ThrowNotFound(err, "QUERY-Dgqd2", "Errors.User.NotFound") + if errors.Is(err, sql.ErrNoRows) || count != 1 { + return nil, zerrors.ThrowNotFound(err, "QUERY-Dgqd2", "Errors.User.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Dbwsg", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Dbwsg", "Errors.Internal") } if !notifyUserID.Valid { - return nil, errors.ThrowPreconditionFailed(nil, "QUERY-Sfw3f", "Errors.User.NotFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "QUERY-Sfw3f", "Errors.User.NotFound") } u.LoginNames = loginNames @@ -1235,10 +1236,10 @@ func prepareUserUniqueQuery(ctx context.Context, db prepareDatabase) (sq.SelectB &isEmailVerified, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { + if errors.Is(err, sql.ErrNoRows) { return true, nil } - return false, errors.ThrowInternal(err, "QUERY-Cxces", "Errors.Internal") + return false, zerrors.ThrowInternal(err, "QUERY-Cxces", "Errors.Internal") } return !userID.Valid, nil } @@ -1387,7 +1388,7 @@ func prepareUsersQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilde } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-frhbd", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-frhbd", "Errors.Query.CloseRows") } return &Users{ diff --git a/internal/query/user_auth_method.go b/internal/query/user_auth_method.go index 9341c13e6..e39fb2a8e 100644 --- a/internal/query/user_auth_method.go +++ b/internal/query/user_auth_method.go @@ -11,9 +11,9 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -127,7 +127,7 @@ func (q *Queries) SearchUserAuthMethods(ctx context.Context, queries *UserAuthMe } stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-j9NJd", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-j9NJd", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -158,7 +158,7 @@ func (q *Queries) ListActiveUserAuthMethodTypes(ctx context.Context, userID stri } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-Sfdrg", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-Sfdrg", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -189,7 +189,7 @@ func (q *Queries) ListUserAuthMethodTypesRequired(ctx context.Context, userID st } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, false, false, errors.ThrowInvalidArgument(err, "QUERY-E5ut4", "Errors.Query.InvalidRequest") + return nil, false, false, zerrors.ThrowInvalidArgument(err, "QUERY-E5ut4", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -197,7 +197,7 @@ func (q *Queries) ListUserAuthMethodTypesRequired(ctx context.Context, userID st return err }, stmt, args...) if err != nil { - return nil, false, false, errors.ThrowInternal(err, "QUERY-Dun75", "Errors.Internal") + return nil, false, false, zerrors.ThrowInternal(err, "QUERY-Dun75", "Errors.Internal") } return userAuthMethodTypes, forceMFA, forceMFALocalOnly, nil } @@ -330,7 +330,7 @@ func prepareUserAuthMethodsQuery(ctx context.Context, db prepareDatabase) (sq.Se } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-3n9fl", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-3n9fl", "Errors.Query.CloseRows") } return &AuthMethods{ @@ -392,7 +392,7 @@ func prepareActiveUserAuthMethodTypesQuery(ctx context.Context, db prepareDataba } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-3n9fl", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-3n9fl", "Errors.Query.CloseRows") } return &AuthMethodTypes{ @@ -467,7 +467,7 @@ func prepareUserAuthMethodTypesRequiredQuery(ctx context.Context, db prepareData } if err := rows.Close(); err != nil { - return nil, false, false, errors.ThrowInternal(err, "QUERY-W4zje", "Errors.Query.CloseRows") + return nil, false, false, zerrors.ThrowInternal(err, "QUERY-W4zje", "Errors.Query.CloseRows") } return userAuthMethodTypes, forceMFA.Bool, forceMFALocalOnly.Bool, nil diff --git a/internal/query/user_grant.go b/internal/query/user_grant.go index 170084d89..9e3cd3790 100644 --- a/internal/query/user_grant.go +++ b/internal/query/user_grant.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -14,10 +14,10 @@ import ( "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type UserGrant struct { @@ -255,7 +255,7 @@ func (q *Queries) UserGrant(ctx context.Context, shouldTriggerBulk bool, withOwn } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Fa1KW", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-Fa1KW", "Errors.Query.SQLStatement") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -283,7 +283,7 @@ func (q *Queries) UserGrants(ctx context.Context, queries *UserGrantsQueries, sh } stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-wXnQR", "Errors.Query.SQLStatement") + return nil, zerrors.ThrowInternal(err, "QUERY-wXnQR", "Errors.Query.SQLStatement") } latestSequence, err := q.latestState(ctx, userGrantTable) @@ -388,10 +388,10 @@ func prepareUserGrantQuery(ctx context.Context, db prepareDatabase) (sq.SelectBu &projectName, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-wIPkA", "Errors.UserGrant.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-wIPkA", "Errors.UserGrant.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-oQPcP", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-oQPcP", "Errors.Internal") } g.Username = username.String @@ -523,7 +523,7 @@ func prepareUserGrantsQuery(ctx context.Context, db prepareDatabase) (sq.SelectB } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-iGvmP", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-iGvmP", "Errors.Query.CloseRows") } return &UserGrants{ diff --git a/internal/query/user_grant_test.go b/internal/query/user_grant_test.go index 3fe6aca13..67e7fb9b8 100644 --- a/internal/query/user_grant_test.go +++ b/internal/query/user_grant_test.go @@ -10,7 +10,7 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -128,7 +128,7 @@ func Test_UserGrantPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/user_membership.go b/internal/query/user_membership.go index 9bf6c5b6d..b45bd5a94 100644 --- a/internal/query/user_membership.go +++ b/internal/query/user_membership.go @@ -11,10 +11,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type Memberships struct { @@ -142,7 +142,7 @@ func (q *Queries) Memberships(ctx context.Context, queries *MembershipSearchQuer eq := sq.Eq{membershipInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()} stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-T84X9", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-T84X9", "Errors.Query.InvalidRequest") } latestSequence, err := q.latestState(ctx, orgMemberTable, instanceMemberTable, projectMemberTable, projectGrantMemberTable) if err != nil { @@ -329,7 +329,7 @@ func prepareMembershipsQuery(ctx context.Context, db prepareDatabase, queries *M } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-N34NV", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-N34NV", "Errors.Query.CloseRows") } return &Memberships{ diff --git a/internal/query/user_metadata.go b/internal/query/user_metadata.go index a4f0fd2e9..d61d17b6b 100644 --- a/internal/query/user_metadata.go +++ b/internal/query/user_metadata.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -12,10 +12,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type UserMetadataList struct { @@ -98,7 +98,7 @@ func (q *Queries) GetUserMetadataByKey(ctx context.Context, shouldTriggerBulk bo } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-aDGG2", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-aDGG2", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -126,7 +126,7 @@ func (q *Queries) SearchUserMetadata(ctx context.Context, shouldTriggerBulk bool } stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Egbgd", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-Egbgd", "Errors.Query.SQLStatment") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -188,10 +188,10 @@ func prepareUserMetadataQuery(ctx context.Context, db prepareDatabase) (sq.Selec ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-Rgh32", "Errors.Metadata.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-Rgh32", "Errors.Metadata.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-Hhjt2", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Hhjt2", "Errors.Internal") } return m, nil } @@ -230,7 +230,7 @@ func prepareUserMetadataListQuery(ctx context.Context, db prepareDatabase) (sq.S } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-sd3gh", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-sd3gh", "Errors.Query.CloseRows") } return &UserMetadataList{ diff --git a/internal/query/user_metadata_test.go b/internal/query/user_metadata_test.go index 1fbd04cc7..8e5f9496f 100644 --- a/internal/query/user_metadata_test.go +++ b/internal/query/user_metadata_test.go @@ -8,7 +8,7 @@ import ( "regexp" "testing" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -68,7 +68,7 @@ func Test_UserMetadataPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -129,7 +129,7 @@ func Test_UserMetadataPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/user_otp.go b/internal/query/user_otp.go index 77e5e16fd..c25704813 100644 --- a/internal/query/user_otp.go +++ b/internal/query/user_otp.go @@ -5,10 +5,10 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (q *Queries) GetHumanOTPSecret(ctx context.Context, userID, resourceowner string) (_ string, err error) { @@ -16,14 +16,14 @@ func (q *Queries) GetHumanOTPSecret(ctx context.Context, userID, resourceowner s defer func() { span.EndWithError(err) }() if userID == "" { - return "", errors.ThrowPreconditionFailed(nil, "QUERY-8N9ds", "Errors.User.UserIDMissing") + return "", zerrors.ThrowPreconditionFailed(nil, "QUERY-8N9ds", "Errors.User.UserIDMissing") } existingOTP, err := q.otpReadModelByID(ctx, userID, resourceowner) if err != nil { return "", err } if existingOTP.State != domain.MFAStateReady { - return "", errors.ThrowNotFound(nil, "QUERY-01982h", "Errors.User.NotFound") + return "", zerrors.ThrowNotFound(nil, "QUERY-01982h", "Errors.User.NotFound") } return crypto.DecryptString(existingOTP.Secret, q.multifactors.OTP.CryptoMFA) diff --git a/internal/query/user_password.go b/internal/query/user_password.go index 5f991cf00..aa0bc60d2 100644 --- a/internal/query/user_password.go +++ b/internal/query/user_password.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type HumanPasswordReadModel struct { @@ -31,14 +31,14 @@ func (q *Queries) GetHumanPassword(ctx context.Context, orgID, userID string) (e defer func() { span.EndWithError(err) }() if userID == "" { - return "", errors.ThrowInvalidArgument(nil, "QUERY-4Mfsf", "Errors.User.UserIDMissing") + return "", zerrors.ThrowInvalidArgument(nil, "QUERY-4Mfsf", "Errors.User.UserIDMissing") } existingPassword, err := q.passwordReadModel(ctx, userID, orgID) if err != nil { - return "", errors.ThrowInternal(nil, "QUERY-p1k1n2i", "Errors.User.NotFound") + return "", zerrors.ThrowInternal(nil, "QUERY-p1k1n2i", "Errors.User.NotFound") } if existingPassword.UserState == domain.UserStateUnspecified || existingPassword.UserState == domain.UserStateDeleted { - return "", errors.ThrowPreconditionFailed(nil, "QUERY-3n77z", "Errors.User.NotFound") + return "", zerrors.ThrowPreconditionFailed(nil, "QUERY-3n77z", "Errors.User.NotFound") } return existingPassword.EncodedHash, nil } diff --git a/internal/query/user_personal_access_token.go b/internal/query/user_personal_access_token.go index 17726a06a..47f92ffc8 100644 --- a/internal/query/user_personal_access_token.go +++ b/internal/query/user_personal_access_token.go @@ -3,7 +3,7 @@ package query import ( "context" "database/sql" - errs "errors" + "errors" "time" sq "github.com/Masterminds/squirrel" @@ -13,10 +13,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/call" "github.com/zitadel/zitadel/internal/database" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -112,7 +112,7 @@ func (q *Queries) PersonalAccessTokenByID(ctx context.Context, shouldTriggerBulk } stmt, args, err := query.Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Dgfb4", "Errors.Query.SQLStatment") + return nil, zerrors.ThrowInternal(err, "QUERY-Dgfb4", "Errors.Query.SQLStatment") } err = q.client.QueryRowContext(ctx, func(row *sql.Row) error { @@ -138,7 +138,7 @@ func (q *Queries) SearchPersonalAccessTokens(ctx context.Context, queries *Perso } stmt, args, err := queries.toQuery(query).Where(eq).ToSql() if err != nil { - return nil, errors.ThrowInvalidArgument(err, "QUERY-Hjw2w", "Errors.Query.InvalidRequest") + return nil, zerrors.ThrowInvalidArgument(err, "QUERY-Hjw2w", "Errors.Query.InvalidRequest") } err = q.client.QueryContext(ctx, func(rows *sql.Rows) error { @@ -147,7 +147,7 @@ func (q *Queries) SearchPersonalAccessTokens(ctx context.Context, queries *Perso }, stmt, args...) if err != nil { - return nil, errors.ThrowInternal(err, "QUERY-Bmz63", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-Bmz63", "Errors.Internal") } personalAccessTokens.State, err = q.latestState(ctx, personalAccessTokensTable) @@ -204,10 +204,10 @@ func preparePersonalAccessTokenQuery(ctx context.Context, db prepareDatabase) (s &p.Scopes, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, errors.ThrowNotFound(err, "QUERY-fRunu", "Errors.PersonalAccessToken.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, zerrors.ThrowNotFound(err, "QUERY-fRunu", "Errors.PersonalAccessToken.NotFound") } - return nil, errors.ThrowInternal(err, "QUERY-dj2FF", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-dj2FF", "Errors.Internal") } return p, nil } @@ -249,7 +249,7 @@ func preparePersonalAccessTokensQuery(ctx context.Context, db prepareDatabase) ( } if err := rows.Close(); err != nil { - return nil, errors.ThrowInternal(err, "QUERY-QMXJv", "Errors.Query.CloseRows") + return nil, zerrors.ThrowInternal(err, "QUERY-QMXJv", "Errors.Query.CloseRows") } return &PersonalAccessTokens{ diff --git a/internal/query/user_personal_access_token_test.go b/internal/query/user_personal_access_token_test.go index 95b08c87c..79ba700ed 100644 --- a/internal/query/user_personal_access_token_test.go +++ b/internal/query/user_personal_access_token_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/zitadel/zitadel/internal/database" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -81,7 +81,7 @@ func Test_PersonalAccessTokenPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/user_test.go b/internal/query/user_test.go index 3459c45db..35cd2730e 100644 --- a/internal/query/user_test.go +++ b/internal/query/user_test.go @@ -13,7 +13,7 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -340,7 +340,7 @@ func Test_UserPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -566,7 +566,7 @@ func Test_UserPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -637,7 +637,7 @@ func Test_UserPrepares(t *testing.T) { }, ), err: func(err error) (error, bool) { - if !errs.IsPreconditionFailed(err) { + if !zerrors.IsPreconditionFailed(err) { return fmt.Errorf("err should be zitadel.PredconditionError got: %w", err), false } return nil, true @@ -672,7 +672,7 @@ func Test_UserPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -731,7 +731,7 @@ func Test_UserPrepares(t *testing.T) { }, ), err: func(err error) (error, bool) { - if !errs.IsPreconditionFailed(err) { + if !zerrors.IsPreconditionFailed(err) { return fmt.Errorf("err should be zitadel.PredconditionError got: %w", err), false } return nil, true @@ -766,7 +766,7 @@ func Test_UserPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -825,7 +825,7 @@ func Test_UserPrepares(t *testing.T) { }, ), err: func(err error) (error, bool) { - if !errs.IsPreconditionFailed(err) { + if !zerrors.IsPreconditionFailed(err) { return fmt.Errorf("err should be zitadel.PredconditionError got: %w", err), false } return nil, true @@ -860,7 +860,7 @@ func Test_UserPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -914,7 +914,7 @@ func Test_UserPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true @@ -1022,7 +1022,7 @@ func Test_UserPrepares(t *testing.T) { }, ), err: func(err error) (error, bool) { - if !errs.IsPreconditionFailed(err) { + if !zerrors.IsPreconditionFailed(err) { return fmt.Errorf("err should be zitadel.PredconditionError got: %w", err), false } return nil, true @@ -1057,7 +1057,7 @@ func Test_UserPrepares(t *testing.T) { nil, ), err: func(err error) (error, bool) { - if !errs.IsNotFound(err) { + if !zerrors.IsNotFound(err) { return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false } return nil, true diff --git a/internal/query/userinfo.go b/internal/query/userinfo.go index 9ee2721f5..2e2c27f9b 100644 --- a/internal/query/userinfo.go +++ b/internal/query/userinfo.go @@ -9,10 +9,10 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/database" - zerrors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/handler/v2" "github.com/zitadel/zitadel/internal/query/projection" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) // oidcUserInfoTriggerHandlers slice can only be created after zitadel diff --git a/internal/query/userinfo_test.go b/internal/query/userinfo_test.go index 762924760..2a6cb959c 100644 --- a/internal/query/userinfo_test.go +++ b/internal/query/userinfo_test.go @@ -16,7 +16,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -74,7 +74,7 @@ func TestQueries_GetOIDCUserInfo(t *testing.T) { userID: "231965491734773762", }, mock: mockQuery(expQuery, []string{"json_build_object"}, []driver.Value{testdataUserInfoNotFound}, "231965491734773762", "instanceID", nil), - wantErr: errors.ThrowNotFound(nil, "QUERY-ahs4S", "Errors.User.NotFound"), + wantErr: zerrors.ThrowNotFound(nil, "QUERY-ahs4S", "Errors.User.NotFound"), }, { name: "human without metadata", diff --git a/internal/renderer/renderer.go b/internal/renderer/renderer.go index ea889c104..d9e4a44ef 100644 --- a/internal/renderer/renderer.go +++ b/internal/renderer/renderer.go @@ -11,8 +11,8 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/api/authz" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/i18n" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -81,17 +81,17 @@ func (r *Renderer) loadTemplates(dir http.FileSystem, translator *i18n.Translato } templatesDir, err := dir.Open(templatesPath) if err != nil { - return errors.ThrowNotFound(err, "RENDE-G3aea", "path not found") + return zerrors.ThrowNotFound(err, "RENDE-G3aea", "path not found") } defer templatesDir.Close() files, err := templatesDir.Readdir(0) if err != nil { - return errors.ThrowNotFound(err, "RENDE-dfR33", "cannot read dir") + return zerrors.ThrowNotFound(err, "RENDE-dfR33", "cannot read dir") } tmpl := template.New("") for _, file := range files { if err := r.addFileToTemplate(dir, tmpl, tmplMapping, funcs, file); err != nil { - return errors.ThrowNotFound(err, "RENDE-dfTe1", "cannot append file to templates") + return zerrors.ThrowNotFound(err, "RENDE-dfTe1", "cannot append file to templates") } } r.Templates = make(map[string]*template.Template, len(tmplMapping)) diff --git a/internal/repository/action/action.go b/internal/repository/action/action.go index e1195fa66..518238266 100644 --- a/internal/repository/action/action.go +++ b/internal/repository/action/action.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -76,7 +76,7 @@ func AddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "ACTION-4n8vs", "unable to unmarshal action added") + return nil, zerrors.ThrowInternal(err, "ACTION-4n8vs", "unable to unmarshal action added") } return e, nil @@ -112,7 +112,7 @@ func NewChangedEvent( changes []ActionChanges, ) (*ChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "ACTION-dg4t2", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "ACTION-dg4t2", "Errors.NoChangesFound") } changeEvent := &ChangedEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -161,7 +161,7 @@ func ChangedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "ACTION-4n8vs", "unable to unmarshal action changed") + return nil, zerrors.ThrowInternal(err, "ACTION-4n8vs", "unable to unmarshal action changed") } return e, nil diff --git a/internal/repository/asset/asset.go b/internal/repository/asset/asset.go index e965b1ef8..ca389fc39 100644 --- a/internal/repository/asset/asset.go +++ b/internal/repository/asset/asset.go @@ -1,8 +1,8 @@ package asset import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -42,7 +42,7 @@ func AddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "ASSET-1WEAx", "unable to unmarshal asset") + return nil, zerrors.ThrowInternal(err, "ASSET-1WEAx", "unable to unmarshal asset") } return e, nil @@ -80,7 +80,7 @@ func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "ASSET-1m9PP", "unable to unmarshal asset") + return nil, zerrors.ThrowInternal(err, "ASSET-1m9PP", "unable to unmarshal asset") } return e, nil diff --git a/internal/repository/authrequest/auth_request.go b/internal/repository/authrequest/auth_request.go index 3633da54a..5e9f1ad39 100644 --- a/internal/repository/authrequest/auth_request.go +++ b/internal/repository/authrequest/auth_request.go @@ -5,8 +5,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -92,7 +92,7 @@ func AddedEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(added) if err != nil { - return nil, errors.ThrowInternal(err, "AUTHR-DG4gn", "unable to unmarshal auth request added") + return nil, zerrors.ThrowInternal(err, "AUTHR-DG4gn", "unable to unmarshal auth request added") } return added, nil @@ -141,7 +141,7 @@ func SessionLinkedEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(added) if err != nil { - return nil, errors.ThrowInternal(err, "AUTHR-Sfe3w", "unable to unmarshal auth request session linked") + return nil, zerrors.ThrowInternal(err, "AUTHR-Sfe3w", "unable to unmarshal auth request session linked") } return added, nil @@ -182,7 +182,7 @@ func FailedEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(added) if err != nil { - return nil, errors.ThrowInternal(err, "AUTHR-Sfe3w", "unable to unmarshal auth request session linked") + return nil, zerrors.ThrowInternal(err, "AUTHR-Sfe3w", "unable to unmarshal auth request session linked") } return added, nil @@ -218,7 +218,7 @@ func CodeAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(added) if err != nil { - return nil, errors.ThrowInternal(err, "AUTHR-Sfe3w", "unable to unmarshal auth request code added") + return nil, zerrors.ThrowInternal(err, "AUTHR-Sfe3w", "unable to unmarshal auth request code added") } return added, nil diff --git a/internal/repository/flow/flow.go b/internal/repository/flow/flow.go index d0c6a20f0..cd60bd80f 100644 --- a/internal/repository/flow/flow.go +++ b/internal/repository/flow/flow.go @@ -2,8 +2,8 @@ package flow import ( "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -51,7 +51,7 @@ func TriggerActionsSetEventMapper(event eventstore.Event) (eventstore.Event, err err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "FLOW-4n8vs", "unable to unmarshal trigger actions") + return nil, zerrors.ThrowInternal(err, "FLOW-4n8vs", "unable to unmarshal trigger actions") } return e, nil @@ -92,7 +92,7 @@ func TriggerActionsCascadeRemovedEventMapper(event eventstore.Event) (eventstore err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "FLOW-4n8vs", "unable to unmarshal trigger actions") + return nil, zerrors.ThrowInternal(err, "FLOW-4n8vs", "unable to unmarshal trigger actions") } return e, nil @@ -129,7 +129,7 @@ func FlowClearedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "FLOW-BHfg2", "unable to unmarshal flow cleared") + return nil, zerrors.ThrowInternal(err, "FLOW-BHfg2", "unable to unmarshal flow cleared") } return e, nil diff --git a/internal/repository/idp/apple.go b/internal/repository/idp/apple.go index f140357c0..9c8004b93 100644 --- a/internal/repository/idp/apple.go +++ b/internal/repository/idp/apple.go @@ -2,8 +2,8 @@ package idp import ( "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type AppleIDPAddedEvent struct { @@ -58,7 +58,7 @@ func AppleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Beqss", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Beqss", "unable to unmarshal event") } return e, nil @@ -83,7 +83,7 @@ func NewAppleIDPChangedEvent( changes []AppleIDPChanges, ) (*AppleIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-SF3h2", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-SF3h2", "Errors.NoChangesFound") } changedEvent := &AppleIDPChangedEvent{ BaseEvent: *base, @@ -154,7 +154,7 @@ func AppleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-NBe1s", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-NBe1s", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idp/azuread.go b/internal/repository/idp/azuread.go index ae7a434a8..a804070f1 100644 --- a/internal/repository/idp/azuread.go +++ b/internal/repository/idp/azuread.go @@ -2,8 +2,8 @@ package idp import ( "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type AzureADIDPAddedEvent struct { @@ -58,7 +58,7 @@ func AzureADIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Grh2g", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Grh2g", "unable to unmarshal event") } return e, nil @@ -83,7 +83,7 @@ func NewAzureADIDPChangedEvent( changes []AzureADIDPChanges, ) (*AzureADIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-BH3dl", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-BH3dl", "Errors.NoChangesFound") } changedEvent := &AzureADIDPChangedEvent{ BaseEvent: *base, @@ -154,7 +154,7 @@ func AzureADIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, err err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idp/github.go b/internal/repository/idp/github.go index 0b0a902a1..a146bbc55 100644 --- a/internal/repository/idp/github.go +++ b/internal/repository/idp/github.go @@ -2,8 +2,8 @@ package idp import ( "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type GitHubIDPAddedEvent struct { @@ -52,7 +52,7 @@ func GitHubIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-sdfs3", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-sdfs3", "unable to unmarshal event") } return e, nil @@ -75,7 +75,7 @@ func NewGitHubIDPChangedEvent( changes []GitHubIDPChanges, ) (*GitHubIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-BH3dl", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-BH3dl", "Errors.NoChangesFound") } changedEvent := &GitHubIDPChangedEvent{ BaseEvent: *base, @@ -133,7 +133,7 @@ func GitHubIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Sfrth", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Sfrth", "unable to unmarshal event") } return e, nil @@ -194,7 +194,7 @@ func GitHubEnterpriseIDPAddedEventMapper(event eventstore.Event) (eventstore.Eve err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-sdfs3", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-sdfs3", "unable to unmarshal event") } return e, nil @@ -220,7 +220,7 @@ func NewGitHubEnterpriseIDPChangedEvent( changes []GitHubEnterpriseIDPChanges, ) (*GitHubEnterpriseIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-JHKs9", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-JHKs9", "Errors.NoChangesFound") } changedEvent := &GitHubEnterpriseIDPChangedEvent{ BaseEvent: *base, @@ -296,7 +296,7 @@ func GitHubEnterpriseIDPChangedEventMapper(event eventstore.Event) (eventstore.E err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-ASf3r", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-ASf3r", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idp/gitlab.go b/internal/repository/idp/gitlab.go index 85cfabc74..e06024aa4 100644 --- a/internal/repository/idp/gitlab.go +++ b/internal/repository/idp/gitlab.go @@ -2,8 +2,8 @@ package idp import ( "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type GitLabIDPAddedEvent struct { @@ -52,7 +52,7 @@ func GitLabIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-KLewio", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-KLewio", "unable to unmarshal event") } return e, nil @@ -75,7 +75,7 @@ func NewGitLabIDPChangedEvent( changes []GitLabIDPChanges, ) (*GitLabIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-K2gje", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-K2gje", "Errors.NoChangesFound") } changedEvent := &GitLabIDPChangedEvent{ BaseEvent: *base, @@ -134,7 +134,7 @@ func GitLabIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Sfhjk", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Sfhjk", "unable to unmarshal event") } return e, nil @@ -189,7 +189,7 @@ func GitLabSelfHostedIDPAddedEventMapper(event eventstore.Event) (eventstore.Eve err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-S1efv", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-S1efv", "unable to unmarshal event") } return e, nil @@ -213,7 +213,7 @@ func NewGitLabSelfHostedIDPChangedEvent( changes []GitLabSelfHostedIDPChanges, ) (*GitLabSelfHostedIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-Dghj6", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-Dghj6", "Errors.NoChangesFound") } changedEvent := &GitLabSelfHostedIDPChangedEvent{ BaseEvent: *base, @@ -278,7 +278,7 @@ func GitLabSelfHostedIDPChangedEventMapper(event eventstore.Event) (eventstore.E err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-SFrhj", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-SFrhj", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idp/google.go b/internal/repository/idp/google.go index 3510b27ac..1a2c64c9a 100644 --- a/internal/repository/idp/google.go +++ b/internal/repository/idp/google.go @@ -2,8 +2,8 @@ package idp import ( "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type GoogleIDPAddedEvent struct { @@ -52,7 +52,7 @@ func GoogleIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-SAff1", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-SAff1", "unable to unmarshal event") } return e, nil @@ -75,7 +75,7 @@ func NewGoogleIDPChangedEvent( changes []GoogleIDPChanges, ) (*GoogleIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-Dg3qs", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-Dg3qs", "Errors.NoChangesFound") } changedEvent := &GoogleIDPChangedEvent{ BaseEvent: *base, @@ -133,7 +133,7 @@ func GoogleIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-SF3t2", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-SF3t2", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idp/idp.go b/internal/repository/idp/idp.go index 96b220485..341caebb8 100644 --- a/internal/repository/idp/idp.go +++ b/internal/repository/idp/idp.go @@ -1,8 +1,8 @@ package idp import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type Options struct { @@ -86,7 +86,7 @@ func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-plSD2", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-plSD2", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idp/jwt.go b/internal/repository/idp/jwt.go index 786d4a62f..7fe82e7c0 100644 --- a/internal/repository/idp/jwt.go +++ b/internal/repository/idp/jwt.go @@ -1,8 +1,8 @@ package idp import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type JWTIDPAddedEvent struct { @@ -54,7 +54,7 @@ func JWTIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event") } return e, nil @@ -78,7 +78,7 @@ func NewJWTIDPChangedEvent( changes []JWTIDPChanges, ) (*JWTIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-BH3dl", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-BH3dl", "Errors.NoChangesFound") } changedEvent := &JWTIDPChangedEvent{ BaseEvent: *base, @@ -143,7 +143,7 @@ func JWTIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idp/ldap.go b/internal/repository/idp/ldap.go index bc1b41fb7..5f5bb9ced 100644 --- a/internal/repository/idp/ldap.go +++ b/internal/repository/idp/ldap.go @@ -4,8 +4,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type LDAPIDPAddedEvent struct { @@ -178,7 +178,7 @@ func LDAPIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Dgh42", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Dgh42", "unable to unmarshal event") } return e, nil @@ -241,7 +241,7 @@ func NewLDAPIDPChangedEvent( changes []LDAPIDPChanges, ) (*LDAPIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-SDf3f", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-SDf3f", "Errors.NoChangesFound") } changedEvent := &LDAPIDPChangedEvent{ BaseEvent: *base, @@ -342,7 +342,7 @@ func LDAPIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Sfth3", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Sfth3", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idp/oauth.go b/internal/repository/idp/oauth.go index ce0178f8d..9b9b77608 100644 --- a/internal/repository/idp/oauth.go +++ b/internal/repository/idp/oauth.go @@ -2,8 +2,8 @@ package idp import ( "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type OAuthIDPAddedEvent struct { @@ -64,7 +64,7 @@ func OAuthIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event") } return e, nil @@ -91,7 +91,7 @@ func NewOAuthIDPChangedEvent( changes []OAuthIDPChanges, ) (*OAuthIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-BH3dl", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-BH3dl", "Errors.NoChangesFound") } changedEvent := &OAuthIDPChangedEvent{ BaseEvent: *base, @@ -173,7 +173,7 @@ func OAuthIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-SAf3gw", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-SAf3gw", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idp/oidc.go b/internal/repository/idp/oidc.go index 45478dc83..0970129ce 100644 --- a/internal/repository/idp/oidc.go +++ b/internal/repository/idp/oidc.go @@ -2,8 +2,8 @@ package idp import ( "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type OIDCIDPAddedEvent struct { @@ -58,7 +58,7 @@ func OIDCIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Et1dq", "unable to unmarshal event") } return e, nil @@ -83,7 +83,7 @@ func NewOIDCIDPChangedEvent( changes []OIDCIDPChanges, ) (*OIDCIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-BH3dl", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-BH3dl", "Errors.NoChangesFound") } changedEvent := &OIDCIDPChangedEvent{ BaseEvent: *base, @@ -154,7 +154,7 @@ func OIDCIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-D3gjzh", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idp/saml.go b/internal/repository/idp/saml.go index c4205600f..37534da20 100644 --- a/internal/repository/idp/saml.go +++ b/internal/repository/idp/saml.go @@ -2,8 +2,8 @@ package idp import ( "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type SAMLIDPAddedEvent struct { @@ -58,7 +58,7 @@ func SAMLIDPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-v9uajo3k71", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-v9uajo3k71", "unable to unmarshal event") } return e, nil @@ -83,7 +83,7 @@ func NewSAMLIDPChangedEvent( changes []SAMLIDPChanges, ) (*SAMLIDPChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDP-cz6mnf860t", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDP-cz6mnf860t", "Errors.NoChangesFound") } changedEvent := &SAMLIDPChangedEvent{ BaseEvent: *base, @@ -154,7 +154,7 @@ func SAMLIDPChangedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-w1t1824tw5", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-w1t1824tw5", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idpconfig/idp_config.go b/internal/repository/idpconfig/idp_config.go index ca9754ebe..f6cdc748c 100644 --- a/internal/repository/idpconfig/idp_config.go +++ b/internal/repository/idpconfig/idp_config.go @@ -2,8 +2,8 @@ package idpconfig import ( "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -66,7 +66,7 @@ func IDPConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") } return e, nil @@ -103,7 +103,7 @@ func NewIDPConfigChangedEvent( changes []IDPConfigChanges, ) (*IDPConfigChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDPCONFIG-Dsg21", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDPCONFIG-Dsg21", "Errors.NoChangesFound") } changeEvent := &IDPConfigChangedEvent{ BaseEvent: *base, @@ -143,7 +143,7 @@ func IDPConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") } return e, nil @@ -181,7 +181,7 @@ func IDPConfigDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") } return e, nil @@ -219,7 +219,7 @@ func IDPConfigReactivatedEventMapper(event eventstore.Event) (eventstore.Event, err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") } return e, nil @@ -260,7 +260,7 @@ func IDPConfigRemovedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idpconfig/jwt_config.go b/internal/repository/idpconfig/jwt_config.go index b2c460fdb..6d6a31e1c 100644 --- a/internal/repository/idpconfig/jwt_config.go +++ b/internal/repository/idpconfig/jwt_config.go @@ -2,8 +2,7 @@ package idpconfig import ( "github.com/zitadel/zitadel/internal/eventstore" - - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -54,7 +53,7 @@ func JWTConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "JWT-m0fwf", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "JWT-m0fwf", "unable to unmarshal event") } return e, nil @@ -85,7 +84,7 @@ func NewJWTConfigChangedEvent( changes []JWTConfigChanges, ) (*JWTConfigChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDPCONFIG-fn93s", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDPCONFIG-fn93s", "Errors.NoChangesFound") } changeEvent := &JWTConfigChangedEvent{ BaseEvent: *base, @@ -130,7 +129,7 @@ func JWTConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "JWT-fk3fs", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "JWT-fk3fs", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idpconfig/oidc_config.go b/internal/repository/idpconfig/oidc_config.go index 36e0136f0..2a3c80ed5 100644 --- a/internal/repository/idpconfig/oidc_config.go +++ b/internal/repository/idpconfig/oidc_config.go @@ -3,8 +3,8 @@ package idpconfig import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -69,7 +69,7 @@ func OIDCConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") } return e, nil @@ -105,7 +105,7 @@ func NewOIDCConfigChangedEvent( changes []OIDCConfigChanges, ) (*OIDCConfigChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IDPCONFIG-ADzr5", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IDPCONFIG-ADzr5", "Errors.NoChangesFound") } changeEvent := &OIDCConfigChangedEvent{ BaseEvent: *base, @@ -174,7 +174,7 @@ func OIDCConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, err err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "OIDC-plaBZ", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/idpintent/intent.go b/internal/repository/idpintent/intent.go index 7a596becb..9ac1a875c 100644 --- a/internal/repository/idpintent/intent.go +++ b/internal/repository/idpintent/intent.go @@ -5,8 +5,8 @@ import ( "net/url" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -60,7 +60,7 @@ func StartedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Sf3f1", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Sf3f1", "unable to unmarshal event") } return e, nil @@ -118,7 +118,7 @@ func SucceededEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-HBreq", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-HBreq", "unable to unmarshal event") } return e, nil @@ -173,7 +173,7 @@ func SAMLSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-l4tw23y6lq", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-l4tw23y6lq", "unable to unmarshal event") } return e, nil @@ -215,7 +215,7 @@ func SAMLRequestEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-l85678vwlf", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-l85678vwlf", "unable to unmarshal event") } return e, nil @@ -270,7 +270,7 @@ func LDAPSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-HBreq", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-HBreq", "unable to unmarshal event") } return e, nil @@ -312,7 +312,7 @@ func FailedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IDP-Sfer3", "unable to unmarshal event") + return nil, zerrors.ThrowInternal(err, "IDP-Sfer3", "unable to unmarshal event") } return e, nil diff --git a/internal/repository/instance/domain.go b/internal/repository/instance/domain.go index 0194bdbc2..faeb45a71 100644 --- a/internal/repository/instance/domain.go +++ b/internal/repository/instance/domain.go @@ -3,8 +3,8 @@ package instance import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -61,7 +61,7 @@ func DomainAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(domainAdded) if err != nil { - return nil, errors.ThrowInternal(err, "INSTANCE-3noij", "unable to unmarshal instance domain added") + return nil, zerrors.ThrowInternal(err, "INSTANCE-3noij", "unable to unmarshal instance domain added") } return domainAdded, nil @@ -98,7 +98,7 @@ func DomainPrimarySetEventMapper(event eventstore.Event) (eventstore.Event, erro } err := event.Unmarshal(domainAdded) if err != nil { - return nil, errors.ThrowInternal(err, "INSTANCE-29jöF", "unable to unmarshal instance domain added") + return nil, zerrors.ThrowInternal(err, "INSTANCE-29jöF", "unable to unmarshal instance domain added") } return domainAdded, nil @@ -135,7 +135,7 @@ func DomainRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(domainRemoved) if err != nil { - return nil, errors.ThrowInternal(err, "INSTANCE-BngB2", "unable to unmarshal instance domain removed") + return nil, zerrors.ThrowInternal(err, "INSTANCE-BngB2", "unable to unmarshal instance domain removed") } return domainRemoved, nil diff --git a/internal/repository/instance/event_default_language.go b/internal/repository/instance/event_default_language.go index 491266434..237fbb568 100644 --- a/internal/repository/instance/event_default_language.go +++ b/internal/repository/instance/event_default_language.go @@ -5,8 +5,8 @@ import ( "golang.org/x/text/language" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -48,7 +48,7 @@ func DefaultLanguageSetMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-3j9fs", "unable to unmarshal default language set") + return nil, zerrors.ThrowInternal(err, "IAM-3j9fs", "unable to unmarshal default language set") } return e, nil diff --git a/internal/repository/instance/event_iam_project_set.go b/internal/repository/instance/event_iam_project_set.go index b2f15fdd3..2506085a0 100644 --- a/internal/repository/instance/event_iam_project_set.go +++ b/internal/repository/instance/event_iam_project_set.go @@ -3,8 +3,8 @@ package instance import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -47,7 +47,7 @@ func ProjectSetMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-cdFZH", "unable to unmarshal global org set") + return nil, zerrors.ThrowInternal(err, "IAM-cdFZH", "unable to unmarshal global org set") } return e, nil @@ -91,7 +91,7 @@ func ConsoleSetMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-cdFZH", "unable to unmarshal console set") + return nil, zerrors.ThrowInternal(err, "IAM-cdFZH", "unable to unmarshal console set") } return e, nil diff --git a/internal/repository/instance/event_org_set.go b/internal/repository/instance/event_org_set.go index 161e31713..a88bfd72e 100644 --- a/internal/repository/instance/event_org_set.go +++ b/internal/repository/instance/event_org_set.go @@ -3,8 +3,8 @@ package instance import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -46,7 +46,7 @@ func DefaultOrgSetMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-cdFZH", "unable to unmarshal default org set") + return nil, zerrors.ThrowInternal(err, "IAM-cdFZH", "unable to unmarshal default org set") } return e, nil diff --git a/internal/repository/instance/instance.go b/internal/repository/instance/instance.go index 8480fd17c..bd0214075 100644 --- a/internal/repository/instance/instance.go +++ b/internal/repository/instance/instance.go @@ -3,8 +3,8 @@ package instance import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -44,7 +44,7 @@ func InstanceAddedEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(instanceAdded) if err != nil { - return nil, errors.ThrowInternal(err, "INSTANCE-s9l3F", "unable to unmarshal instance added") + return nil, zerrors.ThrowInternal(err, "INSTANCE-s9l3F", "unable to unmarshal instance added") } return instanceAdded, nil @@ -81,7 +81,7 @@ func InstanceChangedEventMapper(event eventstore.Event) (eventstore.Event, error } err := event.Unmarshal(instanceChanged) if err != nil { - return nil, errors.ThrowInternal(err, "INSTANCE-3hfo8", "unable to unmarshal instance changed") + return nil, zerrors.ThrowInternal(err, "INSTANCE-3hfo8", "unable to unmarshal instance changed") } return instanceChanged, nil diff --git a/internal/repository/instance/oidc_settings.go b/internal/repository/instance/oidc_settings.go index edef8d2c6..c3829499f 100644 --- a/internal/repository/instance/oidc_settings.go +++ b/internal/repository/instance/oidc_settings.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -58,7 +58,7 @@ func OIDCSettingsAddedEventMapper(event eventstore.Event) (eventstore.Event, err } err := event.Unmarshal(oidcSettingsAdded) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-soiwj", "unable to unmarshal oidc config added") + return nil, zerrors.ThrowInternal(err, "IAM-soiwj", "unable to unmarshal oidc config added") } return oidcSettingsAdded, nil @@ -87,7 +87,7 @@ func NewOIDCSettingsChangeEvent( changes []OIDCSettingsChanges, ) (*OIDCSettingsChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IAM-dnlwe", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IAM-dnlwe", "Errors.NoChangesFound") } changeEvent := &OIDCSettingsChangedEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -135,7 +135,7 @@ func OIDCSettingsChangedEventMapper(event eventstore.Event) (eventstore.Event, e err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-f98uf", "unable to unmarshal oidc settings changed") + return nil, zerrors.ThrowInternal(err, "IAM-f98uf", "unable to unmarshal oidc settings changed") } return e, nil diff --git a/internal/repository/instance/policy_security.go b/internal/repository/instance/policy_security.go index 4faeb8ecc..f5627c54c 100644 --- a/internal/repository/instance/policy_security.go +++ b/internal/repository/instance/policy_security.go @@ -3,8 +3,8 @@ package instance import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -25,7 +25,7 @@ func NewSecurityPolicySetEvent( changes []SecurityPolicyChanges, ) (*SecurityPolicySetEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-EWsf3", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-EWsf3", "Errors.NoChangesFound") } event := &SecurityPolicySetEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -71,7 +71,7 @@ func SecurityPolicySetEventMapper(event eventstore.Event) (eventstore.Event, err } err := event.Unmarshal(securityPolicyAdded) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-soiwj", "unable to unmarshal oidc config added") + return nil, zerrors.ThrowInternal(err, "IAM-soiwj", "unable to unmarshal oidc config added") } return securityPolicyAdded, nil diff --git a/internal/repository/instance/secret_generator.go b/internal/repository/instance/secret_generator.go index 4af5387c0..08e03df2b 100644 --- a/internal/repository/instance/secret_generator.go +++ b/internal/repository/instance/secret_generator.go @@ -5,8 +5,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -83,7 +83,7 @@ func SecretGeneratorAddedEventMapper(event eventstore.Event) (eventstore.Event, } err := event.Unmarshal(secretGeneratorAdded) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-en9f4", "unable to unmarshal secret generator added") + return nil, zerrors.ThrowInternal(err, "IAM-en9f4", "unable to unmarshal secret generator added") } return secretGeneratorAdded, nil @@ -116,7 +116,7 @@ func NewSecretGeneratorChangeEvent( changes []SecretGeneratorChanges, ) (*SecretGeneratorChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IAM-j2jfw", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IAM-j2jfw", "Errors.NoChangesFound") } changeEvent := &SecretGeneratorChangedEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -177,7 +177,7 @@ func SecretGeneratorChangedEventMapper(event eventstore.Event) (eventstore.Event err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-2m09e", "unable to unmarshal secret generator changed") + return nil, zerrors.ThrowInternal(err, "IAM-2m09e", "unable to unmarshal secret generator changed") } return e, nil @@ -219,7 +219,7 @@ func SecretGeneratorRemovedEventMapper(event eventstore.Event) (eventstore.Event err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-m09ke", "unable to unmarshal secret generator removed") + return nil, zerrors.ThrowInternal(err, "IAM-m09ke", "unable to unmarshal secret generator removed") } return e, nil diff --git a/internal/repository/instance/sms.go b/internal/repository/instance/sms.go index dfa7e83c2..1b79f1d77 100644 --- a/internal/repository/instance/sms.go +++ b/internal/repository/instance/sms.go @@ -4,8 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -63,7 +63,7 @@ func SMSConfigTwilioAddedEventMapper(event eventstore.Event) (eventstore.Event, } err := event.Unmarshal(smsConfigAdded) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-smwiR", "unable to unmarshal sms config twilio added") + return nil, zerrors.ThrowInternal(err, "IAM-smwiR", "unable to unmarshal sms config twilio added") } return smsConfigAdded, nil @@ -84,7 +84,7 @@ func NewSMSConfigTwilioChangedEvent( changes []SMSConfigTwilioChanges, ) (*SMSConfigTwilioChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IAM-smn8e", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IAM-smn8e", "Errors.NoChangesFound") } changeEvent := &SMSConfigTwilioChangedEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -128,7 +128,7 @@ func SMSConfigTwilioChangedEventMapper(event eventstore.Event) (eventstore.Event } err := event.Unmarshal(smsConfigChanged) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-smwiR", "unable to unmarshal sms config twilio added") + return nil, zerrors.ThrowInternal(err, "IAM-smwiR", "unable to unmarshal sms config twilio added") } return smsConfigChanged, nil @@ -172,7 +172,7 @@ func SMSConfigTwilioTokenChangedEventMapper(event eventstore.Event) (eventstore. } err := event.Unmarshal(smtpConfigTokenChagned) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-fi9Wf", "unable to unmarshal sms config token changed") + return nil, zerrors.ThrowInternal(err, "IAM-fi9Wf", "unable to unmarshal sms config token changed") } return smtpConfigTokenChagned, nil @@ -212,7 +212,7 @@ func SMSConfigActivatedEventMapper(event eventstore.Event) (eventstore.Event, er } err := event.Unmarshal(smsConfigActivated) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-dn92f", "unable to unmarshal sms config twilio activated changed") + return nil, zerrors.ThrowInternal(err, "IAM-dn92f", "unable to unmarshal sms config twilio activated changed") } return smsConfigActivated, nil @@ -252,7 +252,7 @@ func SMSConfigDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, } err := event.Unmarshal(smsConfigDeactivated) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-dn92f", "unable to unmarshal sms config twilio deactivated changed") + return nil, zerrors.ThrowInternal(err, "IAM-dn92f", "unable to unmarshal sms config twilio deactivated changed") } return smsConfigDeactivated, nil @@ -292,7 +292,7 @@ func SMSConfigRemovedEventMapper(event eventstore.Event) (eventstore.Event, erro } err := event.Unmarshal(smsConfigRemoved) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-99iNF", "unable to unmarshal sms config removed") + return nil, zerrors.ThrowInternal(err, "IAM-99iNF", "unable to unmarshal sms config removed") } return smsConfigRemoved, nil diff --git a/internal/repository/instance/smtp_config.go b/internal/repository/instance/smtp_config.go index eccb18dfe..b0da86cd2 100644 --- a/internal/repository/instance/smtp_config.go +++ b/internal/repository/instance/smtp_config.go @@ -4,8 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -69,7 +69,7 @@ func SMTPConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error } err := event.Unmarshal(smtpConfigAdded) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-39fks", "unable to unmarshal smtp config added") + return nil, zerrors.ThrowInternal(err, "IAM-39fks", "unable to unmarshal smtp config added") } return smtpConfigAdded, nil @@ -100,7 +100,7 @@ func NewSMTPConfigChangeEvent( changes []SMTPConfigChanges, ) (*SMTPConfigChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "IAM-o0pWf", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "IAM-o0pWf", "Errors.NoChangesFound") } changeEvent := &SMTPConfigChangedEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -160,7 +160,7 @@ func SMTPConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, err err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-m09oo", "unable to unmarshal smtp changed") + return nil, zerrors.ThrowInternal(err, "IAM-m09oo", "unable to unmarshal smtp changed") } return e, nil @@ -201,7 +201,7 @@ func SMTPConfigPasswordChangedEventMapper(event eventstore.Event) (eventstore.Ev } err := event.Unmarshal(smtpConfigPasswordChagned) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-99iNF", "unable to unmarshal smtp config password changed") + return nil, zerrors.ThrowInternal(err, "IAM-99iNF", "unable to unmarshal smtp config password changed") } return smtpConfigPasswordChagned, nil @@ -238,7 +238,7 @@ func SMTPConfigRemovedEventMapper(event eventstore.Event) (eventstore.Event, err } err := event.Unmarshal(smtpConfigRemoved) if err != nil { - return nil, errors.ThrowInternal(err, "IAM-DVw1s", "unable to unmarshal smtp config removed") + return nil, zerrors.ThrowInternal(err, "IAM-DVw1s", "unable to unmarshal smtp config removed") } return smtpConfigRemoved, nil diff --git a/internal/repository/keypair/certificate.go b/internal/repository/keypair/certificate.go index 9a49ccc7d..2fd9a62d6 100644 --- a/internal/repository/keypair/certificate.go +++ b/internal/repository/keypair/certificate.go @@ -5,8 +5,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -52,7 +52,7 @@ func AddedCertificateEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "KEY-4n9vs", "unable to unmarshal certificate added") + return nil, zerrors.ThrowInternal(err, "KEY-4n9vs", "unable to unmarshal certificate added") } return e, nil diff --git a/internal/repository/keypair/key_pair.go b/internal/repository/keypair/key_pair.go index 99b57555d..8bf2e7708 100644 --- a/internal/repository/keypair/key_pair.go +++ b/internal/repository/keypair/key_pair.go @@ -6,8 +6,8 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -72,7 +72,7 @@ func AddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "KEY-4n8vs", "unable to unmarshal key pair added") + return nil, zerrors.ThrowInternal(err, "KEY-4n8vs", "unable to unmarshal key pair added") } return e, nil diff --git a/internal/repository/member/events.go b/internal/repository/member/events.go index 3ead301f0..0c98b46a4 100644 --- a/internal/repository/member/events.go +++ b/internal/repository/member/events.go @@ -3,8 +3,8 @@ package member import ( "fmt" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -64,7 +64,7 @@ func MemberAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-puqv4", "unable to unmarshal label policy") + return nil, zerrors.ThrowInternal(err, "POLIC-puqv4", "unable to unmarshal label policy") } return e, nil @@ -104,7 +104,7 @@ func ChangedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-puqv4", "unable to unmarshal label policy") + return nil, zerrors.ThrowInternal(err, "POLIC-puqv4", "unable to unmarshal label policy") } return e, nil @@ -142,7 +142,7 @@ func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "MEMBER-Ep4ip", "unable to unmarshal label policy") + return nil, zerrors.ThrowInternal(err, "MEMBER-Ep4ip", "unable to unmarshal label policy") } return e, nil @@ -180,7 +180,7 @@ func CascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "MEMBER-3j9sf", "unable to unmarshal label policy") + return nil, zerrors.ThrowInternal(err, "MEMBER-3j9sf", "unable to unmarshal label policy") } return e, nil diff --git a/internal/repository/metadata/metadata.go b/internal/repository/metadata/metadata.go index 7026badb1..2e4a3c11c 100644 --- a/internal/repository/metadata/metadata.go +++ b/internal/repository/metadata/metadata.go @@ -1,8 +1,8 @@ package metadata import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -45,7 +45,7 @@ func SetEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "META-3n9fs", "unable to unmarshal metadata set") + return nil, zerrors.ThrowInternal(err, "META-3n9fs", "unable to unmarshal metadata set") } return e, nil @@ -83,7 +83,7 @@ func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "META-2m99f", "unable to unmarshal metadata removed") + return nil, zerrors.ThrowInternal(err, "META-2m99f", "unable to unmarshal metadata removed") } return e, nil diff --git a/internal/repository/org/domain.go b/internal/repository/org/domain.go index 348964212..5987e9c3c 100644 --- a/internal/repository/org/domain.go +++ b/internal/repository/org/domain.go @@ -5,8 +5,8 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -64,7 +64,7 @@ func DomainAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(orgDomainAdded) if err != nil { - return nil, errors.ThrowInternal(err, "ORG-GBr52", "unable to unmarshal org domain added") + return nil, zerrors.ThrowInternal(err, "ORG-GBr52", "unable to unmarshal org domain added") } return orgDomainAdded, nil @@ -110,7 +110,7 @@ func DomainVerificationAddedEventMapper(event eventstore.Event) (eventstore.Even } err := event.Unmarshal(orgDomainVerificationAdded) if err != nil { - return nil, errors.ThrowInternal(err, "ORG-NRN32", "unable to unmarshal org domain verification added") + return nil, zerrors.ThrowInternal(err, "ORG-NRN32", "unable to unmarshal org domain verification added") } return orgDomainVerificationAdded, nil @@ -147,7 +147,7 @@ func DomainVerificationFailedEventMapper(event eventstore.Event) (eventstore.Eve } err := event.Unmarshal(orgDomainVerificationFailed) if err != nil { - return nil, errors.ThrowInternal(err, "ORG-Bhm37", "unable to unmarshal org domain verification failed") + return nil, zerrors.ThrowInternal(err, "ORG-Bhm37", "unable to unmarshal org domain verification failed") } return orgDomainVerificationFailed, nil @@ -184,7 +184,7 @@ func DomainVerifiedEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(orgDomainVerified) if err != nil { - return nil, errors.ThrowInternal(err, "ORG-BFSwt", "unable to unmarshal org domain verified") + return nil, zerrors.ThrowInternal(err, "ORG-BFSwt", "unable to unmarshal org domain verified") } return orgDomainVerified, nil @@ -221,7 +221,7 @@ func DomainPrimarySetEventMapper(event eventstore.Event) (eventstore.Event, erro } err := event.Unmarshal(orgDomainPrimarySet) if err != nil { - return nil, errors.ThrowInternal(err, "ORG-N5787", "unable to unmarshal org domain primary set") + return nil, zerrors.ThrowInternal(err, "ORG-N5787", "unable to unmarshal org domain primary set") } return orgDomainPrimarySet, nil @@ -263,7 +263,7 @@ func DomainRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(orgDomainRemoved) if err != nil { - return nil, errors.ThrowInternal(err, "ORG-BngB2", "unable to unmarshal org domain removed") + return nil, zerrors.ThrowInternal(err, "ORG-BngB2", "unable to unmarshal org domain removed") } return orgDomainRemoved, nil diff --git a/internal/repository/org/org.go b/internal/repository/org/org.go index 66bbc59a4..af19fb18f 100644 --- a/internal/repository/org/org.go +++ b/internal/repository/org/org.go @@ -4,10 +4,10 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -63,7 +63,7 @@ func OrgAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(orgAdded) if err != nil { - return nil, errors.ThrowInternal(err, "ORG-Bren2", "unable to unmarshal org added") + return nil, zerrors.ThrowInternal(err, "ORG-Bren2", "unable to unmarshal org added") } return orgAdded, nil @@ -105,7 +105,7 @@ func OrgChangedEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(orgChanged) if err != nil { - return nil, errors.ThrowInternal(err, "ORG-Bren2", "unable to unmarshal org added") + return nil, zerrors.ThrowInternal(err, "ORG-Bren2", "unable to unmarshal org added") } return orgChanged, nil diff --git a/internal/repository/policy/custom_text.go b/internal/repository/policy/custom_text.go index 4f3272bbe..9046977f5 100644 --- a/internal/repository/policy/custom_text.go +++ b/internal/repository/policy/custom_text.go @@ -3,8 +3,8 @@ package policy import ( "golang.org/x/text/language" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -54,7 +54,7 @@ func CustomTextSetEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "TEXT-28dwe", "unable to unmarshal custom text") + return nil, zerrors.ThrowInternal(err, "TEXT-28dwe", "unable to unmarshal custom text") } return e, nil @@ -92,7 +92,7 @@ func CustomTextRemovedEventMapper(event eventstore.Event) (eventstore.Event, err err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "TEXT-28sMf", "unable to unmarshal custom text removed") + return nil, zerrors.ThrowInternal(err, "TEXT-28sMf", "unable to unmarshal custom text removed") } return e, nil @@ -128,7 +128,7 @@ func CustomTextTemplateRemovedEventMapper(event eventstore.Event) (eventstore.Ev err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "TEXT-mKKRs", "unable to unmarshal custom text message removed") + return nil, zerrors.ThrowInternal(err, "TEXT-mKKRs", "unable to unmarshal custom text message removed") } return e, nil diff --git a/internal/repository/policy/label.go b/internal/repository/policy/label.go index d3025b5ba..b004b2377 100644 --- a/internal/repository/policy/label.go +++ b/internal/repository/policy/label.go @@ -2,9 +2,9 @@ package policy import ( "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/asset" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -95,7 +95,7 @@ func LabelPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-puqv4", "unable to unmarshal label policy") + return nil, zerrors.ThrowInternal(err, "POLIC-puqv4", "unable to unmarshal label policy") } return e, nil @@ -131,7 +131,7 @@ func NewLabelPolicyChangedEvent( changes []LabelPolicyChanges, ) (*LabelPolicyChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-Asfd3", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-Asfd3", "Errors.NoChangesFound") } changeEvent := &LabelPolicyChangedEvent{ BaseEvent: *base, @@ -223,7 +223,7 @@ func LabelPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, er err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-qhfFb", "unable to unmarshal label policy") + return nil, zerrors.ThrowInternal(err, "POLIC-qhfFb", "unable to unmarshal label policy") } return e, nil diff --git a/internal/repository/policy/login.go b/internal/repository/policy/login.go index f5e361855..06def120b 100644 --- a/internal/repository/policy/login.go +++ b/internal/repository/policy/login.go @@ -4,8 +4,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -94,7 +94,7 @@ func LoginPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-nWndT", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-nWndT", "unable to unmarshal policy") } return e, nil @@ -135,7 +135,7 @@ func NewLoginPolicyChangedEvent( changes []LoginPolicyChanges, ) (*LoginPolicyChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-ADg34", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-ADg34", "Errors.NoChangesFound") } changeEvent := &LoginPolicyChangedEvent{ BaseEvent: *base, @@ -257,7 +257,7 @@ func LoginPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, er err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-ehssl", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-ehssl", "unable to unmarshal policy") } return e, nil diff --git a/internal/repository/policy/mail_template.go b/internal/repository/policy/mail_template.go index 3b02c0f4f..19af380b8 100644 --- a/internal/repository/policy/mail_template.go +++ b/internal/repository/policy/mail_template.go @@ -1,8 +1,8 @@ package policy import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -44,7 +44,7 @@ func MailTemplateAddedEventMapper(event eventstore.Event) (eventstore.Event, err err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-5m9if", "unable to unmarshal mail template") + return nil, zerrors.ThrowInternal(err, "POLIC-5m9if", "unable to unmarshal mail template") } return e, nil @@ -69,7 +69,7 @@ func NewMailTemplateChangedEvent( changes []MailTemplateChanges, ) (*MailTemplateChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-m9osd", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-m9osd", "Errors.NoChangesFound") } changeEvent := &MailTemplateChangedEvent{ BaseEvent: *base, @@ -95,7 +95,7 @@ func MailTemplateChangedEventMapper(event eventstore.Event) (eventstore.Event, e err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-3uu8K", "unable to unmarshal mail template policy") + return nil, zerrors.ThrowInternal(err, "POLIC-3uu8K", "unable to unmarshal mail template policy") } return e, nil diff --git a/internal/repository/policy/mail_text.go b/internal/repository/policy/mail_text.go index 04e3363ab..98ab93636 100644 --- a/internal/repository/policy/mail_text.go +++ b/internal/repository/policy/mail_text.go @@ -3,8 +3,8 @@ package policy import ( "fmt" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -80,7 +80,7 @@ func MailTextAddedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-5m9if", "unable to unmarshal mail text policy") + return nil, zerrors.ThrowInternal(err, "POLIC-5m9if", "unable to unmarshal mail text policy") } return e, nil @@ -114,7 +114,7 @@ func NewMailTextChangedEvent( changes []MailTextChanges, ) (*MailTextChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-m9osd", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-m9osd", "Errors.NoChangesFound") } changeEvent := &MailTextChangedEvent{ BaseEvent: *base, @@ -172,7 +172,7 @@ func MailTextChangedEventMapper(event eventstore.Event) (eventstore.Event, error err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-bn88u", "unable to unmarshal mail text policy") + return nil, zerrors.ThrowInternal(err, "POLIC-bn88u", "unable to unmarshal mail text policy") } return e, nil diff --git a/internal/repository/policy/policy_domain.go b/internal/repository/policy/policy_domain.go index 607fa5e4a..bd1d9c1b7 100644 --- a/internal/repository/policy/policy_domain.go +++ b/internal/repository/policy/policy_domain.go @@ -1,8 +1,8 @@ package policy import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -49,7 +49,7 @@ func DomainPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, err err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-TvSmA", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-TvSmA", "unable to unmarshal policy") } return e, nil @@ -76,7 +76,7 @@ func NewDomainPolicyChangedEvent( changes []DomainPolicyChanges, ) (*DomainPolicyChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-DAf3h", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-DAf3h", "Errors.NoChangesFound") } changeEvent := &DomainPolicyChangedEvent{ BaseEvent: *base, @@ -114,7 +114,7 @@ func DomainPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, e err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-0Pl9d", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-0Pl9d", "unable to unmarshal policy") } return e, nil diff --git a/internal/repository/policy/policy_login_factors.go b/internal/repository/policy/policy_login_factors.go index a2749eb5f..0e9625f22 100644 --- a/internal/repository/policy/policy_login_factors.go +++ b/internal/repository/policy/policy_login_factors.go @@ -2,8 +2,8 @@ package policy import ( "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -39,7 +39,7 @@ func SecondFactorAddedEventMapper(event eventstore.Event) (eventstore.Event, err err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-Lp0dE", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-Lp0dE", "unable to unmarshal policy") } return e, nil @@ -75,7 +75,7 @@ func SecondFactorRemovedEventMapper(event eventstore.Event) (eventstore.Event, e err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-5M9gd", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-5M9gd", "unable to unmarshal policy") } return e, nil @@ -112,7 +112,7 @@ func MultiFactorAddedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-5Ms90", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-5Ms90", "unable to unmarshal policy") } return e, nil @@ -148,7 +148,7 @@ func MultiFactorRemovedEventMapper(event eventstore.Event) (eventstore.Event, er err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-1N8sd", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-1N8sd", "unable to unmarshal policy") } return e, nil diff --git a/internal/repository/policy/policy_login_identity_provider.go b/internal/repository/policy/policy_login_identity_provider.go index 2b5ff578c..37166f6bd 100644 --- a/internal/repository/policy/policy_login_identity_provider.go +++ b/internal/repository/policy/policy_login_identity_provider.go @@ -2,8 +2,8 @@ package policy import ( "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -48,7 +48,7 @@ func IdentityProviderAddedEventMapper(event eventstore.Event) (eventstore.Event, err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROVI-bfNnp", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "PROVI-bfNnp", "Errors.Internal") } return e, nil @@ -85,7 +85,7 @@ func IdentityProviderRemovedEventMapper(event eventstore.Event) (eventstore.Even err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROVI-6H0KQ", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "PROVI-6H0KQ", "Errors.Internal") } return e, nil @@ -122,7 +122,7 @@ func IdentityProviderCascadeRemovedEventMapper(event eventstore.Event) (eventsto err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROVI-7M9fs", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "PROVI-7M9fs", "Errors.Internal") } return e, nil diff --git a/internal/repository/policy/policy_notification.go b/internal/repository/policy/policy_notification.go index 3ce617e78..c6f234ef2 100644 --- a/internal/repository/policy/policy_notification.go +++ b/internal/repository/policy/policy_notification.go @@ -1,8 +1,8 @@ package policy import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -42,7 +42,7 @@ func NotificationPolicyAddedEventMapper(event eventstore.Event) (eventstore.Even err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-0sp2nios", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-0sp2nios", "unable to unmarshal policy") } return e, nil @@ -67,7 +67,7 @@ func NewNotificationPolicyChangedEvent( changes []NotificationPolicyChanges, ) (*NotificationPolicyChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-09sp2m", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-09sp2m", "Errors.NoChangesFound") } changeEvent := &NotificationPolicyChangedEvent{ BaseEvent: *base, @@ -93,7 +93,7 @@ func NotificationPolicyChangedEventMapper(event eventstore.Event) (eventstore.Ev err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-09s2oss", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-09s2oss", "unable to unmarshal policy") } return e, nil diff --git a/internal/repository/policy/policy_password_age.go b/internal/repository/policy/policy_password_age.go index ee2ea88a3..b8c5fadb7 100644 --- a/internal/repository/policy/policy_password_age.go +++ b/internal/repository/policy/policy_password_age.go @@ -1,8 +1,8 @@ package policy import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -46,7 +46,7 @@ func PasswordAgePolicyAddedEventMapper(event eventstore.Event) (eventstore.Event err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-T3mGp", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-T3mGp", "unable to unmarshal policy") } return e, nil @@ -72,7 +72,7 @@ func NewPasswordAgePolicyChangedEvent( changes []PasswordAgePolicyChanges, ) (*PasswordAgePolicyChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-DAgt5", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-DAgt5", "Errors.NoChangesFound") } changeEvent := &PasswordAgePolicyChangedEvent{ BaseEvent: *base, @@ -104,7 +104,7 @@ func PasswordAgePolicyChangedEventMapper(event eventstore.Event) (eventstore.Eve err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-PqaVq", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-PqaVq", "unable to unmarshal policy") } return e, nil diff --git a/internal/repository/policy/policy_password_complexity.go b/internal/repository/policy/policy_password_complexity.go index 00a35da80..da38774c6 100644 --- a/internal/repository/policy/policy_password_complexity.go +++ b/internal/repository/policy/policy_password_complexity.go @@ -1,8 +1,8 @@ package policy import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -54,7 +54,7 @@ func PasswordComplexityPolicyAddedEventMapper(event eventstore.Event) (eventstor err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-wYxlM", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-wYxlM", "unable to unmarshal policy") } return e, nil @@ -83,7 +83,7 @@ func NewPasswordComplexityPolicyChangedEvent( changes []PasswordComplexityPolicyChanges, ) (*PasswordComplexityPolicyChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-Rdhu3", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-Rdhu3", "Errors.NoChangesFound") } changeEvent := &PasswordComplexityPolicyChangedEvent{ BaseEvent: *base, @@ -133,7 +133,7 @@ func PasswordComplexityPolicyChangedEventMapper(event eventstore.Event) (eventst err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-zBGB0", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-zBGB0", "unable to unmarshal policy") } return e, nil diff --git a/internal/repository/policy/policy_password_lockout.go b/internal/repository/policy/policy_password_lockout.go index 5e1c1b398..8ca073767 100644 --- a/internal/repository/policy/policy_password_lockout.go +++ b/internal/repository/policy/policy_password_lockout.go @@ -1,8 +1,8 @@ package policy import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -46,7 +46,7 @@ func LockoutPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, er err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-8XiVd", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-8XiVd", "unable to unmarshal policy") } return e, nil @@ -72,7 +72,7 @@ func NewLockoutPolicyChangedEvent( changes []LockoutPolicyChanges, ) (*LockoutPolicyChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-sdgh6", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-sdgh6", "Errors.NoChangesFound") } changeEvent := &LockoutPolicyChangedEvent{ BaseEvent: *base, @@ -104,7 +104,7 @@ func LockoutPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-lWGRc", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-lWGRc", "unable to unmarshal policy") } return e, nil diff --git a/internal/repository/policy/policy_privacy.go b/internal/repository/policy/policy_privacy.go index 75782c3cd..0b674fff6 100644 --- a/internal/repository/policy/policy_privacy.go +++ b/internal/repository/policy/policy_privacy.go @@ -2,8 +2,8 @@ package policy import ( "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -51,7 +51,7 @@ func PrivacyPolicyAddedEventMapper(event eventstore.Event) (eventstore.Event, er } err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-2k0fs", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-2k0fs", "unable to unmarshal policy") } return e, nil @@ -79,7 +79,7 @@ func NewPrivacyPolicyChangedEvent( changes []PrivacyPolicyChanges, ) (*PrivacyPolicyChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "POLICY-PPo0s", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "POLICY-PPo0s", "Errors.NoChangesFound") } changeEvent := &PrivacyPolicyChangedEvent{ BaseEvent: *base, @@ -123,7 +123,7 @@ func PrivacyPolicyChangedEventMapper(event eventstore.Event) (eventstore.Event, err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-22nf9", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-22nf9", "unable to unmarshal policy") } return e, nil diff --git a/internal/repository/project/api_config.go b/internal/repository/project/api_config.go index 4f24589ac..7da310312 100644 --- a/internal/repository/project/api_config.go +++ b/internal/repository/project/api_config.go @@ -5,8 +5,8 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -81,7 +81,7 @@ func APIConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "API-BFd15", "unable to unmarshal api config") + return nil, zerrors.ThrowInternal(err, "API-BFd15", "unable to unmarshal api config") } return e, nil @@ -110,7 +110,7 @@ func NewAPIConfigChangedEvent( changes []APIConfigChanges, ) (*APIConfigChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "API-i8idç", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "API-i8idç", "Errors.NoChangesFound") } changeEvent := &APIConfigChangedEvent{ @@ -142,7 +142,7 @@ func APIConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "API-BFd15", "unable to unmarshal api config") + return nil, zerrors.ThrowInternal(err, "API-BFd15", "unable to unmarshal api config") } return e, nil @@ -187,7 +187,7 @@ func APIConfigSecretChangedEventMapper(event eventstore.Event) (eventstore.Event err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "API-M893d", "unable to unmarshal api config") + return nil, zerrors.ThrowInternal(err, "API-M893d", "unable to unmarshal api config") } return e, nil @@ -229,7 +229,7 @@ func APIConfigSecretCheckSucceededEventMapper(event eventstore.Event) (eventstor err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "API-837gV", "unable to unmarshal api config") + return nil, zerrors.ThrowInternal(err, "API-837gV", "unable to unmarshal api config") } return e, nil @@ -271,7 +271,7 @@ func APIConfigSecretCheckFailedEventMapper(event eventstore.Event) (eventstore.E err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "API-987g%", "unable to unmarshal api config") + return nil, zerrors.ThrowInternal(err, "API-987g%", "unable to unmarshal api config") } return e, nil diff --git a/internal/repository/project/application.go b/internal/repository/project/application.go index be2a944ef..cb6dea156 100644 --- a/internal/repository/project/application.go +++ b/internal/repository/project/application.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -70,7 +70,7 @@ func ApplicationAddedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "APPLICATION-Nffg2", "unable to unmarshal application") + return nil, zerrors.ThrowInternal(err, "APPLICATION-Nffg2", "unable to unmarshal application") } return e, nil @@ -121,7 +121,7 @@ func ApplicationChangedEventMapper(event eventstore.Event) (eventstore.Event, er err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "APPLICATION-9l0cs", "unable to unmarshal application") + return nil, zerrors.ThrowInternal(err, "APPLICATION-9l0cs", "unable to unmarshal application") } return e, nil @@ -163,7 +163,7 @@ func ApplicationDeactivatedEventMapper(event eventstore.Event) (eventstore.Event err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "APPLICATION-0p9fB", "unable to unmarshal application") + return nil, zerrors.ThrowInternal(err, "APPLICATION-0p9fB", "unable to unmarshal application") } return e, nil @@ -205,7 +205,7 @@ func ApplicationReactivatedEventMapper(event eventstore.Event) (eventstore.Event err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "APPLICATION-1m9e3", "unable to unmarshal application") + return nil, zerrors.ThrowInternal(err, "APPLICATION-1m9e3", "unable to unmarshal application") } return e, nil @@ -257,7 +257,7 @@ func ApplicationRemovedEventMapper(event eventstore.Event) (eventstore.Event, er err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "APPLICATION-1m9e3", "unable to unmarshal application") + return nil, zerrors.ThrowInternal(err, "APPLICATION-1m9e3", "unable to unmarshal application") } return e, nil diff --git a/internal/repository/project/grant.go b/internal/repository/project/grant.go index e9c60b4da..486a62d92 100644 --- a/internal/repository/project/grant.go +++ b/internal/repository/project/grant.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -74,7 +74,7 @@ func GrantAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-mL0vs", "unable to unmarshal project grant") + return nil, zerrors.ThrowInternal(err, "PROJECT-mL0vs", "unable to unmarshal project grant") } return e, nil @@ -119,7 +119,7 @@ func GrantChangedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-mL0vs", "unable to unmarshal project grant") + return nil, zerrors.ThrowInternal(err, "PROJECT-mL0vs", "unable to unmarshal project grant") } return e, nil @@ -164,7 +164,7 @@ func GrantCascadeChangedEventMapper(event eventstore.Event) (eventstore.Event, e err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-9o0se", "unable to unmarshal project grant") + return nil, zerrors.ThrowInternal(err, "PROJECT-9o0se", "unable to unmarshal project grant") } return e, nil @@ -206,7 +206,7 @@ func GrantDeactivateEventMapper(event eventstore.Event) (eventstore.Event, error err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-9o0se", "unable to unmarshal project grant") + return nil, zerrors.ThrowInternal(err, "PROJECT-9o0se", "unable to unmarshal project grant") } return e, nil @@ -248,7 +248,7 @@ func GrantReactivatedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-78f7D", "unable to unmarshal project grant") + return nil, zerrors.ThrowInternal(err, "PROJECT-78f7D", "unable to unmarshal project grant") } return e, nil @@ -293,7 +293,7 @@ func GrantRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-28jM8", "unable to unmarshal project grant") + return nil, zerrors.ThrowInternal(err, "PROJECT-28jM8", "unable to unmarshal project grant") } return e, nil diff --git a/internal/repository/project/grant_member.go b/internal/repository/project/grant_member.go index 5e5e700d9..0e7947c86 100644 --- a/internal/repository/project/grant_member.go +++ b/internal/repository/project/grant_member.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/member" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -73,7 +73,7 @@ func GrantMemberAddedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-9f0sf", "unable to unmarshal label policy") + return nil, zerrors.ThrowInternal(err, "PROJECT-9f0sf", "unable to unmarshal label policy") } return e, nil @@ -121,7 +121,7 @@ func GrantMemberChangedEventMapper(event eventstore.Event) (eventstore.Event, er err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-39fi8", "unable to unmarshal label policy") + return nil, zerrors.ThrowInternal(err, "PROJECT-39fi8", "unable to unmarshal label policy") } return e, nil @@ -166,7 +166,7 @@ func GrantMemberRemovedEventMapper(event eventstore.Event) (eventstore.Event, er err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-173fM", "unable to unmarshal label policy") + return nil, zerrors.ThrowInternal(err, "PROJECT-173fM", "unable to unmarshal label policy") } return e, nil @@ -211,7 +211,7 @@ func GrantMemberCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Ev err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-3kfs3", "unable to unmarshal label policy") + return nil, zerrors.ThrowInternal(err, "PROJECT-3kfs3", "unable to unmarshal label policy") } return e, nil diff --git a/internal/repository/project/key.go b/internal/repository/project/key.go index 4eb03c8dd..a9f85d1c2 100644 --- a/internal/repository/project/key.go +++ b/internal/repository/project/key.go @@ -5,8 +5,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -66,7 +66,7 @@ func ApplicationKeyAddedEventMapper(event eventstore.Event) (eventstore.Event, e err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "API-BFd15", "unable to unmarshal api config") + return nil, zerrors.ThrowInternal(err, "API-BFd15", "unable to unmarshal api config") } return e, nil @@ -107,7 +107,7 @@ func ApplicationKeyRemovedEventMapper(event eventstore.Event) (eventstore.Event, } err := event.Unmarshal(applicationKeyRemoved) if err != nil { - return nil, errors.ThrowInternal(err, "USER-cjLeA", "unable to unmarshal application key removed") + return nil, zerrors.ThrowInternal(err, "USER-cjLeA", "unable to unmarshal application key removed") } return applicationKeyRemoved, nil diff --git a/internal/repository/project/oidc_config.go b/internal/repository/project/oidc_config.go index 977af91ea..5534bd571 100644 --- a/internal/repository/project/oidc_config.go +++ b/internal/repository/project/oidc_config.go @@ -6,8 +6,8 @@ import ( "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -190,7 +190,7 @@ func OIDCConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-BFd15", "unable to unmarshal oidc config") + return nil, zerrors.ThrowInternal(err, "OIDC-BFd15", "unable to unmarshal oidc config") } return e, nil @@ -232,7 +232,7 @@ func NewOIDCConfigChangedEvent( changes []OIDCConfigChanges, ) (*OIDCConfigChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "OIDC-i8idç", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "OIDC-i8idç", "Errors.NoChangesFound") } changeEvent := &OIDCConfigChangedEvent{ @@ -348,7 +348,7 @@ func OIDCConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, err err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-BFd15", "unable to unmarshal oidc config") + return nil, zerrors.ThrowInternal(err, "OIDC-BFd15", "unable to unmarshal oidc config") } return e, nil @@ -393,7 +393,7 @@ func OIDCConfigSecretChangedEventMapper(event eventstore.Event) (eventstore.Even err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-M893d", "unable to unmarshal oidc config") + return nil, zerrors.ThrowInternal(err, "OIDC-M893d", "unable to unmarshal oidc config") } return e, nil @@ -435,7 +435,7 @@ func OIDCConfigSecretCheckSucceededEventMapper(event eventstore.Event) (eventsto err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-837gV", "unable to unmarshal oidc config") + return nil, zerrors.ThrowInternal(err, "OIDC-837gV", "unable to unmarshal oidc config") } return e, nil @@ -477,7 +477,7 @@ func OIDCConfigSecretCheckFailedEventMapper(event eventstore.Event) (eventstore. err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "OIDC-987g%", "unable to unmarshal oidc config") + return nil, zerrors.ThrowInternal(err, "OIDC-987g%", "unable to unmarshal oidc config") } return e, nil diff --git a/internal/repository/project/project.go b/internal/repository/project/project.go index f37814243..977487730 100644 --- a/internal/repository/project/project.go +++ b/internal/repository/project/project.go @@ -4,8 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -79,7 +79,7 @@ func ProjectAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-Bfg2f", "unable to unmarshal project") + return nil, zerrors.ThrowInternal(err, "PROJECT-Bfg2f", "unable to unmarshal project") } return e, nil @@ -117,7 +117,7 @@ func NewProjectChangeEvent( changes []ProjectChanges, ) (*ProjectChangeEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "PROJECT-mV9xc", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "PROJECT-mV9xc", "Errors.NoChangesFound") } changeEvent := &ProjectChangeEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -172,7 +172,7 @@ func ProjectChangeEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-M9osd", "unable to unmarshal project") + return nil, zerrors.ThrowInternal(err, "PROJECT-M9osd", "unable to unmarshal project") } return e, nil diff --git a/internal/repository/project/role.go b/internal/repository/project/role.go index e5bf74d0e..098b32189 100644 --- a/internal/repository/project/role.go +++ b/internal/repository/project/role.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) var ( @@ -71,7 +71,7 @@ func RoleAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-2M0xy", "unable to unmarshal project role") + return nil, zerrors.ThrowInternal(err, "PROJECT-2M0xy", "unable to unmarshal project role") } return e, nil @@ -100,7 +100,7 @@ func NewRoleChangedEvent( changes []RoleChanges, ) (*RoleChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "PROJECT-eR9vx", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "PROJECT-eR9vx", "Errors.NoChangesFound") } changeEvent := &RoleChangedEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -142,7 +142,7 @@ func RoleChangedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-3M0vx", "unable to unmarshal project role") + return nil, zerrors.ThrowInternal(err, "PROJECT-3M0vx", "unable to unmarshal project role") } return e, nil @@ -183,7 +183,7 @@ func RoleRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "PROJECT-1M0xs", "unable to unmarshal project role") + return nil, zerrors.ThrowInternal(err, "PROJECT-1M0xs", "unable to unmarshal project role") } return e, nil diff --git a/internal/repository/project/saml_config.go b/internal/repository/project/saml_config.go index 340648443..97af24a0d 100644 --- a/internal/repository/project/saml_config.go +++ b/internal/repository/project/saml_config.go @@ -3,8 +3,8 @@ package project import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -71,7 +71,7 @@ func SAMLConfigAddedEventMapper(event eventstore.Event) (eventstore.Event, error err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "SAML-BDd15", "unable to unmarshal saml config") + return nil, zerrors.ThrowInternal(err, "SAML-BDd15", "unable to unmarshal saml config") } return e, nil @@ -109,7 +109,7 @@ func NewSAMLConfigChangedEvent( changes []SAMLConfigChanges, ) (*SAMLConfigChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "SAML-i8idç", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "SAML-i8idç", "Errors.NoChangesFound") } changeEvent := &SAMLConfigChangedEvent{ @@ -154,7 +154,7 @@ func SAMLConfigChangedEventMapper(event eventstore.Event) (eventstore.Event, err err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "SAML-BFd15", "unable to unmarshal saml config") + return nil, zerrors.ThrowInternal(err, "SAML-BFd15", "unable to unmarshal saml config") } return e, nil diff --git a/internal/repository/quota/events.go b/internal/repository/quota/events.go index 616f61fae..af7538333 100644 --- a/internal/repository/quota/events.go +++ b/internal/repository/quota/events.go @@ -5,8 +5,8 @@ import ( "strconv" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type Unit uint @@ -113,7 +113,7 @@ func SetEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "QUOTA-kmIpI", "unable to unmarshal quota set") + return nil, zerrors.ThrowInternal(err, "QUOTA-kmIpI", "unable to unmarshal quota set") } return e, nil @@ -169,7 +169,7 @@ func NotificationDueEventMapper(event eventstore.Event) (eventstore.Event, error err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "QUOTA-k56rT", "unable to unmarshal notification due") + return nil, zerrors.ThrowInternal(err, "QUOTA-k56rT", "unable to unmarshal notification due") } return e, nil @@ -228,7 +228,7 @@ func NotifiedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "QUOTA-4n8vs", "unable to unmarshal quota notified") + return nil, zerrors.ThrowInternal(err, "QUOTA-4n8vs", "unable to unmarshal quota notified") } return e, nil @@ -269,7 +269,7 @@ func RemovedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "QUOTA-4bReE", "unable to unmarshal quota removed") + return nil, zerrors.ThrowInternal(err, "QUOTA-4bReE", "unable to unmarshal quota removed") } return e, nil diff --git a/internal/repository/session/session.go b/internal/repository/session/session.go index 464c72971..116d85a18 100644 --- a/internal/repository/session/session.go +++ b/internal/repository/session/session.go @@ -7,8 +7,8 @@ import ( "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -66,7 +66,7 @@ func AddedEventMapper(event eventstore.Event) (eventstore.Event, error) { err := event.Unmarshal(added) if err != nil { - return nil, errors.ThrowInternal(err, "SESSION-DG4gn", "unable to unmarshal session added") + return nil, zerrors.ThrowInternal(err, "SESSION-DG4gn", "unable to unmarshal session added") } return added, nil @@ -113,7 +113,7 @@ func UserCheckedEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(added) if err != nil { - return nil, errors.ThrowInternal(err, "SESSION-DSGn5", "unable to unmarshal user checked") + return nil, zerrors.ThrowInternal(err, "SESSION-DSGn5", "unable to unmarshal user checked") } return added, nil @@ -154,7 +154,7 @@ func PasswordCheckedEventMapper(event eventstore.Event) (eventstore.Event, error } err := event.Unmarshal(added) if err != nil { - return nil, errors.ThrowInternal(err, "SESSION-DGt21", "unable to unmarshal password checked") + return nil, zerrors.ThrowInternal(err, "SESSION-DGt21", "unable to unmarshal password checked") } return added, nil @@ -195,7 +195,7 @@ func IntentCheckedEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(added) if err != nil { - return nil, errors.ThrowInternal(err, "SESSION-DGt90", "unable to unmarshal intent checked") + return nil, zerrors.ThrowInternal(err, "SESSION-DGt90", "unable to unmarshal intent checked") } return added, nil @@ -564,7 +564,7 @@ func TokenSetEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(added) if err != nil { - return nil, errors.ThrowInternal(err, "SESSION-Sf3va", "unable to unmarshal token set") + return nil, zerrors.ThrowInternal(err, "SESSION-Sf3va", "unable to unmarshal token set") } return added, nil @@ -605,7 +605,7 @@ func MetadataSetEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(added) if err != nil { - return nil, errors.ThrowInternal(err, "SESSION-BD21d", "unable to unmarshal metadata set") + return nil, zerrors.ThrowInternal(err, "SESSION-BD21d", "unable to unmarshal metadata set") } return added, nil diff --git a/internal/repository/settings/debug_notification.go b/internal/repository/settings/debug_notification.go index c1ae68f87..97a3d8630 100644 --- a/internal/repository/settings/debug_notification.go +++ b/internal/repository/settings/debug_notification.go @@ -1,8 +1,8 @@ package settings import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -45,7 +45,7 @@ func DebugNotificationProviderAddedEventMapper(event eventstore.Event) (eventsto err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "SET-f93ns", "unable to unmarshal debug notification added") + return nil, zerrors.ThrowInternal(err, "SET-f93ns", "unable to unmarshal debug notification added") } return e, nil @@ -70,7 +70,7 @@ func NewDebugNotificationProviderChangedEvent( changes []DebugNotificationProviderChanges, ) (*DebugNotificationProviderChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "SET-hj90s", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "SET-hj90s", "Errors.NoChangesFound") } changeEvent := &DebugNotificationProviderChangedEvent{ BaseEvent: *base, @@ -96,7 +96,7 @@ func DebugNotificationProviderChangedEventMapper(event eventstore.Event) (events err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "POLIC-ehssl", "unable to unmarshal policy") + return nil, zerrors.ThrowInternal(err, "POLIC-ehssl", "unable to unmarshal policy") } return e, nil diff --git a/internal/repository/user/human.go b/internal/repository/user/human.go index 7cbeaa9c7..c53b9e03d 100644 --- a/internal/repository/user/human.go +++ b/internal/repository/user/human.go @@ -9,8 +9,8 @@ import ( "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -128,7 +128,7 @@ func HumanAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(humanAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-vGlhy", "unable to unmarshal human added") + return nil, zerrors.ThrowInternal(err, "USER-vGlhy", "unable to unmarshal human added") } return humanAdded, nil @@ -233,7 +233,7 @@ func HumanRegisteredEventMapper(event eventstore.Event) (eventstore.Event, error } err := event.Unmarshal(humanRegistered) if err != nil { - return nil, errors.ThrowInternal(err, "USER-3Vm9s", "unable to unmarshal human registered") + return nil, zerrors.ThrowInternal(err, "USER-3Vm9s", "unable to unmarshal human registered") } return humanRegistered, nil @@ -282,7 +282,7 @@ func HumanInitialCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, } err := event.Unmarshal(humanRegistered) if err != nil { - return nil, errors.ThrowInternal(err, "USER-bM9se", "unable to unmarshal human initial code added") + return nil, zerrors.ThrowInternal(err, "USER-bM9se", "unable to unmarshal human initial code added") } return humanRegistered, nil @@ -407,7 +407,7 @@ func HumanSignedOutEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(signedOut) if err != nil { - return nil, errors.ThrowInternal(err, "USER-WFS3g", "unable to unmarshal human signed out") + return nil, zerrors.ThrowInternal(err, "USER-WFS3g", "unable to unmarshal human signed out") } return signedOut, nil diff --git a/internal/repository/user/human_address.go b/internal/repository/user/human_address.go index 7681866f2..586adcb8a 100644 --- a/internal/repository/user/human_address.go +++ b/internal/repository/user/human_address.go @@ -3,8 +3,8 @@ package user import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -36,7 +36,7 @@ func NewAddressChangedEvent( changes []AddressChanges, ) (*HumanAddressChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "USER-3n8fs", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "USER-3n8fs", "Errors.NoChangesFound") } changeEvent := &HumanAddressChangedEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -89,7 +89,7 @@ func HumanAddressChangedEventMapper(event eventstore.Event) (eventstore.Event, e } err := event.Unmarshal(addressChanged) if err != nil { - return nil, errors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human address changed") + return nil, zerrors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human address changed") } return addressChanged, nil diff --git a/internal/repository/user/human_email.go b/internal/repository/user/human_email.go index 9706706c4..b78017aed 100644 --- a/internal/repository/user/human_email.go +++ b/internal/repository/user/human_email.go @@ -7,8 +7,8 @@ import ( "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -52,7 +52,7 @@ func HumanEmailChangedEventMapper(event eventstore.Event) (eventstore.Event, err } err := event.Unmarshal(emailChangedEvent) if err != nil { - return nil, errors.ThrowInternal(err, "USER-4M0sd", "unable to unmarshal human password changed") + return nil, zerrors.ThrowInternal(err, "USER-4M0sd", "unable to unmarshal human password changed") } return emailChangedEvent, nil @@ -177,7 +177,7 @@ func HumanEmailCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, e } err := event.Unmarshal(codeAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-3M0sd", "unable to unmarshal human email code added") + return nil, zerrors.ThrowInternal(err, "USER-3M0sd", "unable to unmarshal human email code added") } return codeAdded, nil diff --git a/internal/repository/user/human_external_idp.go b/internal/repository/user/human_external_idp.go index cf698f447..e82334b81 100644 --- a/internal/repository/user/human_external_idp.go +++ b/internal/repository/user/human_external_idp.go @@ -3,8 +3,8 @@ package user import ( "context" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -75,7 +75,7 @@ func UserIDPLinkAddedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "USER-6M9sd", "unable to unmarshal user external idp added") + return nil, zerrors.ThrowInternal(err, "USER-6M9sd", "unable to unmarshal user external idp added") } return e, nil @@ -120,7 +120,7 @@ func UserIDPLinkRemovedEventMapper(event eventstore.Event) (eventstore.Event, er err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "USER-eAWoT", "unable to unmarshal user external idp removed") + return nil, zerrors.ThrowInternal(err, "USER-eAWoT", "unable to unmarshal user external idp removed") } return e, nil @@ -165,7 +165,7 @@ func UserIDPLinkCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Ev err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "USER-dKGqO", "unable to unmarshal user external idp cascade removed") + return nil, zerrors.ThrowInternal(err, "USER-dKGqO", "unable to unmarshal user external idp cascade removed") } return e, nil @@ -205,7 +205,7 @@ func UserIDPCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "USER-oikSS", "unable to unmarshal user external idp check succeeded") + return nil, zerrors.ThrowInternal(err, "USER-oikSS", "unable to unmarshal user external idp check succeeded") } return e, nil diff --git a/internal/repository/user/human_mfa_otp.go b/internal/repository/user/human_mfa_otp.go index 95fd0c0bb..1eb74f340 100644 --- a/internal/repository/user/human_mfa_otp.go +++ b/internal/repository/user/human_mfa_otp.go @@ -6,8 +6,8 @@ import ( "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -68,7 +68,7 @@ func HumanOTPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(otpAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp added") + return nil, zerrors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp added") } return otpAdded, nil } @@ -172,7 +172,7 @@ func HumanOTPCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event } err := event.Unmarshal(otpAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp check succeeded") + return nil, zerrors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp check succeeded") } return otpAdded, nil } @@ -211,7 +211,7 @@ func HumanOTPCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, e } err := event.Unmarshal(otpAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp check failed") + return nil, zerrors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp check failed") } return otpAdded, nil } diff --git a/internal/repository/user/human_mfa_passwordless.go b/internal/repository/user/human_mfa_passwordless.go index ec6342d2e..603c65749 100644 --- a/internal/repository/user/human_mfa_passwordless.go +++ b/internal/repository/user/human_mfa_passwordless.go @@ -7,8 +7,8 @@ import ( "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -308,7 +308,7 @@ func HumanPasswordlessInitCodeAddedEventMapper(event eventstore.Event) (eventsto } err := event.Unmarshal(webAuthNAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-BDf32", "unable to unmarshal human passwordless code added") + return nil, zerrors.ThrowInternal(err, "USER-BDf32", "unable to unmarshal human passwordless code added") } return webAuthNAdded, nil } @@ -366,7 +366,7 @@ func HumanPasswordlessInitCodeRequestedEventMapper(event eventstore.Event) (even } err := event.Unmarshal(webAuthNAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-VGfg3", "unable to unmarshal human passwordless code delivery added") + return nil, zerrors.ThrowInternal(err, "USER-VGfg3", "unable to unmarshal human passwordless code delivery added") } return webAuthNAdded, nil } @@ -406,7 +406,7 @@ func HumanPasswordlessInitCodeSentEventMapper(event eventstore.Event) (eventstor } err := event.Unmarshal(webAuthNAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code sent") + return nil, zerrors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code sent") } return webAuthNAdded, nil } @@ -446,7 +446,7 @@ func HumanPasswordlessInitCodeCodeCheckFailedEventMapper(event eventstore.Event) } err := event.Unmarshal(webAuthNAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code check failed") + return nil, zerrors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code check failed") } return webAuthNAdded, nil } @@ -486,7 +486,7 @@ func HumanPasswordlessInitCodeCodeCheckSucceededEventMapper(event eventstore.Eve } err := event.Unmarshal(webAuthNAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code check succeeded") + return nil, zerrors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code check succeeded") } return webAuthNAdded, nil } diff --git a/internal/repository/user/human_mfa_web_auth_n.go b/internal/repository/user/human_mfa_web_auth_n.go index 742580362..113bc9e95 100644 --- a/internal/repository/user/human_mfa_web_auth_n.go +++ b/internal/repository/user/human_mfa_web_auth_n.go @@ -2,8 +2,8 @@ package user import ( "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type HumanWebAuthNAddedEvent struct { @@ -42,7 +42,7 @@ func HumanWebAuthNAddedEventMapper(event eventstore.Event) (eventstore.Event, er } err := event.Unmarshal(webAuthNAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-tB8sf", "unable to unmarshal human webAuthN added") + return nil, zerrors.ThrowInternal(err, "USER-tB8sf", "unable to unmarshal human webAuthN added") } return webAuthNAdded, nil } @@ -98,7 +98,7 @@ func HumanWebAuthNVerifiedEventMapper(event eventstore.Event) (eventstore.Event, } err := event.Unmarshal(webauthNVerified) if err != nil { - return nil, errors.ThrowInternal(err, "USER-B0zDs", "unable to unmarshal human webAuthN verified") + return nil, zerrors.ThrowInternal(err, "USER-B0zDs", "unable to unmarshal human webAuthN verified") } return webauthNVerified, nil } @@ -136,7 +136,7 @@ func HumanWebAuthNSignCountChangedEventMapper(event eventstore.Event) (eventstor } err := event.Unmarshal(webauthNVerified) if err != nil { - return nil, errors.ThrowInternal(err, "USER-5Gm0s", "unable to unmarshal human webAuthN sign count") + return nil, zerrors.ThrowInternal(err, "USER-5Gm0s", "unable to unmarshal human webAuthN sign count") } return webauthNVerified, nil } @@ -172,7 +172,7 @@ func HumanWebAuthNRemovedEventMapper(event eventstore.Event) (eventstore.Event, } err := event.Unmarshal(webauthNVerified) if err != nil { - return nil, errors.ThrowInternal(err, "USER-gM9sd", "unable to unmarshal human webAuthN token removed") + return nil, zerrors.ThrowInternal(err, "USER-gM9sd", "unable to unmarshal human webAuthN token removed") } return webauthNVerified, nil } @@ -210,7 +210,7 @@ func HumanWebAuthNBeginLoginEventMapper(event eventstore.Event) (eventstore.Even } err := event.Unmarshal(webAuthNAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-rMb8x", "unable to unmarshal human webAuthN begin login") + return nil, zerrors.ThrowInternal(err, "USER-rMb8x", "unable to unmarshal human webAuthN begin login") } return webAuthNAdded, nil } @@ -243,7 +243,7 @@ func HumanWebAuthNCheckSucceededEventMapper(event eventstore.Event) (eventstore. } err := event.Unmarshal(webAuthNAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-2M0fg", "unable to unmarshal human webAuthN check succeeded") + return nil, zerrors.ThrowInternal(err, "USER-2M0fg", "unable to unmarshal human webAuthN check succeeded") } return webAuthNAdded, nil } @@ -276,7 +276,7 @@ func HumanWebAuthNCheckFailedEventMapper(event eventstore.Event) (eventstore.Eve } err := event.Unmarshal(webAuthNAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-O0dse", "unable to unmarshal human webAuthN check failed") + return nil, zerrors.ThrowInternal(err, "USER-O0dse", "unable to unmarshal human webAuthN check failed") } return webAuthNAdded, nil } diff --git a/internal/repository/user/human_password.go b/internal/repository/user/human_password.go index aaca42dfe..9df7e6c7f 100644 --- a/internal/repository/user/human_password.go +++ b/internal/repository/user/human_password.go @@ -7,8 +7,8 @@ import ( "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -72,7 +72,7 @@ func HumanPasswordChangedEventMapper(event eventstore.Event) (eventstore.Event, } err := event.Unmarshal(humanAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-4M0sd", "unable to unmarshal human password changed") + return nil, zerrors.ThrowInternal(err, "USER-4M0sd", "unable to unmarshal human password changed") } return humanAdded, nil @@ -141,7 +141,7 @@ func HumanPasswordCodeAddedEventMapper(event eventstore.Event) (eventstore.Event } err := event.Unmarshal(humanAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-Ms90d", "unable to unmarshal human password code added") + return nil, zerrors.ThrowInternal(err, "USER-Ms90d", "unable to unmarshal human password code added") } return humanAdded, nil @@ -237,7 +237,7 @@ func HumanPasswordCheckSucceededEventMapper(event eventstore.Event) (eventstore. } err := event.Unmarshal(humanAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-5M9sd", "unable to unmarshal human password check succeeded") + return nil, zerrors.ThrowInternal(err, "USER-5M9sd", "unable to unmarshal human password check succeeded") } return humanAdded, nil @@ -277,7 +277,7 @@ func HumanPasswordCheckFailedEventMapper(event eventstore.Event) (eventstore.Eve } err := event.Unmarshal(humanAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-4m9fs", "unable to unmarshal human password check failed") + return nil, zerrors.ThrowInternal(err, "USER-4m9fs", "unable to unmarshal human password check failed") } return humanAdded, nil diff --git a/internal/repository/user/human_phone.go b/internal/repository/user/human_phone.go index 7c2302bb4..2b3a1f24d 100644 --- a/internal/repository/user/human_phone.go +++ b/internal/repository/user/human_phone.go @@ -7,8 +7,8 @@ import ( "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -52,7 +52,7 @@ func HumanPhoneChangedEventMapper(event eventstore.Event) (eventstore.Event, err } err := event.Unmarshal(phoneChangedEvent) if err != nil { - return nil, errors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human phone changed") + return nil, zerrors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human phone changed") } return phoneChangedEvent, nil @@ -200,7 +200,7 @@ func HumanPhoneCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, e } err := event.Unmarshal(codeAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-6Ms9d", "unable to unmarshal human phone code added") + return nil, zerrors.ThrowInternal(err, "USER-6Ms9d", "unable to unmarshal human phone code added") } return codeAdded, nil diff --git a/internal/repository/user/human_profile.go b/internal/repository/user/human_profile.go index 611591dbf..1c73b2dce 100644 --- a/internal/repository/user/human_profile.go +++ b/internal/repository/user/human_profile.go @@ -4,8 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" "golang.org/x/text/language" ) @@ -39,7 +39,7 @@ func NewHumanProfileChangedEvent( changes []ProfileChanges, ) (*HumanProfileChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "USER-33n8F", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "USER-33n8F", "Errors.NoChangesFound") } changeEvent := &HumanProfileChangedEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -98,7 +98,7 @@ func HumanProfileChangedEventMapper(event eventstore.Event) (eventstore.Event, e } err := event.Unmarshal(profileChanged) if err != nil { - return nil, errors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human profile changed") + return nil, zerrors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human profile changed") } return profileChanged, nil diff --git a/internal/repository/user/human_refresh_token.go b/internal/repository/user/human_refresh_token.go index f17d906f3..2de3a2ca4 100644 --- a/internal/repository/user/human_refresh_token.go +++ b/internal/repository/user/human_refresh_token.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -81,7 +81,7 @@ func HumanRefreshTokenAddedEventMapper(event eventstore.Event) (eventstore.Event } err := event.Unmarshal(refreshTokenAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-DGr14", "unable to unmarshal refresh token added") + return nil, zerrors.ThrowInternal(err, "USER-DGr14", "unable to unmarshal refresh token added") } return refreshTokenAdded, nil @@ -132,7 +132,7 @@ func HumanRefreshTokenRenewedEventEventMapper(event eventstore.Event) (eventstor } err := event.Unmarshal(tokenAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-GBt21", "unable to unmarshal refresh token renewed") + return nil, zerrors.ThrowInternal(err, "USER-GBt21", "unable to unmarshal refresh token renewed") } return tokenAdded, nil @@ -177,7 +177,7 @@ func HumanRefreshTokenRemovedEventEventMapper(event eventstore.Event) (eventstor } err := event.Unmarshal(tokenAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-Dggs2", "unable to unmarshal refresh token removed") + return nil, zerrors.ThrowInternal(err, "USER-Dggs2", "unable to unmarshal refresh token removed") } return tokenAdded, nil diff --git a/internal/repository/user/machine.go b/internal/repository/user/machine.go index 7faea5ac9..d76290931 100644 --- a/internal/repository/user/machine.go +++ b/internal/repository/user/machine.go @@ -4,8 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -62,7 +62,7 @@ func MachineAddedEventMapper(event eventstore.Event) (eventstore.Event, error) { } err := event.Unmarshal(machineAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-tMv9s", "unable to unmarshal machine added") + return nil, zerrors.ThrowInternal(err, "USER-tMv9s", "unable to unmarshal machine added") } return machineAdded, nil @@ -90,7 +90,7 @@ func NewMachineChangedEvent( changes []MachineChanges, ) (*MachineChangedEvent, error) { if len(changes) == 0 { - return nil, errors.ThrowPreconditionFailed(nil, "USER-3M9fs", "Errors.NoChangesFound") + return nil, zerrors.ThrowPreconditionFailed(nil, "USER-3M9fs", "Errors.NoChangesFound") } changeEvent := &MachineChangedEvent{ BaseEvent: *eventstore.NewBaseEventForPush( @@ -131,7 +131,7 @@ func MachineChangedEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(machineChanged) if err != nil { - return nil, errors.ThrowInternal(err, "USER-4M9ds", "unable to unmarshal machine changed") + return nil, zerrors.ThrowInternal(err, "USER-4M9ds", "unable to unmarshal machine changed") } return machineChanged, nil diff --git a/internal/repository/user/machine_key.go b/internal/repository/user/machine_key.go index 283e8240e..aff1c3750 100644 --- a/internal/repository/user/machine_key.go +++ b/internal/repository/user/machine_key.go @@ -6,8 +6,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -65,7 +65,7 @@ func MachineKeyAddedEventMapper(event eventstore.Event) (eventstore.Event, error if unwrapErr, ok := err.(*json.UnmarshalTypeError); ok && unwrapErr.Field == "publicKey" { return machineKeyAdded, nil } - return nil, errors.ThrowInternal(err, "USER-p0ovS", "unable to unmarshal machine key added") + return nil, zerrors.ThrowInternal(err, "USER-p0ovS", "unable to unmarshal machine key added") } return machineKeyAdded, nil @@ -106,7 +106,7 @@ func MachineKeyRemovedEventMapper(event eventstore.Event) (eventstore.Event, err } err := event.Unmarshal(machineRemoved) if err != nil { - return nil, errors.ThrowInternal(err, "USER-5Gm9s", "unable to unmarshal machine key removed") + return nil, zerrors.ThrowInternal(err, "USER-5Gm9s", "unable to unmarshal machine key removed") } return machineRemoved, nil diff --git a/internal/repository/user/machine_secret.go b/internal/repository/user/machine_secret.go index 041d938f8..9d2f9fa97 100644 --- a/internal/repository/user/machine_secret.go +++ b/internal/repository/user/machine_secret.go @@ -4,8 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -51,7 +51,7 @@ func MachineSecretSetEventMapper(event eventstore.Event) (eventstore.Event, erro } err := event.Unmarshal(credentialsSet) if err != nil { - return nil, errors.ThrowInternal(err, "USER-lopbqu", "unable to unmarshal machine secret set") + return nil, zerrors.ThrowInternal(err, "USER-lopbqu", "unable to unmarshal machine secret set") } return credentialsSet, nil @@ -88,7 +88,7 @@ func MachineSecretRemovedEventMapper(event eventstore.Event) (eventstore.Event, } err := event.Unmarshal(credentialsRemoved) if err != nil { - return nil, errors.ThrowInternal(err, "USER-quox9j2", "unable to unmarshal machine secret removed") + return nil, zerrors.ThrowInternal(err, "USER-quox9j2", "unable to unmarshal machine secret removed") } return credentialsRemoved, nil @@ -125,7 +125,7 @@ func MachineSecretCheckSucceededEventMapper(event eventstore.Event) (eventstore. } err := event.Unmarshal(check) if err != nil { - return nil, errors.ThrowInternal(err, "USER-x002n1p", "unable to unmarshal machine secret check succeeded") + return nil, zerrors.ThrowInternal(err, "USER-x002n1p", "unable to unmarshal machine secret check succeeded") } return check, nil @@ -162,7 +162,7 @@ func MachineSecretCheckFailedEventMapper(event eventstore.Event) (eventstore.Eve } err := event.Unmarshal(check) if err != nil { - return nil, errors.ThrowInternal(err, "USER-x7901b1l", "unable to unmarshal machine secret check failed") + return nil, zerrors.ThrowInternal(err, "USER-x7901b1l", "unable to unmarshal machine secret check failed") } return check, nil diff --git a/internal/repository/user/personal_access_token.go b/internal/repository/user/personal_access_token.go index 10432fe22..0528507a3 100644 --- a/internal/repository/user/personal_access_token.go +++ b/internal/repository/user/personal_access_token.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -55,7 +55,7 @@ func PersonalAccessTokenAddedEventMapper(event eventstore.Event) (eventstore.Eve } err := event.Unmarshal(tokenAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-Dbges", "unable to unmarshal token added") + return nil, zerrors.ThrowInternal(err, "USER-Dbges", "unable to unmarshal token added") } return tokenAdded, nil @@ -96,7 +96,7 @@ func PersonalAccessTokenRemovedEventMapper(event eventstore.Event) (eventstore.E } err := event.Unmarshal(tokenRemoved) if err != nil { - return nil, errors.ThrowInternal(err, "USER-Dbneg", "unable to unmarshal token removed") + return nil, zerrors.ThrowInternal(err, "USER-Dbneg", "unable to unmarshal token removed") } return tokenRemoved, nil diff --git a/internal/repository/user/user.go b/internal/repository/user/user.go index df99eb2e7..260dab135 100644 --- a/internal/repository/user/user.go +++ b/internal/repository/user/user.go @@ -6,8 +6,8 @@ import ( "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -262,7 +262,7 @@ func UserTokenAddedEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(tokenAdded) if err != nil { - return nil, errors.ThrowInternal(err, "USER-7M9sd", "unable to unmarshal token added") + return nil, zerrors.ThrowInternal(err, "USER-7M9sd", "unable to unmarshal token added") } return tokenAdded, nil @@ -303,7 +303,7 @@ func UserTokenRemovedEventMapper(event eventstore.Event) (eventstore.Event, erro } err := event.Unmarshal(tokenRemoved) if err != nil { - return nil, errors.ThrowInternal(err, "USER-7M9sd", "unable to unmarshal token added") + return nil, zerrors.ThrowInternal(err, "USER-7M9sd", "unable to unmarshal token added") } return tokenRemoved, nil @@ -359,7 +359,7 @@ func DomainClaimedEventMapper(event eventstore.Event) (eventstore.Event, error) } err := event.Unmarshal(domainClaimed) if err != nil { - return nil, errors.ThrowInternal(err, "USER-aR8jc", "unable to unmarshal domain claimed") + return nil, zerrors.ThrowInternal(err, "USER-aR8jc", "unable to unmarshal domain claimed") } return domainClaimed, nil @@ -457,7 +457,7 @@ func UsernameChangedEventMapper(event eventstore.Event) (eventstore.Event, error } err := event.Unmarshal(domainClaimed) if err != nil { - return nil, errors.ThrowInternal(err, "USER-4Bm9s", "unable to unmarshal username changed") + return nil, zerrors.ThrowInternal(err, "USER-4Bm9s", "unable to unmarshal username changed") } return domainClaimed, nil diff --git a/internal/repository/usergrant/user_grant.go b/internal/repository/usergrant/user_grant.go index 10d6cfcf1..bd0908f60 100644 --- a/internal/repository/usergrant/user_grant.go +++ b/internal/repository/usergrant/user_grant.go @@ -6,7 +6,7 @@ import ( "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -78,7 +78,7 @@ func UserGrantAddedEventMapper(event eventstore.Event) (eventstore.Event, error) err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "UGRANT-0p9ol", "unable to unmarshal user grant") + return nil, zerrors.ThrowInternal(err, "UGRANT-0p9ol", "unable to unmarshal user grant") } return e, nil @@ -118,7 +118,7 @@ func UserGrantChangedEventMapper(event eventstore.Event) (eventstore.Event, erro err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "UGRANT-4M0sd", "unable to unmarshal user grant") + return nil, zerrors.ThrowInternal(err, "UGRANT-4M0sd", "unable to unmarshal user grant") } return e, nil @@ -158,7 +158,7 @@ func UserGrantCascadeChangedEventMapper(event eventstore.Event) (eventstore.Even err := event.Unmarshal(e) if err != nil { - return nil, errors.ThrowInternal(err, "UGRANT-Gs9df", "unable to unmarshal user grant") + return nil, zerrors.ThrowInternal(err, "UGRANT-Gs9df", "unable to unmarshal user grant") } return e, nil diff --git a/internal/static/config/config.go b/internal/static/config/config.go index 2ace6a731..5aa8a4e32 100644 --- a/internal/static/config/config.go +++ b/internal/static/config/config.go @@ -4,10 +4,10 @@ import ( "database/sql" "github.com/zitadel/zitadel/internal/api/http/middleware" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/static" "github.com/zitadel/zitadel/internal/static/database" "github.com/zitadel/zitadel/internal/static/s3" + "github.com/zitadel/zitadel/internal/zerrors" ) type AssetStorageConfig struct { @@ -19,7 +19,7 @@ type AssetStorageConfig struct { func (a *AssetStorageConfig) NewStorage(client *sql.DB) (static.Storage, error) { t, ok := storage[a.Type] if !ok { - return nil, errors.ThrowInternalf(nil, "STATIC-dsbjh", "config type %s not supported", a.Type) + return nil, zerrors.ThrowInternalf(nil, "STATIC-dsbjh", "config type %s not supported", a.Type) } return t(client, a.Config) diff --git a/internal/static/database/crdb.go b/internal/static/database/crdb.go index 5a012a591..a031f7d17 100644 --- a/internal/static/database/crdb.go +++ b/internal/static/database/crdb.go @@ -3,15 +3,15 @@ package database import ( "context" "database/sql" - errs "errors" + "errors" "fmt" "io" "time" "github.com/Masterminds/squirrel" - caos_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/zerrors" ) var _ static.Storage = (*crdbStorage)(nil) @@ -40,7 +40,7 @@ func NewStorage(client *sql.DB, _ map[string]interface{}) (static.Storage, error func (c *crdbStorage) PutObject(ctx context.Context, instanceID, location, resourceOwner, name, contentType string, objectType static.ObjectType, object io.Reader, objectSize int64) (*static.Asset, error) { data, err := io.ReadAll(object) if err != nil { - return nil, caos_errors.ThrowInternal(err, "DATAB-Dfwvq", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "DATAB-Dfwvq", "Errors.Internal") } stmt, args, err := squirrel.Insert(assetsTable). Columns(AssetColInstanceID, AssetColResourceOwner, AssetColName, AssetColType, AssetColContentType, AssetColData, AssetColUpdatedAt). @@ -52,13 +52,13 @@ func (c *crdbStorage) PutObject(ctx context.Context, instanceID, location, resou PlaceholderFormat(squirrel.Dollar). ToSql() if err != nil { - return nil, caos_errors.ThrowInternal(err, "DATAB-32DG1", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "DATAB-32DG1", "Errors.Internal") } var hash string var updatedAt time.Time err = c.client.QueryRowContext(ctx, stmt, args...).Scan(&hash, &updatedAt) if err != nil { - return nil, caos_errors.ThrowInternal(err, "DATAB-D2g2q", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "DATAB-D2g2q", "Errors.Internal") } return &static.Asset{ InstanceID: instanceID, @@ -82,7 +82,7 @@ func (c *crdbStorage) GetObject(ctx context.Context, instanceID, resourceOwner, PlaceholderFormat(squirrel.Dollar). ToSql() if err != nil { - return nil, nil, caos_errors.ThrowInternal(err, "DATAB-GE3hz", "Errors.Internal") + return nil, nil, zerrors.ThrowInternal(err, "DATAB-GE3hz", "Errors.Internal") } var data []byte asset := &static.Asset{ @@ -98,10 +98,10 @@ func (c *crdbStorage) GetObject(ctx context.Context, instanceID, resourceOwner, &asset.LastModified, ) if err != nil { - if errs.Is(err, sql.ErrNoRows) { - return nil, nil, caos_errors.ThrowNotFound(err, "DATAB-pCP8P", "Errors.Assets.Object.NotFound") + if errors.Is(err, sql.ErrNoRows) { + return nil, nil, zerrors.ThrowNotFound(err, "DATAB-pCP8P", "Errors.Assets.Object.NotFound") } - return nil, nil, caos_errors.ThrowInternal(err, "DATAB-Sfgb3", "Errors.Assets.Object.GetFailed") + return nil, nil, zerrors.ThrowInternal(err, "DATAB-Sfgb3", "Errors.Assets.Object.GetFailed") } asset.Size = int64(len(data)) return data, @@ -122,7 +122,7 @@ func (c *crdbStorage) GetObjectInfo(ctx context.Context, instanceID, resourceOwn PlaceholderFormat(squirrel.Dollar). ToSql() if err != nil { - return nil, caos_errors.ThrowInternal(err, "DATAB-rggt2", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "DATAB-rggt2", "Errors.Internal") } asset := &static.Asset{ InstanceID: instanceID, @@ -138,7 +138,7 @@ func (c *crdbStorage) GetObjectInfo(ctx context.Context, instanceID, resourceOwn &asset.LastModified, ) if err != nil { - return nil, caos_errors.ThrowInternal(err, "DATAB-Dbh2s", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "DATAB-Dbh2s", "Errors.Internal") } return asset, nil } @@ -153,11 +153,11 @@ func (c *crdbStorage) RemoveObject(ctx context.Context, instanceID, resourceOwne PlaceholderFormat(squirrel.Dollar). ToSql() if err != nil { - return caos_errors.ThrowInternal(err, "DATAB-Sgvwq", "Errors.Internal") + return zerrors.ThrowInternal(err, "DATAB-Sgvwq", "Errors.Internal") } _, err = c.client.ExecContext(ctx, stmt, args...) if err != nil { - return caos_errors.ThrowInternal(err, "DATAB-RHNgf", "Errors.Assets.Object.RemoveFailed") + return zerrors.ThrowInternal(err, "DATAB-RHNgf", "Errors.Assets.Object.RemoveFailed") } return nil } @@ -172,11 +172,11 @@ func (c *crdbStorage) RemoveObjects(ctx context.Context, instanceID, resourceOwn PlaceholderFormat(squirrel.Dollar). ToSql() if err != nil { - return caos_errors.ThrowInternal(err, "DATAB-Sfgeq", "Errors.Internal") + return zerrors.ThrowInternal(err, "DATAB-Sfgeq", "Errors.Internal") } _, err = c.client.ExecContext(ctx, stmt, args...) if err != nil { - return caos_errors.ThrowInternal(err, "DATAB-Efgt2", "Errors.Assets.Object.RemoveFailed") + return zerrors.ThrowInternal(err, "DATAB-Efgt2", "Errors.Assets.Object.RemoveFailed") } return nil } @@ -189,11 +189,11 @@ func (c *crdbStorage) RemoveInstanceObjects(ctx context.Context, instanceID stri PlaceholderFormat(squirrel.Dollar). ToSql() if err != nil { - return caos_errors.ThrowInternal(err, "DATAB-Sfgeq", "Errors.Internal") + return zerrors.ThrowInternal(err, "DATAB-Sfgeq", "Errors.Internal") } _, err = c.client.ExecContext(ctx, stmt, args...) if err != nil { - return caos_errors.ThrowInternal(err, "DATAB-Efgt2", "Errors.Assets.Object.RemoveFailed") + return zerrors.ThrowInternal(err, "DATAB-Efgt2", "Errors.Assets.Object.RemoveFailed") } return nil } diff --git a/internal/static/mock/storage_mock.impl.go b/internal/static/mock/storage_mock.impl.go index 3cd497dcc..aaa33aa8e 100644 --- a/internal/static/mock/storage_mock.impl.go +++ b/internal/static/mock/storage_mock.impl.go @@ -8,8 +8,8 @@ import ( "go.uber.org/mock/gomock" - caos_errors "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/zerrors" ) func NewStorage(t *testing.T) *MockStorage { @@ -37,7 +37,7 @@ func (m *MockStorage) ExpectPutObject() *MockStorage { func (m *MockStorage) ExpectPutObjectError() *MockStorage { m.EXPECT(). PutObject(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). - Return(nil, caos_errors.ThrowInternal(nil, "", "")) + Return(nil, zerrors.ThrowInternal(nil, "", "")) return m } @@ -58,6 +58,6 @@ func (m *MockStorage) ExpectRemoveObjectsNoError() *MockStorage { func (m *MockStorage) ExpectRemoveObjectError() *MockStorage { m.EXPECT(). RemoveObject(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). - Return(caos_errors.ThrowInternal(nil, "", "")) + Return(zerrors.ThrowInternal(nil, "", "")) return m } diff --git a/internal/static/s3/config.go b/internal/static/s3/config.go index 9a00cb97b..986d74764 100644 --- a/internal/static/s3/config.go +++ b/internal/static/s3/config.go @@ -7,9 +7,8 @@ import ( "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/zitadel/zitadel/internal/errors" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/zerrors" ) type Config struct { @@ -29,7 +28,7 @@ func (c *Config) NewStorage() (static.Storage, error) { Region: c.Location, }) if err != nil { - return nil, caos_errs.ThrowInternal(err, "MINIO-2n9fs", "Errors.Assets.Store.NotInitialized") + return nil, zerrors.ThrowInternal(err, "MINIO-2n9fs", "Errors.Assets.Store.NotInitialized") } return &Minio{ Client: minioClient, @@ -42,11 +41,11 @@ func (c *Config) NewStorage() (static.Storage, error) { func NewStorage(_ *sql.DB, rawConfig map[string]interface{}) (static.Storage, error) { configData, err := json.Marshal(rawConfig) if err != nil { - return nil, errors.ThrowInternal(err, "MINIO-Ef2f2", "could not map config") + return nil, zerrors.ThrowInternal(err, "MINIO-Ef2f2", "could not map config") } c := new(Config) if err := json.Unmarshal(configData, c); err != nil { - return nil, errors.ThrowInternal(err, "MINIO-GB4nw", "could not map config") + return nil, zerrors.ThrowInternal(err, "MINIO-GB4nw", "could not map config") } return c.NewStorage() } diff --git a/internal/static/s3/minio.go b/internal/static/s3/minio.go index e8506955e..47d5112d3 100644 --- a/internal/static/s3/minio.go +++ b/internal/static/s3/minio.go @@ -12,8 +12,8 @@ import ( "golang.org/x/sync/errgroup" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/static" + "github.com/zitadel/zitadel/internal/zerrors" ) var _ static.Storage = (*Minio)(nil) @@ -27,14 +27,14 @@ type Minio struct { func (m *Minio) PutObject(ctx context.Context, instanceID, location, resourceOwner, name, contentType string, objectType static.ObjectType, object io.Reader, objectSize int64) (*static.Asset, error) { err := m.createBucket(ctx, instanceID, location) - if err != nil && !caos_errs.IsErrorAlreadyExists(err) { + if err != nil && !zerrors.IsErrorAlreadyExists(err) { return nil, err } bucketName := m.prefixBucketName(instanceID) objectName := fmt.Sprintf("%s/%s", resourceOwner, name) info, err := m.Client.PutObject(ctx, bucketName, objectName, object, objectSize, minio.PutObjectOptions{ContentType: contentType}) if err != nil { - return nil, caos_errs.ThrowInternal(err, "MINIO-590sw", "Errors.Assets.Object.PutFailed") + return nil, zerrors.ThrowInternal(err, "MINIO-590sw", "Errors.Assets.Object.PutFailed") } return &static.Asset{ InstanceID: info.Bucket, @@ -53,18 +53,18 @@ func (m *Minio) GetObject(ctx context.Context, instanceID, resourceOwner, name s objectName := fmt.Sprintf("%s/%s", resourceOwner, name) object, err := m.Client.GetObject(ctx, bucketName, objectName, minio.GetObjectOptions{}) if err != nil { - return nil, nil, caos_errs.ThrowInternal(err, "MINIO-VGDgv", "Errors.Assets.Object.GetFailed") + return nil, nil, zerrors.ThrowInternal(err, "MINIO-VGDgv", "Errors.Assets.Object.GetFailed") } info := func() (*static.Asset, error) { info, err := object.Stat() if err != nil { - return nil, caos_errs.ThrowInternal(err, "MINIO-F96xF", "Errors.Assets.Object.GetFailed") + return nil, zerrors.ThrowInternal(err, "MINIO-F96xF", "Errors.Assets.Object.GetFailed") } return m.objectToAssetInfo(instanceID, resourceOwner, info), nil } asset, err := io.ReadAll(object) if err != nil { - return nil, nil, caos_errs.ThrowInternal(err, "MINIO-SFef1", "Errors.Assets.Object.GetFailed") + return nil, nil, zerrors.ThrowInternal(err, "MINIO-SFef1", "Errors.Assets.Object.GetFailed") } return asset, info, nil } @@ -75,9 +75,9 @@ func (m *Minio) GetObjectInfo(ctx context.Context, instanceID, resourceOwner, na objectInfo, err := m.Client.StatObject(ctx, bucketName, objectName, minio.StatObjectOptions{}) if err != nil { if errResp := minio.ToErrorResponse(err); errResp.StatusCode == http.StatusNotFound { - return nil, caos_errs.ThrowNotFound(err, "MINIO-Gdfh4", "Errors.Assets.Object.GetFailed") + return nil, zerrors.ThrowNotFound(err, "MINIO-Gdfh4", "Errors.Assets.Object.GetFailed") } - return nil, caos_errs.ThrowInternal(err, "MINIO-1vySX", "Errors.Assets.Object.GetFailed") + return nil, zerrors.ThrowInternal(err, "MINIO-1vySX", "Errors.Assets.Object.GetFailed") } return m.objectToAssetInfo(instanceID, resourceOwner, objectInfo), nil } @@ -87,7 +87,7 @@ func (m *Minio) RemoveObject(ctx context.Context, instanceID, resourceOwner, nam objectName := fmt.Sprintf("%s/%s", resourceOwner, name) err := m.Client.RemoveObject(ctx, bucketName, objectName, minio.RemoveObjectOptions{}) if err != nil { - return caos_errs.ThrowInternal(err, "MINIO-x85RT", "Errors.Assets.Object.RemoveFailed") + return zerrors.ThrowInternal(err, "MINIO-x85RT", "Errors.Assets.Object.RemoveFailed") } return nil } @@ -115,7 +115,7 @@ func (m *Minio) RemoveObjects(ctx context.Context, instanceID, resourceOwner str logging.WithFields("bucketName", bucketName, "path", path).Warn("list objects for remove failed with not found") continue } - return caos_errs.ThrowInternal(object.Err, "MINIO-WQF32", "Errors.Assets.Object.ListFailed") + return zerrors.ThrowInternal(object.Err, "MINIO-WQF32", "Errors.Assets.Object.ListFailed") } objectsCh <- object } @@ -124,13 +124,13 @@ func (m *Minio) RemoveObjects(ctx context.Context, instanceID, resourceOwner str if m.MultiDelete { for objError := range m.Client.RemoveObjects(ctx, bucketName, objectsCh, minio.RemoveObjectsOptions{GovernanceBypass: true}) { - return caos_errs.ThrowInternal(objError.Err, "MINIO-Sfdgr", "Errors.Assets.Object.RemoveFailed") + return zerrors.ThrowInternal(objError.Err, "MINIO-Sfdgr", "Errors.Assets.Object.RemoveFailed") } return g.Wait() } for objectInfo := range objectsCh { if err := m.Client.RemoveObject(ctx, bucketName, objectInfo.Key, minio.RemoveObjectOptions{GovernanceBypass: true}); err != nil { - return caos_errs.ThrowInternal(err, "MINIO-GVgew", "Errors.Assets.Object.RemoveFailed") + return zerrors.ThrowInternal(err, "MINIO-GVgew", "Errors.Assets.Object.RemoveFailed") } } return g.Wait() @@ -149,14 +149,14 @@ func (m *Minio) createBucket(ctx context.Context, name, location string) error { exists, err := m.Client.BucketExists(ctx, name) if err != nil { logging.WithFields("bucketname", name).WithError(err).Error("cannot check if bucket exists") - return caos_errs.ThrowInternal(err, "MINIO-1b8fs", "Errors.Assets.Bucket.Internal") + return zerrors.ThrowInternal(err, "MINIO-1b8fs", "Errors.Assets.Bucket.Internal") } if exists { - return caos_errs.ThrowAlreadyExists(nil, "MINIO-9n3MK", "Errors.Assets.Bucket.AlreadyExists") + return zerrors.ThrowAlreadyExists(nil, "MINIO-9n3MK", "Errors.Assets.Bucket.AlreadyExists") } err = m.Client.MakeBucket(ctx, name, minio.MakeBucketOptions{Region: location}) if err != nil { - return caos_errs.ThrowInternal(err, "MINIO-4m90d", "Errors.Assets.Bucket.CreateFailed") + return zerrors.ThrowInternal(err, "MINIO-4m90d", "Errors.Assets.Bucket.CreateFailed") } return nil } diff --git a/internal/telemetry/metrics/config/config.go b/internal/telemetry/metrics/config/config.go index 270cc7716..e9bcbe45c 100644 --- a/internal/telemetry/metrics/config/config.go +++ b/internal/telemetry/metrics/config/config.go @@ -1,8 +1,8 @@ package config import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/metrics/otel" + "github.com/zitadel/zitadel/internal/zerrors" ) type Config struct { @@ -19,7 +19,7 @@ var meter = map[string]func(map[string]interface{}) error{ func (c *Config) NewMeter() error { t, ok := meter[c.Type] if !ok { - return errors.ThrowInternalf(nil, "METER-Dfqsx", "config type %s not supported", c.Type) + return zerrors.ThrowInternalf(nil, "METER-Dfqsx", "config type %s not supported", c.Type) } return t(c.Config) diff --git a/internal/telemetry/metrics/otel/open_telemetry.go b/internal/telemetry/metrics/otel/open_telemetry.go index 0afafad23..ed1a94f84 100644 --- a/internal/telemetry/metrics/otel/open_telemetry.go +++ b/internal/telemetry/metrics/otel/open_telemetry.go @@ -11,9 +11,9 @@ import ( "go.opentelemetry.io/otel/metric" sdk_metric "go.opentelemetry.io/otel/sdk/metric" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/metrics" otel_resource "github.com/zitadel/zitadel/internal/telemetry/otel" + "github.com/zitadel/zitadel/internal/zerrors" ) type Metrics struct { @@ -66,7 +66,7 @@ func (m *Metrics) RegisterCounter(name, description string) error { func (m *Metrics) AddCount(ctx context.Context, name string, value int64, labels map[string]attribute.Value) error { counter, exists := m.Counters.Load(name) if !exists { - return caos_errs.ThrowNotFound(nil, "METER-4u8fs", "Errors.Metrics.Counter.NotFound") + return zerrors.ThrowNotFound(nil, "METER-4u8fs", "Errors.Metrics.Counter.NotFound") } counter.(metric.Int64Counter).Add(ctx, value, MapToAddOption(labels)...) return nil diff --git a/internal/telemetry/tracing/config/config.go b/internal/telemetry/tracing/config/config.go index 4e1a41520..cb44c6b65 100644 --- a/internal/telemetry/tracing/config/config.go +++ b/internal/telemetry/tracing/config/config.go @@ -1,10 +1,10 @@ package config import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing/google" "github.com/zitadel/zitadel/internal/telemetry/tracing/log" "github.com/zitadel/zitadel/internal/telemetry/tracing/otel" + "github.com/zitadel/zitadel/internal/zerrors" ) type Config struct { @@ -15,7 +15,7 @@ type Config struct { func (c *Config) NewTracer() error { t, ok := tracer[c.Type] if !ok { - return errors.ThrowInternalf(nil, "TRACE-dsbjh", "config type %s not supported", c.Type) + return zerrors.ThrowInternalf(nil, "TRACE-dsbjh", "config type %s not supported", c.Type) } return t(c.Config) diff --git a/internal/telemetry/tracing/otel/config.go b/internal/telemetry/tracing/otel/config.go index 81995a941..a9f9168c1 100644 --- a/internal/telemetry/tracing/otel/config.go +++ b/internal/telemetry/tracing/otel/config.go @@ -7,8 +7,8 @@ import ( otlpgrpc "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" sdk_trace "go.opentelemetry.io/otel/sdk/trace" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) type Config struct { @@ -38,11 +38,11 @@ func FractionFromConfig(i interface{}) (float64, error) { case string: f, err := strconv.ParseFloat(fraction, 64) if err != nil { - return 0, errors.ThrowInternal(err, "OTEL-SAfe1", "could not map fraction") + return 0, zerrors.ThrowInternal(err, "OTEL-SAfe1", "could not map fraction") } return f, nil default: - return 0, errors.ThrowInternal(nil, "OTEL-Dd2s", "could not map fraction, unknown type") + return 0, zerrors.ThrowInternal(nil, "OTEL-Dd2s", "could not map fraction, unknown type") } } diff --git a/internal/telemetry/tracing/span.go b/internal/telemetry/tracing/span.go index 9e6f3bc28..9a6b6385e 100644 --- a/internal/telemetry/tracing/span.go +++ b/internal/telemetry/tracing/span.go @@ -4,7 +4,7 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - grpc_errs "github.com/zitadel/zitadel/internal/api/grpc/errors" + "github.com/zitadel/zitadel/internal/api/grpc/gerrors" ) type Span struct { @@ -41,6 +41,6 @@ func (s *Span) SetStatusByError(err error) { ) } - code, msg, id, _ := grpc_errs.ExtractCaosError(err) + code, msg, id, _ := gerrors.ExtractZITADELError(err) s.span.SetAttributes(attribute.Int("grpc_code", int(code)), attribute.String("grpc_msg", msg), attribute.String("error_id", id)) } diff --git a/internal/user/model/external_idp_view.go b/internal/user/model/external_idp_view.go index 2225f7676..6dc8f53dc 100644 --- a/internal/user/model/external_idp_view.go +++ b/internal/user/model/external_idp_view.go @@ -2,7 +2,7 @@ package model import ( "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" "time" ) @@ -56,7 +56,7 @@ type ExternalIDPSearchResponse struct { func (r *ExternalIDPSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-3n8fM", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-3n8fM", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/user/model/refresh_token_view.go b/internal/user/model/refresh_token_view.go index d3437a22c..1e1da3999 100644 --- a/internal/user/model/refresh_token_view.go +++ b/internal/user/model/refresh_token_view.go @@ -2,7 +2,7 @@ package model import ( "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" "time" ) @@ -63,7 +63,7 @@ type RefreshTokenSearchResponse struct { func (r *RefreshTokenSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-M0fse", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-M0fse", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/user/model/token_view.go b/internal/user/model/token_view.go index de9b387b4..c2f82afaa 100644 --- a/internal/user/model/token_view.go +++ b/internal/user/model/token_view.go @@ -2,7 +2,7 @@ package model import ( "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" "time" ) @@ -61,7 +61,7 @@ type TokenSearchResponse struct { func (r *TokenSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-M0fse", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-M0fse", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/user/model/user_membership_view.go b/internal/user/model/user_membership_view.go index 08bc87f61..3c68ef286 100644 --- a/internal/user/model/user_membership_view.go +++ b/internal/user/model/user_membership_view.go @@ -2,7 +2,7 @@ package model import ( "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" "time" ) @@ -70,7 +70,7 @@ type UserMembershipSearchResponse struct { func (r *UserMembershipSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-288fJ", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-288fJ", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/user/model/user_session_view.go b/internal/user/model/user_session_view.go index f610eaa03..7a23fa2a6 100644 --- a/internal/user/model/user_session_view.go +++ b/internal/user/model/user_session_view.go @@ -4,7 +4,7 @@ import ( "time" "github.com/zitadel/zitadel/internal/domain" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type UserSessionView struct { @@ -64,7 +64,7 @@ type UserSessionSearchResponse struct { func (r *UserSessionSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return caos_errors.ThrowInvalidArgument(nil, "SEARCH-27ifs", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-27ifs", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit diff --git a/internal/user/model/user_view.go b/internal/user/model/user_view.go index dac8b8a55..35b333a26 100644 --- a/internal/user/model/user_view.go +++ b/internal/user/model/user_view.go @@ -6,9 +6,9 @@ import ( "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" iam_model "github.com/zitadel/zitadel/internal/iam/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type UserView struct { @@ -137,7 +137,7 @@ const ( func (r *UserSearchRequest) EnsureLimit(limit uint64) error { if r.Limit > limit { - return errors.ThrowInvalidArgument(nil, "SEARCH-zz62F", "Errors.Limit.ExceedsDefault") + return zerrors.ThrowInvalidArgument(nil, "SEARCH-zz62F", "Errors.Limit.ExceedsDefault") } if r.Limit == 0 { r.Limit = limit @@ -247,7 +247,7 @@ func (u *UserView) HasRequiredOrgMFALevel(policy *iam_model.LoginPolicyView) boo func (u *UserView) GetProfile() (*Profile, error) { if u.HumanView == nil { - return nil, errors.ThrowPreconditionFailed(nil, "MODEL-WLTce", "Errors.User.NotHuman") + return nil, zerrors.ThrowPreconditionFailed(nil, "MODEL-WLTce", "Errors.User.NotHuman") } return &Profile{ ObjectRoot: models.ObjectRoot{ @@ -271,7 +271,7 @@ func (u *UserView) GetProfile() (*Profile, error) { func (u *UserView) GetPhone() (*Phone, error) { if u.HumanView == nil { - return nil, errors.ThrowPreconditionFailed(nil, "MODEL-him4a", "Errors.User.NotHuman") + return nil, zerrors.ThrowPreconditionFailed(nil, "MODEL-him4a", "Errors.User.NotHuman") } return &Phone{ ObjectRoot: models.ObjectRoot{ @@ -288,7 +288,7 @@ func (u *UserView) GetPhone() (*Phone, error) { func (u *UserView) GetEmail() (*Email, error) { if u.HumanView == nil { - return nil, errors.ThrowPreconditionFailed(nil, "MODEL-PWd6K", "Errors.User.NotHuman") + return nil, zerrors.ThrowPreconditionFailed(nil, "MODEL-PWd6K", "Errors.User.NotHuman") } return &Email{ ObjectRoot: models.ObjectRoot{ @@ -305,7 +305,7 @@ func (u *UserView) GetEmail() (*Email, error) { func (u *UserView) GetAddress() (*Address, error) { if u.HumanView == nil { - return nil, errors.ThrowPreconditionFailed(nil, "MODEL-DN61m", "Errors.User.NotHuman") + return nil, zerrors.ThrowPreconditionFailed(nil, "MODEL-DN61m", "Errors.User.NotHuman") } return &Address{ ObjectRoot: models.ObjectRoot{ diff --git a/internal/user/repository/eventsourcing/model/address.go b/internal/user/repository/eventsourcing/model/address.go index d3fa65f4e..518216272 100644 --- a/internal/user/repository/eventsourcing/model/address.go +++ b/internal/user/repository/eventsourcing/model/address.go @@ -5,8 +5,8 @@ import ( "github.com/zitadel/logging" - caos_errs "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type Address struct { @@ -50,7 +50,7 @@ func (a *Address) setData(event *es_models.Event) error { a.ObjectRoot.AppendEvent(event) if err := json.Unmarshal(event.Data, a); err != nil { logging.Log("EVEN-clos0").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-so92s", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-so92s", "could not unmarshal event") } return nil } diff --git a/internal/user/repository/eventsourcing/model/auth_request.go b/internal/user/repository/eventsourcing/model/auth_request.go index 62b5fe48c..a523dded7 100644 --- a/internal/user/repository/eventsourcing/model/auth_request.go +++ b/internal/user/repository/eventsourcing/model/auth_request.go @@ -5,8 +5,8 @@ import ( "github.com/zitadel/logging" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" + "github.com/zitadel/zitadel/internal/zerrors" ) type AuthRequest struct { @@ -25,7 +25,7 @@ type BrowserInfo struct { func (a *AuthRequest) SetData(event eventstore.Event) error { if err := event.Unmarshal(a); err != nil { logging.Log("EVEN-T5df6").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-yGmhh", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-yGmhh", "could not unmarshal event") } return nil } diff --git a/internal/user/repository/eventsourcing/model/email.go b/internal/user/repository/eventsourcing/model/email.go index f4abf69ed..7e5c5b827 100644 --- a/internal/user/repository/eventsourcing/model/email.go +++ b/internal/user/repository/eventsourcing/model/email.go @@ -7,8 +7,8 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/crypto" - caos_errs "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type Email struct { @@ -51,7 +51,7 @@ func (a *Email) setData(event *es_models.Event) error { a.ObjectRoot.AppendEvent(event) if err := json.Unmarshal(event.Data, a); err != nil { logging.Log("EVEN-dlo9s").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-sl9xw", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-sl9xw", "could not unmarshal event") } return nil } @@ -61,7 +61,7 @@ func (a *EmailCode) SetData(event *es_models.Event) error { a.CreationDate = event.CreationDate if err := json.Unmarshal(event.Data, a); err != nil { logging.Log("EVEN-lo9s").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-s8uws", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-s8uws", "could not unmarshal event") } return nil } diff --git a/internal/user/repository/eventsourcing/model/external_idp.go b/internal/user/repository/eventsourcing/model/external_idp.go index df3038ea5..5890db380 100644 --- a/internal/user/repository/eventsourcing/model/external_idp.go +++ b/internal/user/repository/eventsourcing/model/external_idp.go @@ -5,8 +5,8 @@ import ( "github.com/zitadel/logging" - caos_errs "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type ExternalIDP struct { @@ -54,7 +54,7 @@ func (pw *ExternalIDP) setData(event *es_models.Event) error { pw.ObjectRoot.AppendEvent(event) if err := json.Unmarshal(event.Data, pw); err != nil { logging.Log("EVEN-Msi9d").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-A9osf", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-A9osf", "could not unmarshal event") } return nil } diff --git a/internal/user/repository/eventsourcing/model/otp.go b/internal/user/repository/eventsourcing/model/otp.go index f5bf36592..a40b5b2c9 100644 --- a/internal/user/repository/eventsourcing/model/otp.go +++ b/internal/user/repository/eventsourcing/model/otp.go @@ -4,10 +4,10 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/crypto" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type OTP struct { @@ -40,7 +40,7 @@ func (o *OTP) setData(event eventstore.Event) error { o.ObjectRoot.AppendEvent(event) if err := event.Unmarshal(o); err != nil { logging.Log("EVEN-d9soe").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-lo023", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-lo023", "could not unmarshal event") } return nil } @@ -48,7 +48,7 @@ func (o *OTP) setData(event eventstore.Event) error { func (o *OTPVerified) SetData(event eventstore.Event) error { if err := event.Unmarshal(o); err != nil { logging.Log("EVEN-BF421").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-GB6hj", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-GB6hj", "could not unmarshal event") } return nil } diff --git a/internal/user/repository/eventsourcing/model/password.go b/internal/user/repository/eventsourcing/model/password.go index e9d3e58f3..8b40e45d9 100644 --- a/internal/user/repository/eventsourcing/model/password.go +++ b/internal/user/repository/eventsourcing/model/password.go @@ -6,9 +6,9 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/crypto" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type Password struct { @@ -51,7 +51,7 @@ func (pw *Password) setData(event eventstore.Event) error { pw.ObjectRoot.AppendEvent(event) if err := event.Unmarshal(pw); err != nil { logging.Log("EVEN-dks93").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-sl9xlo2rsw", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-sl9xlo2rsw", "could not unmarshal event") } return nil } @@ -61,7 +61,7 @@ func (c *PasswordCode) SetData(event eventstore.Event) error { c.CreationDate = event.CreatedAt() if err := event.Unmarshal(c); err != nil { logging.Log("EVEN-lo0y2").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-q21dr", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-q21dr", "could not unmarshal event") } return nil } @@ -69,7 +69,7 @@ func (c *PasswordCode) SetData(event eventstore.Event) error { func (pw *PasswordChange) SetData(event eventstore.Event) error { if err := event.Unmarshal(pw); err != nil { logging.Log("EVEN-ADs31").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-BDd32", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-BDd32", "could not unmarshal event") } pw.ObjectRoot.AppendEvent(event) return nil diff --git a/internal/user/repository/eventsourcing/model/phone.go b/internal/user/repository/eventsourcing/model/phone.go index 80e08fc16..26063769c 100644 --- a/internal/user/repository/eventsourcing/model/phone.go +++ b/internal/user/repository/eventsourcing/model/phone.go @@ -7,8 +7,8 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/crypto" - caos_errs "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/zerrors" ) type Phone struct { @@ -56,7 +56,7 @@ func (p *Phone) setData(event *es_models.Event) error { p.ObjectRoot.AppendEvent(event) if err := json.Unmarshal(event.Data, p); err != nil { logging.Log("EVEN-lco9s").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-lre56", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-lre56", "could not unmarshal event") } return nil } @@ -66,7 +66,7 @@ func (c *PhoneCode) SetData(event *es_models.Event) error { c.CreationDate = event.CreationDate if err := json.Unmarshal(event.Data, c); err != nil { logging.Log("EVEN-sk8ws").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-7hdj3", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-7hdj3", "could not unmarshal event") } return nil } diff --git a/internal/user/repository/eventsourcing/model/token.go b/internal/user/repository/eventsourcing/model/token.go index 57718c838..bb1e1945d 100644 --- a/internal/user/repository/eventsourcing/model/token.go +++ b/internal/user/repository/eventsourcing/model/token.go @@ -7,9 +7,9 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" user_repo "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) type Token struct { @@ -49,7 +49,7 @@ func (t *Token) setData(event *es_models.Event) error { t.ObjectRoot.AppendEvent(event) if err := json.Unmarshal(event.Data, t); err != nil { logging.Log("EVEN-4Fm9s").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-5Gms9", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-5Gms9", "could not unmarshal event") } return nil } diff --git a/internal/user/repository/eventsourcing/model/user.go b/internal/user/repository/eventsourcing/model/user.go index 36cba95ea..1f58208dd 100644 --- a/internal/user/repository/eventsourcing/model/user.go +++ b/internal/user/repository/eventsourcing/model/user.go @@ -6,11 +6,10 @@ import ( "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" - caos_errs "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -80,13 +79,13 @@ func (u *User) AppendEvent(event *es_models.Event) error { return u.Machine.AppendEvent(event) } - return errors.ThrowNotFound(nil, "MODEL-x9TaX", "Errors.UserType.Undefined") + return zerrors.ThrowNotFound(nil, "MODEL-x9TaX", "Errors.UserType.Undefined") } func (u *User) setData(event *es_models.Event) error { if err := json.Unmarshal(event.Data, u); err != nil { logging.Log("EVEN-ZDzQy").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-yGmhh", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-yGmhh", "could not unmarshal event") } return nil } diff --git a/internal/user/repository/eventsourcing/model/user_human.go b/internal/user/repository/eventsourcing/model/user_human.go index 2df0d5bb7..5fbfb3ad4 100644 --- a/internal/user/repository/eventsourcing/model/user_human.go +++ b/internal/user/repository/eventsourcing/model/user_human.go @@ -7,10 +7,10 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/crypto" - caos_errs "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type Human struct { @@ -159,7 +159,7 @@ func (h *Human) ComputeObject() { func (u *Human) setData(event *es_models.Event) error { if err := json.Unmarshal(event.Data, u); err != nil { logging.Log("EVEN-8ujgd").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-sj4jd", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-sj4jd", "could not unmarshal event") } return nil } @@ -179,7 +179,7 @@ func (c *InitUserCode) SetData(event *es_models.Event) error { c.ObjectRoot.AppendEvent(event) if err := json.Unmarshal(event.Data, c); err != nil { logging.Log("EVEN-7duwe").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-lo34s", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-lo34s", "could not unmarshal event") } return nil } diff --git a/internal/user/repository/eventsourcing/model/user_machine.go b/internal/user/repository/eventsourcing/model/user_machine.go index 45d60b484..a8d6602ce 100644 --- a/internal/user/repository/eventsourcing/model/user_machine.go +++ b/internal/user/repository/eventsourcing/model/user_machine.go @@ -6,9 +6,9 @@ import ( "github.com/zitadel/logging" - "github.com/zitadel/zitadel/internal/errors" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" user_repo "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) type Machine struct { @@ -39,7 +39,7 @@ func (sa *Machine) AppendEvent(event *es_models.Event) (err error) { func (sa *Machine) setData(event *es_models.Event) error { if err := json.Unmarshal(event.Data, sa); err != nil { logging.Log("EVEN-8ujgd").WithError(err).Error("could not unmarshal event data") - return errors.ThrowInternal(err, "MODEL-GwjY9", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-GwjY9", "could not unmarshal event") } return nil } @@ -69,7 +69,7 @@ func (key *MachineKey) AppendEvent(event *es_models.Event) (err error) { case user_repo.MachineKeyAddedEventType: err = json.Unmarshal(event.Data, key) if err != nil { - return errors.ThrowInternal(err, "MODEL-SjI4S", "Errors.Internal") + return zerrors.ThrowInternal(err, "MODEL-SjI4S", "Errors.Internal") } case user_repo.MachineKeyRemovedEventType: key.ExpirationDate = event.CreationDate diff --git a/internal/user/repository/eventsourcing/model/web_auth_n.go b/internal/user/repository/eventsourcing/model/web_auth_n.go index 86bf5de06..5a5a133af 100644 --- a/internal/user/repository/eventsourcing/model/web_auth_n.go +++ b/internal/user/repository/eventsourcing/model/web_auth_n.go @@ -3,10 +3,10 @@ package model import ( "github.com/zitadel/logging" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" es_models "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/zerrors" ) type WebAuthNToken struct { @@ -64,7 +64,7 @@ func GetWebauthn(webauthnTokens []*WebAuthNToken, id string) (int, *WebAuthNToke func (w *WebAuthNVerify) SetData(event eventstore.Event) error { if err := event.Unmarshal(w); err != nil { logging.Log("EVEN-G342rf").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-B6641", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-B6641", "could not unmarshal event") } return nil } @@ -101,7 +101,7 @@ func (u *Human) appendU2FVerifiedEvent(event eventstore.Event) error { token.State = int32(model.MFAStateReady) return nil } - return caos_errs.ThrowPreconditionFailed(nil, "MODEL-4hu9s", "Errors.Users.MFA.U2F.NotExisting") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-4hu9s", "Errors.Users.MFA.U2F.NotExisting") } func (u *Human) appendU2FChangeSignCountEvent(event eventstore.Event) error { @@ -114,7 +114,7 @@ func (u *Human) appendU2FChangeSignCountEvent(event eventstore.Event) error { token.setData(event) return nil } - return caos_errs.ThrowPreconditionFailed(nil, "MODEL-5Ms8h", "Errors.Users.MFA.U2F.NotExisting") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-5Ms8h", "Errors.Users.MFA.U2F.NotExisting") } func (u *Human) appendU2FRemovedEvent(event eventstore.Event) error { @@ -166,7 +166,7 @@ func (u *Human) appendPasswordlessVerifiedEvent(event eventstore.Event) error { token.State = int32(model.MFAStateReady) return nil } - return caos_errs.ThrowPreconditionFailed(nil, "MODEL-mKns8", "Errors.Users.MFA.Passwordless.NotExisting") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-mKns8", "Errors.Users.MFA.Passwordless.NotExisting") } func (u *Human) appendPasswordlessChangeSignCountEvent(event eventstore.Event) error { @@ -182,7 +182,7 @@ func (u *Human) appendPasswordlessChangeSignCountEvent(event eventstore.Event) e } return nil } - return caos_errs.ThrowPreconditionFailed(nil, "MODEL-2Mv9s", "Errors.Users.MFA.Passwordless.NotExisting") + return zerrors.ThrowPreconditionFailed(nil, "MODEL-2Mv9s", "Errors.Users.MFA.Passwordless.NotExisting") } func (u *Human) appendPasswordlessRemovedEvent(event eventstore.Event) error { @@ -206,7 +206,7 @@ func (w *WebAuthNToken) setData(event eventstore.Event) error { w.ObjectRoot.AppendEvent(event) if err := event.Unmarshal(w); err != nil { logging.Log("EVEN-4M9is").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-lo023", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-lo023", "could not unmarshal event") } return nil } @@ -251,7 +251,7 @@ func (w *WebAuthNLogin) setData(event eventstore.Event) error { w.ObjectRoot.AppendEvent(event) if err := event.Unmarshal(w); err != nil { logging.Log("EVEN-hmSlo").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-lo023", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-lo023", "could not unmarshal event") } return nil } diff --git a/internal/user/repository/view/external_idp_view.go b/internal/user/repository/view/external_idp_view.go index 4a64557f8..198017dc2 100644 --- a/internal/user/repository/view/external_idp_view.go +++ b/internal/user/repository/view/external_idp_view.go @@ -3,10 +3,10 @@ package view import ( "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/zerrors" "github.com/jinzhu/gorm" - caos_errs "github.com/zitadel/zitadel/internal/errors" usr_model "github.com/zitadel/zitadel/internal/user/model" "github.com/zitadel/zitadel/internal/user/repository/view/model" ) @@ -35,8 +35,8 @@ func ExternalIDPByExternalUserIDAndIDPConfigID(db *gorm.DB, table, externalUserI } query := repository.PrepareGetByQuery(table, userIDQuery, idpConfigIDQuery, instanceIDQuery, ownerRemovedQuery) err := query(db, user) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-Mso9f", "Errors.ExternalIDP.NotFound") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-Mso9f", "Errors.ExternalIDP.NotFound") } return user, err } @@ -70,8 +70,8 @@ func ExternalIDPByExternalUserIDAndIDPConfigIDAndResourceOwner(db *gorm.DB, tabl } query := repository.PrepareGetByQuery(table, userIDQuery, idpConfigIDQuery, resourceOwnerQuery, instanceIDQuery, ownerRemovedQuery) err := query(db, user) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-Sf8sd", "Errors.ExternalIDP.NotFound") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-Sf8sd", "Errors.ExternalIDP.NotFound") } return user, err } diff --git a/internal/user/repository/view/model/external_idps.go b/internal/user/repository/view/model/external_idps.go index 4b03c7dc4..d27e0a0b2 100644 --- a/internal/user/repository/view/model/external_idps.go +++ b/internal/user/repository/view/model/external_idps.go @@ -6,9 +6,9 @@ import ( "github.com/zitadel/logging" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" user_repo "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -53,7 +53,7 @@ func (r *ExternalIDPView) setRootData(event *models.Event) { func (r *ExternalIDPView) SetData(event *models.Event) error { if err := json.Unmarshal(event.Data, r); err != nil { logging.Log("EVEN-48sfs").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-Hs8uf", "Could not unmarshal data") + return zerrors.ThrowInternal(err, "MODEL-Hs8uf", "Could not unmarshal data") } return nil } diff --git a/internal/user/repository/view/model/notify_user.go b/internal/user/repository/view/model/notify_user.go index 371d7a9cd..7ab7fc664 100644 --- a/internal/user/repository/view/model/notify_user.go +++ b/internal/user/repository/view/model/notify_user.go @@ -7,11 +7,11 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" org_model "github.com/zitadel/zitadel/internal/org/model" "github.com/zitadel/zitadel/internal/repository/user" es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -116,7 +116,7 @@ func (u *NotifyUser) setRootData(event *models.Event) { func (u *NotifyUser) setData(event *models.Event) error { if err := json.Unmarshal(event.Data, u); err != nil { logging.Log("MODEL-lso9e").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(nil, "MODEL-8iows", "could not unmarshal data") + return zerrors.ThrowInternal(nil, "MODEL-8iows", "could not unmarshal data") } return nil } @@ -125,7 +125,7 @@ func (u *NotifyUser) setPasswordData(event *models.Event) error { password := new(es_model.Password) if err := json.Unmarshal(event.Data, password); err != nil { logging.Log("MODEL-dfhw6").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(nil, "MODEL-BHFD2", "could not unmarshal data") + return zerrors.ThrowInternal(nil, "MODEL-BHFD2", "could not unmarshal data") } u.PasswordSet = password.Secret != nil || password.EncodedHash != "" return nil diff --git a/internal/user/repository/view/model/refresh_token.go b/internal/user/repository/view/model/refresh_token.go index d62b3e141..a45300ca8 100644 --- a/internal/user/repository/view/model/refresh_token.go +++ b/internal/user/repository/view/model/refresh_token.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" user_repo "github.com/zitadel/zitadel/internal/repository/user" usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -122,7 +122,7 @@ func (t *RefreshTokenView) appendAddedEvent(event eventstore.Event) error { e := new(user_repo.HumanRefreshTokenAddedEvent) if err := event.Unmarshal(e); err != nil { logging.Log("EVEN-Dbb31").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-Bbr42", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-Bbr42", "could not unmarshal event") } t.ID = e.TokenID t.CreationDate = event.CreatedAt() @@ -142,7 +142,7 @@ func (t *RefreshTokenView) appendRenewedEvent(event eventstore.Event) error { e := new(user_repo.HumanRefreshTokenRenewedEvent) if err := event.Unmarshal(e); err != nil { logging.Log("EVEN-Vbbn2").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-Bbrn4", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-Bbrn4", "could not unmarshal event") } t.ID = e.TokenID t.IdleExpiration = event.CreatedAt().Add(e.IdleExpiration) diff --git a/internal/user/repository/view/model/token.go b/internal/user/repository/view/model/token.go index 4e11eec94..5b01ecd5b 100644 --- a/internal/user/repository/view/model/token.go +++ b/internal/user/repository/view/model/token.go @@ -6,10 +6,10 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" user_repo "github.com/zitadel/zitadel/internal/repository/user" usr_model "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -133,7 +133,7 @@ func (t *TokenView) setRootData(event eventstore.Event) { func (t *TokenView) setData(event eventstore.Event) error { if err := event.Unmarshal(t); err != nil { logging.Log("EVEN-3Gm9s").WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(err, "MODEL-5Gms9", "could not unmarshal event") + return zerrors.ThrowInternal(err, "MODEL-5Gms9", "could not unmarshal event") } return nil } @@ -142,7 +142,7 @@ func agentIDFromSession(event eventstore.Event) (string, error) { session := make(map[string]interface{}) if err := event.Unmarshal(&session); err != nil { logging.Log("EVEN-Ghgt3").WithError(err).Error("could not unmarshal event data") - return "", caos_errs.ThrowInternal(nil, "MODEL-GBf32", "could not unmarshal data") + return "", zerrors.ThrowInternal(nil, "MODEL-GBf32", "could not unmarshal data") } return session["userAgentID"].(string), nil } @@ -201,7 +201,7 @@ func eventToMap(event eventstore.Event) (map[string]interface{}, error) { m := make(map[string]interface{}) if err := event.Unmarshal(&m); err != nil { logging.Log("EVEN-Dbffe").WithError(err).Error("could not unmarshal event data") - return nil, caos_errs.ThrowInternal(nil, "MODEL-SDAfw", "could not unmarshal data") + return nil, zerrors.ThrowInternal(nil, "MODEL-SDAfw", "could not unmarshal data") } return m, nil } diff --git a/internal/user/repository/view/model/user.go b/internal/user/repository/view/model/user.go index 65fd32993..1beb4b323 100644 --- a/internal/user/repository/view/model/user.go +++ b/internal/user/repository/view/model/user.go @@ -9,12 +9,12 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" org_model "github.com/zitadel/zitadel/internal/org/model" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/user/model" es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -317,14 +317,14 @@ func (u *UserView) AppendEvent(event eventstore.Event) (err error) { user.HumanMFAOTPAddedType: if u.HumanView == nil { logging.WithFields("event_sequence", event.Sequence, "aggregate_id", event.Aggregate().ID, "instance", event.Aggregate().InstanceID).Warn("event is ignored because human not exists") - return errors.ThrowInvalidArgument(nil, "MODEL-p2BXx", "event ignored: human not exists") + return zerrors.ThrowInvalidArgument(nil, "MODEL-p2BXx", "event ignored: human not exists") } u.OTPState = int32(model.MFAStateNotReady) case user.UserV1MFAOTPVerifiedType, user.HumanMFAOTPVerifiedType: if u.HumanView == nil { logging.WithFields("event_sequence", event.Sequence, "aggregate_id", event.Aggregate().ID, "instance", event.Aggregate().InstanceID).Warn("event is ignored because human not exists") - return errors.ThrowInvalidArgument(nil, "MODEL-o6Lcq", "event ignored: human not exists") + return zerrors.ThrowInvalidArgument(nil, "MODEL-o6Lcq", "event ignored: human not exists") } u.OTPState = int32(model.MFAStateReady) u.MFAInitSkipped = time.Time{} @@ -368,7 +368,7 @@ func (u *UserView) AppendEvent(event eventstore.Event) (err error) { user.HumanPasswordlessInitCodeRequestedType: if u.HumanView == nil { logging.WithFields("event_sequence", event.Sequence, "aggregate_id", event.Aggregate().ID, "instance", event.Aggregate().InstanceID).Warn("event is ignored because human not exists") - return errors.ThrowInvalidArgument(nil, "MODEL-MbyC0", "event ignored: human not exists") + return zerrors.ThrowInvalidArgument(nil, "MODEL-MbyC0", "event ignored: human not exists") } if !u.PasswordSet { u.PasswordlessInitRequired = true @@ -388,7 +388,7 @@ func (u *UserView) setRootData(event eventstore.Event) { func (u *UserView) setData(event eventstore.Event) error { if err := event.Unmarshal(u); err != nil { logging.Log("MODEL-lso9e").WithError(err).Error("could not unmarshal event data") - return errors.ThrowInternal(nil, "MODEL-8iows", "could not unmarshal data") + return zerrors.ThrowInternal(nil, "MODEL-8iows", "could not unmarshal data") } return nil } @@ -397,7 +397,7 @@ func (u *UserView) setPasswordData(event eventstore.Event) error { password := new(es_model.Password) if err := event.Unmarshal(password); err != nil { logging.Log("MODEL-sdw4r").WithError(err).Error("could not unmarshal event data") - return errors.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data") + return zerrors.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data") } u.PasswordSet = password.Secret != nil || password.EncodedHash != "" u.PasswordInitRequired = !u.PasswordSet @@ -503,7 +503,7 @@ func webAuthNViewFromEvent(event eventstore.Event) (*WebAuthNView, error) { token := new(WebAuthNView) err := event.Unmarshal(token) if err != nil { - return nil, errors.ThrowInternal(err, "MODEL-FSaq1", "could not unmarshal data") + return nil, zerrors.ThrowInternal(err, "MODEL-FSaq1", "could not unmarshal data") } return token, err } diff --git a/internal/user/repository/view/model/user_membership.go b/internal/user/repository/view/model/user_membership.go index 7562c1e84..716ac6f59 100644 --- a/internal/user/repository/view/model/user_membership.go +++ b/internal/user/repository/view/model/user_membership.go @@ -7,7 +7,6 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore/v1/models" iam_es_model "github.com/zitadel/zitadel/internal/iam/repository/eventsourcing/model" org_es_model "github.com/zitadel/zitadel/internal/org/repository/eventsourcing/model" @@ -16,6 +15,7 @@ import ( "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/user/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -93,7 +93,7 @@ func (u *UserMembershipView) setIamMemberData(event *models.Event) error { member := new(iam_es_model.IAMMember) if err := json.Unmarshal(event.Data, member); err != nil { logging.New().WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data") + return zerrors.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data") } u.UserID = member.UserID u.Roles = member.Roles @@ -104,7 +104,7 @@ func (u *UserMembershipView) setOrgMemberData(event *models.Event) error { member := new(org_es_model.OrgMember) if err := json.Unmarshal(event.Data, member); err != nil { logging.New().WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data") + return zerrors.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data") } u.UserID = member.UserID u.Roles = member.Roles @@ -115,7 +115,7 @@ func (u *UserMembershipView) setProjectMemberData(event *models.Event) error { member := new(proj_es_model.ProjectMember) if err := json.Unmarshal(event.Data, member); err != nil { logging.New().WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data") + return zerrors.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data") } u.UserID = member.UserID u.Roles = member.Roles @@ -126,7 +126,7 @@ func (u *UserMembershipView) setProjectGrantMemberData(event *models.Event) erro member := new(proj_es_model.ProjectGrantMember) if err := json.Unmarshal(event.Data, member); err != nil { logging.New().WithError(err).Error("could not unmarshal event data") - return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data") + return zerrors.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data") } u.UserID = member.UserID u.ObjectID = member.GrantID diff --git a/internal/user/repository/view/model/user_session.go b/internal/user/repository/view/model/user_session.go index d660b38a2..3b21e877f 100644 --- a/internal/user/repository/view/model/user_session.go +++ b/internal/user/repository/view/model/user_session.go @@ -6,11 +6,11 @@ import ( "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/user/model" es_model "github.com/zitadel/zitadel/internal/user/repository/eventsourcing/model" + "github.com/zitadel/zitadel/internal/zerrors" ) const ( @@ -49,7 +49,7 @@ func UserSessionFromEvent(event eventstore.Event) (*UserSessionView, error) { v := new(UserSessionView) if err := event.Unmarshal(v); err != nil { logging.Log("EVEN-lso9e").WithError(err).Error("could not unmarshal event data") - return nil, caos_errs.ThrowInternal(nil, "MODEL-sd325", "could not unmarshal data") + return nil, zerrors.ThrowInternal(nil, "MODEL-sd325", "could not unmarshal data") } return v, nil } @@ -212,7 +212,7 @@ func avatarKeyFromEvent(event eventstore.Event) (string, error) { data := make(map[string]string) if err := event.Unmarshal(&data); err != nil { logging.Log("EVEN-Sfew2").WithError(err).Error("could not unmarshal event data") - return "", caos_errs.ThrowInternal(err, "MODEL-SFw2q", "could not unmarshal event") + return "", zerrors.ThrowInternal(err, "MODEL-SFw2q", "could not unmarshal event") } return data["storeKey"], nil } diff --git a/internal/user/repository/view/notify_user.go b/internal/user/repository/view/notify_user.go index 031ca3209..622a5c4e6 100644 --- a/internal/user/repository/view/notify_user.go +++ b/internal/user/repository/view/notify_user.go @@ -4,10 +4,10 @@ import ( "github.com/jinzhu/gorm" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" usr_model "github.com/zitadel/zitadel/internal/user/model" "github.com/zitadel/zitadel/internal/user/repository/view/model" "github.com/zitadel/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) func NotifyUserByID(db *gorm.DB, table, userID, instanceID string) (*model.NotifyUser, error) { @@ -17,8 +17,8 @@ func NotifyUserByID(db *gorm.DB, table, userID, instanceID string) (*model.Notif model.NotifyUserSearchQuery{Key: usr_model.NotifyUserSearchKeyInstanceID, Method: domain.SearchMethodEquals, Value: instanceID}, ) err := query(db, user) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-Gad31", "Errors.User.NotFound") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-Gad31", "Errors.User.NotFound") } return user, err } diff --git a/internal/user/repository/view/query.go b/internal/user/repository/view/query.go index eb362a378..d88c31da4 100644 --- a/internal/user/repository/view/query.go +++ b/internal/user/repository/view/query.go @@ -1,14 +1,14 @@ package view import ( - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" + "github.com/zitadel/zitadel/internal/zerrors" ) func UserByIDQuery(id, instanceID string, sequence uint64, eventTypes []eventstore.EventType) (*eventstore.SearchQueryBuilder, error) { if id == "" { - return nil, errors.ThrowPreconditionFailed(nil, "EVENT-d8isw", "Errors.User.UserIDMissing") + return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-d8isw", "Errors.User.UserIDMissing") } return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent). AwaitOpenTransactions(). diff --git a/internal/user/repository/view/refresh_token_view.go b/internal/user/repository/view/refresh_token_view.go index 98715cab6..642dfc101 100644 --- a/internal/user/repository/view/refresh_token_view.go +++ b/internal/user/repository/view/refresh_token_view.go @@ -4,10 +4,10 @@ import ( "github.com/jinzhu/gorm" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/user/model" usr_model "github.com/zitadel/zitadel/internal/user/repository/view/model" "github.com/zitadel/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) func RefreshTokenByID(db *gorm.DB, table, tokenID, instanceID string) (*usr_model.RefreshTokenView, error) { @@ -17,8 +17,8 @@ func RefreshTokenByID(db *gorm.DB, table, tokenID, instanceID string) (*usr_mode &usr_model.RefreshTokenSearchQuery{Key: model.RefreshTokenSearchKeyInstanceID, Method: domain.SearchMethodEquals, Value: instanceID}, ) err := query(db, token) - if errors.IsNotFound(err) { - return nil, errors.ThrowNotFound(nil, "VIEW-6ub3p", "Errors.RefreshToken.NotFound") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-6ub3p", "Errors.RefreshToken.NotFound") } return token, err } diff --git a/internal/user/repository/view/token_view.go b/internal/user/repository/view/token_view.go index 6aaed26e3..72a0d164a 100644 --- a/internal/user/repository/view/token_view.go +++ b/internal/user/repository/view/token_view.go @@ -4,10 +4,10 @@ import ( "github.com/jinzhu/gorm" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/user/model" usr_model "github.com/zitadel/zitadel/internal/user/repository/view/model" "github.com/zitadel/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) func TokenByIDs(db *gorm.DB, table, tokenID, userID, instanceID string) (*usr_model.TokenView, error) { @@ -18,8 +18,8 @@ func TokenByIDs(db *gorm.DB, table, tokenID, userID, instanceID string) (*usr_mo &usr_model.TokenSearchQuery{Key: model.TokenSearchKeyInstanceID, Method: domain.SearchMethodEquals, Value: instanceID}, ) err := query(db, token) - if errors.IsNotFound(err) { - return nil, errors.ThrowNotFound(nil, "VIEW-6ub3p", "Errors.Token.NotFound") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-6ub3p", "Errors.Token.NotFound") } return token, err } diff --git a/internal/user/repository/view/user_session_view.go b/internal/user/repository/view/user_session_view.go index 7b75c31d3..487857c1b 100644 --- a/internal/user/repository/view/user_session_view.go +++ b/internal/user/repository/view/user_session_view.go @@ -4,10 +4,10 @@ import ( "github.com/jinzhu/gorm" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" usr_model "github.com/zitadel/zitadel/internal/user/model" "github.com/zitadel/zitadel/internal/user/repository/view/model" "github.com/zitadel/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) func UserSessionByIDs(db *gorm.DB, table, agentID, userID, instanceID string) (*model.UserSessionView, error) { @@ -29,8 +29,8 @@ func UserSessionByIDs(db *gorm.DB, table, agentID, userID, instanceID string) (* } query := repository.PrepareGetByQuery(table, userAgentQuery, userQuery, instanceIDQuery) err := query(db, userSession) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-NGBs1", "Errors.UserSession.NotFound") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-NGBs1", "Errors.UserSession.NotFound") } return userSession, err } diff --git a/internal/user/repository/view/user_view.go b/internal/user/repository/view/user_view.go index c0b5d2af7..dcae95654 100644 --- a/internal/user/repository/view/user_view.go +++ b/internal/user/repository/view/user_view.go @@ -1,14 +1,13 @@ package view import ( - "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/view/repository" - "github.com/jinzhu/gorm" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/domain" usr_model "github.com/zitadel/zitadel/internal/user/model" "github.com/zitadel/zitadel/internal/user/repository/view/model" + "github.com/zitadel/zitadel/internal/view/repository" + "github.com/zitadel/zitadel/internal/zerrors" ) func UserByID(db *gorm.DB, table, userID, instanceID string) (*model.UserView, error) { @@ -30,8 +29,8 @@ func UserByID(db *gorm.DB, table, userID, instanceID string) (*model.UserView, e } query := repository.PrepareGetByQuery(table, userIDQuery, instanceIDQuery, ownerRemovedQuery) err := query(db, user) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-sj8Sw", "Errors.User.NotFound") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-sj8Sw", "Errors.User.NotFound") } user.SetEmptyUserType() return user, err @@ -56,8 +55,8 @@ func UserByUserName(db *gorm.DB, table, userName, instanceID string) (*model.Use } query := repository.PrepareGetByQuery(table, userNameQuery, instanceIDQuery, ownerRemovedQuery) err := query(db, user) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-Lso9s", "Errors.User.NotFound") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-Lso9s", "Errors.User.NotFound") } user.SetEmptyUserType() return user, err @@ -82,8 +81,8 @@ func UserByLoginName(db *gorm.DB, table, loginName, instanceID string) (*model.U } query := repository.PrepareGetByQuery(table, loginNameQuery, instanceIDQuery, ownerRemovedQuery) err := query(db, user) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-AD4qs", "Errors.User.NotFound") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-AD4qs", "Errors.User.NotFound") } user.SetEmptyUserType() return user, err @@ -113,8 +112,8 @@ func UserByLoginNameAndResourceOwner(db *gorm.DB, table, loginName, resourceOwne } query := repository.PrepareGetByQuery(table, loginNameQuery, resourceOwnerQuery, instanceIDQuery, ownerRemovedQuery) err := query(db, user) - if caos_errs.IsNotFound(err) { - return nil, caos_errs.ThrowNotFound(nil, "VIEW-AD4qs", "Errors.User.NotFoundOnOrg") + if zerrors.IsNotFound(err) { + return nil, zerrors.ThrowNotFound(nil, "VIEW-AD4qs", "Errors.User.NotFoundOnOrg") } user.SetEmptyUserType() return user, err diff --git a/internal/view/repository/query.go b/internal/view/repository/query.go index ba18c71ba..b7800fed2 100644 --- a/internal/view/repository/query.go +++ b/internal/view/repository/query.go @@ -11,7 +11,7 @@ import ( "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type SearchRequest interface { @@ -48,7 +48,7 @@ func PrepareSearchQuery(table string, request SearchRequest) func(db *gorm.DB, r var err error query, err = SetQuery(query, q.GetKey(), q.GetValue(), q.GetMethod()) if err != nil { - return count, caos_errs.ThrowInvalidArgument(err, "VIEW-KaGue", "query is invalid") + return count, zerrors.ThrowInvalidArgument(err, "VIEW-KaGue", "query is invalid") } } @@ -69,7 +69,7 @@ func PrepareSearchQuery(table string, request SearchRequest) func(db *gorm.DB, r query = query.Offset(request.GetOffset()) err := query.Find(res).Error if err != nil { - return count, caos_errs.ThrowInternal(err, "VIEW-muSDK", "unable to find result") + return count, zerrors.ThrowInternal(err, "VIEW-muSDK", "unable to find result") } return count, nil } @@ -78,7 +78,7 @@ func PrepareSearchQuery(table string, request SearchRequest) func(db *gorm.DB, r func SetQuery(query *gorm.DB, key ColumnKey, value interface{}, method domain.SearchMethod) (*gorm.DB, error) { column := key.ToColumnName() if column == "" { - return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-7dz3w", "Column name missing") + return nil, zerrors.ThrowInvalidArgument(nil, "VIEW-7dz3w", "Column name missing") } switch method { @@ -87,43 +87,43 @@ func SetQuery(query *gorm.DB, key ColumnKey, value interface{}, method domain.Se case domain.SearchMethodEqualsIgnoreCase: valueText, ok := value.(string) if !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-idu8e", "Equal ignore case only possible for strings") + return nil, zerrors.ThrowInvalidArgument(nil, "VIEW-idu8e", "Equal ignore case only possible for strings") } query = query.Where("LOWER("+column+") = LOWER(?)", valueText) case domain.SearchMethodStartsWith: valueText, ok := value.(string) if !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-SLj7s", "Starts with only possible for strings") + return nil, zerrors.ThrowInvalidArgument(nil, "VIEW-SLj7s", "Starts with only possible for strings") } query = query.Where(column+" LIKE ?", valueText+"%") case domain.SearchMethodStartsWithIgnoreCase: valueText, ok := value.(string) if !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-eidus", "Starts with ignore case only possible for strings") + return nil, zerrors.ThrowInvalidArgument(nil, "VIEW-eidus", "Starts with ignore case only possible for strings") } query = query.Where("LOWER("+column+") LIKE LOWER(?)", valueText+"%") case domain.SearchMethodEndsWith: valueText, ok := value.(string) if !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-Hswd3", "Ends with only possible for strings") + return nil, zerrors.ThrowInvalidArgument(nil, "VIEW-Hswd3", "Ends with only possible for strings") } query = query.Where(column+" LIKE ?", "%"+valueText) case domain.SearchMethodEndsWithIgnoreCase: valueText, ok := value.(string) if !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-dAG31", "Ends with ignore case only possible for strings") + return nil, zerrors.ThrowInvalidArgument(nil, "VIEW-dAG31", "Ends with ignore case only possible for strings") } query = query.Where("LOWER("+column+") LIKE LOWER(?)", "%"+valueText) case domain.SearchMethodContains: valueText, ok := value.(string) if !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-3ids", "Contains with only possible for strings") + return nil, zerrors.ThrowInvalidArgument(nil, "VIEW-3ids", "Contains with only possible for strings") } query = query.Where(column+" LIKE ?", "%"+valueText+"%") case domain.SearchMethodContainsIgnoreCase: valueText, ok := value.(string) if !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-eid73", "Contains with ignore case only possible for strings") + return nil, zerrors.ThrowInvalidArgument(nil, "VIEW-eid73", "Contains with ignore case only possible for strings") } query = query.Where("LOWER("+column+") LIKE LOWER(?)", "%"+valueText+"%") case domain.SearchMethodNotEquals: @@ -137,7 +137,7 @@ func SetQuery(query *gorm.DB, key ColumnKey, value interface{}, method domain.Se case domain.SearchMethodListContains: valueText, ok := value.(string) if !ok { - return nil, caos_errs.ThrowInvalidArgument(nil, "VIEW-Psois", "list contains only possible for strings") + return nil, zerrors.ThrowInvalidArgument(nil, "VIEW-Psois", "list contains only possible for strings") } query = query.Where("? <@ "+column, database.TextArray[string]{valueText}) default: diff --git a/internal/view/repository/query_test.go b/internal/view/repository/query_test.go index c85660e99..dd068d2b8 100644 --- a/internal/view/repository/query_test.go +++ b/internal/view/repository/query_test.go @@ -5,7 +5,7 @@ import ( "github.com/jinzhu/gorm" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestPrepareSearchQuery(t *testing.T) { @@ -126,7 +126,7 @@ func TestPrepareSearchQuery(t *testing.T) { res{ count: 1, wantErr: true, - errFunc: caos_errs.IsInternal, + errFunc: zerrors.IsInternal, }, }, } diff --git a/internal/view/repository/requests.go b/internal/view/repository/requests.go index 9de4f9fcd..b1d98af34 100644 --- a/internal/view/repository/requests.go +++ b/internal/view/repository/requests.go @@ -9,8 +9,7 @@ import ( "github.com/jinzhu/gorm" "github.com/zitadel/logging" - - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func PrepareGetByQuery(table string, queries ...SearchQuery) func(db *gorm.DB, res interface{}) error { @@ -20,7 +19,7 @@ func PrepareGetByQuery(table string, queries ...SearchQuery) func(db *gorm.DB, r var err error query, err = SetQuery(query, q.GetKey(), q.GetValue(), q.GetMethod()) if err != nil { - return caos_errs.ThrowInvalidArgument(err, "VIEW-KaGue", "query is invalid") + return zerrors.ThrowInvalidArgument(err, "VIEW-KaGue", "query is invalid") } } @@ -36,10 +35,10 @@ func PrepareGetByQuery(table string, queries ...SearchQuery) func(db *gorm.DB, r return nil } if errors.Is(err, gorm.ErrRecordNotFound) { - return caos_errs.ThrowNotFound(err, "VIEW-hodc6", "object not found") + return zerrors.ThrowNotFound(err, "VIEW-hodc6", "object not found") } logging.LogWithFields("VIEW-Mg6la", "table ", table).WithError(err).Warn("get from cache error") - return caos_errs.ThrowInternal(err, "VIEW-qJBg9", "cache error") + return zerrors.ThrowInternal(err, "VIEW-qJBg9", "cache error") } } @@ -48,16 +47,16 @@ func PrepareBulkSave(table string) func(db *gorm.DB, objects ...interface{}) err db = db.Table(table) db = db.Begin() if err := db.Error; err != nil { - return caos_errs.ThrowInternal(err, "REPOS-Fl0Is", "unable to begin") + return zerrors.ThrowInternal(err, "REPOS-Fl0Is", "unable to begin") } for _, object := range objects { err := db.Save(object).Error if err != nil { - return caos_errs.ThrowInternal(err, "VIEW-oJJSm", "unable to put object to view") + return zerrors.ThrowInternal(err, "VIEW-oJJSm", "unable to put object to view") } } if err := db.Commit().Error; err != nil { - return caos_errs.ThrowInternal(err, "REPOS-IfhUE", "unable to commit") + return zerrors.ThrowInternal(err, "REPOS-IfhUE", "unable to commit") } return nil } @@ -67,7 +66,7 @@ func PrepareSave(table string) func(db *gorm.DB, object interface{}) error { return func(db *gorm.DB, object interface{}) error { err := db.Table(table).Save(object).Error if err != nil { - return caos_errs.ThrowInternal(err, "VIEW-2m9fs", "unable to put object to view") + return zerrors.ThrowInternal(err, "VIEW-2m9fs", "unable to put object to view") } return nil } @@ -82,7 +81,7 @@ func PrepareSaveOnConflict(table string, conflictColumns, updateColumns []string return func(db *gorm.DB, object interface{}) error { err := db.Table(table).Set("gorm:insert_option", onConflict).Save(object).Error if err != nil { - return caos_errs.ThrowInternal(err, "VIEW-AfC7G", "unable to put object to view") + return zerrors.ThrowInternal(err, "VIEW-AfC7G", "unable to put object to view") } return nil } @@ -95,7 +94,7 @@ func PrepareDeleteByKey(table string, key ColumnKey, id interface{}) func(db *go Delete(nil). Error if err != nil { - return caos_errs.ThrowInternal(err, "VIEW-die73", "could not delete object") + return zerrors.ThrowInternal(err, "VIEW-die73", "could not delete object") } return nil } @@ -111,7 +110,7 @@ func PrepareUpdateByKeys(table string, column ColumnKey, value interface{}, keys Update(column.ToColumnName(), value). Error if err != nil { - return caos_errs.ThrowInternal(err, "VIEW-ps099xj", "could not update object") + return zerrors.ThrowInternal(err, "VIEW-ps099xj", "could not update object") } return nil } @@ -132,7 +131,7 @@ func PrepareDeleteByKeys(table string, keys ...Key) func(db *gorm.DB) error { Delete(nil). Error if err != nil { - return caos_errs.ThrowInternal(err, "VIEW-die73", "could not delete object") + return zerrors.ThrowInternal(err, "VIEW-die73", "could not delete object") } return nil } diff --git a/internal/view/repository/requests_test.go b/internal/view/repository/requests_test.go index c852d15a7..36982827f 100644 --- a/internal/view/repository/requests_test.go +++ b/internal/view/repository/requests_test.go @@ -6,7 +6,7 @@ import ( "github.com/jinzhu/gorm" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestPrepareGetByQuery(t *testing.T) { @@ -114,7 +114,7 @@ func TestPrepareGetByQuery(t *testing.T) { res{ result: Test{ID: "VALUE"}, wantErr: true, - errFunc: caos_errs.IsNotFound, + errFunc: zerrors.IsNotFound, }, }, { @@ -128,7 +128,7 @@ func TestPrepareGetByQuery(t *testing.T) { res{ result: Test{ID: "VALUE"}, wantErr: true, - errFunc: caos_errs.IsInternal, + errFunc: zerrors.IsInternal, }, }, { @@ -142,7 +142,7 @@ func TestPrepareGetByQuery(t *testing.T) { res{ result: Test{ID: "VALUE"}, wantErr: true, - errFunc: caos_errs.IsErrorInvalidArgument, + errFunc: zerrors.IsErrorInvalidArgument, }, }, } @@ -212,7 +212,7 @@ func TestPreparePut(t *testing.T) { res{ result: Test{ID: "VALUE"}, wantErr: true, - errFunc: caos_errs.IsInternal, + errFunc: zerrors.IsInternal, }, }, } @@ -284,7 +284,7 @@ func TestPrepareDelete(t *testing.T) { res{ result: Test{ID: "VALUE"}, wantErr: true, - errFunc: caos_errs.IsInternal, + errFunc: zerrors.IsInternal, }, }, } @@ -375,7 +375,7 @@ func TestPrepareDeleteByKeys(t *testing.T) { res{ result: Test{ID: "VALUE"}, wantErr: true, - errFunc: caos_errs.IsInternal, + errFunc: zerrors.IsInternal, }, }, } diff --git a/internal/webauthn/webauthn.go b/internal/webauthn/webauthn.go index 8a9709ec8..329d53363 100644 --- a/internal/webauthn/webauthn.go +++ b/internal/webauthn/webauthn.go @@ -13,7 +13,7 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/domain" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) type Config struct { @@ -80,11 +80,11 @@ func (w *Config) BeginRegistration(ctx context.Context, user *domain.Human, acco webauthn.WithExclusions(existing), ) if err != nil { - return nil, caos_errs.ThrowInternal(err, "WEBAU-bM8sd", "Errors.User.WebAuthN.BeginRegisterFailed") + return nil, zerrors.ThrowInternal(err, "WEBAU-bM8sd", "Errors.User.WebAuthN.BeginRegisterFailed") } cred, err := json.Marshal(credentialOptions) if err != nil { - return nil, caos_errs.ThrowInternal(err, "WEBAU-D7cus", "Errors.User.WebAuthN.MarshalError") + return nil, zerrors.ThrowInternal(err, "WEBAU-D7cus", "Errors.User.WebAuthN.MarshalError") } return &domain.WebAuthNToken{ Challenge: sessionData.Challenge, @@ -97,12 +97,12 @@ func (w *Config) BeginRegistration(ctx context.Context, user *domain.Human, acco func (w *Config) FinishRegistration(ctx context.Context, user *domain.Human, webAuthN *domain.WebAuthNToken, tokenName string, credData []byte, isLoginUI bool) (*domain.WebAuthNToken, error) { if webAuthN == nil { - return nil, caos_errs.ThrowInternal(nil, "WEBAU-5M9so", "Errors.User.WebAuthN.NotFound") + return nil, zerrors.ThrowInternal(nil, "WEBAU-5M9so", "Errors.User.WebAuthN.NotFound") } credentialData, err := protocol.ParseCredentialCreationResponseBody(bytes.NewReader(credData)) if err != nil { logging.WithFields("error", tryExtractProtocolErrMsg(err)).Debug("webauthn credential could not be parsed") - return nil, caos_errs.ThrowInternal(err, "WEBAU-sEr8c", "Errors.User.WebAuthN.ErrorOnParseCredential") + return nil, zerrors.ThrowInternal(err, "WEBAU-sEr8c", "Errors.User.WebAuthN.ErrorOnParseCredential") } sessionData := WebAuthNToSessionData(webAuthN) webAuthNServer, err := w.serverFromContext(ctx, webAuthN.RPID, credentialData.Response.CollectedClientData.Origin) @@ -117,7 +117,7 @@ func (w *Config) FinishRegistration(ctx context.Context, user *domain.Human, web credentialData) if err != nil { logging.WithFields("error", tryExtractProtocolErrMsg(err)).Debug("webauthn credential could not be created") - return nil, caos_errs.ThrowInternal(err, "WEBAU-3Vb9s", "Errors.User.WebAuthN.CreateCredentialFailed") + return nil, zerrors.ThrowInternal(err, "WEBAU-3Vb9s", "Errors.User.WebAuthN.CreateCredentialFailed") } webAuthN.KeyID = credential.ID @@ -141,11 +141,11 @@ func (w *Config) BeginLogin(ctx context.Context, user *domain.Human, userVerific }, webauthn.WithUserVerification(UserVerificationFromDomain(userVerification))) if err != nil { logging.WithFields("error", tryExtractProtocolErrMsg(err)).Debug("webauthn login could not be started") - return nil, caos_errs.ThrowInternal(err, "WEBAU-4G8sw", "Errors.User.WebAuthN.BeginLoginFailed") + return nil, zerrors.ThrowInternal(err, "WEBAU-4G8sw", "Errors.User.WebAuthN.BeginLoginFailed") } cred, err := json.Marshal(assertion) if err != nil { - return nil, caos_errs.ThrowInternal(err, "WEBAU-2M0s9", "Errors.User.WebAuthN.MarshalError") + return nil, zerrors.ThrowInternal(err, "WEBAU-2M0s9", "Errors.User.WebAuthN.MarshalError") } return &domain.WebAuthNLogin{ Challenge: sessionData.Challenge, @@ -160,7 +160,7 @@ func (w *Config) FinishLogin(ctx context.Context, user *domain.Human, webAuthN * assertionData, err := protocol.ParseCredentialRequestResponseBody(bytes.NewReader(credData)) if err != nil { logging.WithFields("error", tryExtractProtocolErrMsg(err)).Debug("webauthn assertion could not be parsed") - return nil, caos_errs.ThrowInternal(err, "WEBAU-ADgv4", "Errors.User.WebAuthN.ValidateLoginFailed") + return nil, zerrors.ThrowInternal(err, "WEBAU-ADgv4", "Errors.User.WebAuthN.ValidateLoginFailed") } webUser := &webUser{ Human: user, @@ -173,11 +173,11 @@ func (w *Config) FinishLogin(ctx context.Context, user *domain.Human, webAuthN * credential, err := webAuthNServer.ValidateLogin(webUser, WebAuthNLoginToSessionData(webAuthN), assertionData) if err != nil { logging.WithFields("error", tryExtractProtocolErrMsg(err)).Debug("webauthn assertion failed") - return nil, caos_errs.ThrowInternal(err, "WEBAU-3M9si", "Errors.User.WebAuthN.ValidateLoginFailed") + return nil, zerrors.ThrowInternal(err, "WEBAU-3M9si", "Errors.User.WebAuthN.ValidateLoginFailed") } if credential.Authenticator.CloneWarning { - return credential, caos_errs.ThrowInternal(nil, "WEBAU-4M90s", "Errors.User.WebAuthN.CloneWarning") + return credential, zerrors.ThrowInternal(nil, "WEBAU-4M90s", "Errors.User.WebAuthN.CloneWarning") } return credential, nil } @@ -189,7 +189,7 @@ func (w *Config) serverFromContext(ctx context.Context, id, origin string) (*web } webAuthn, err := webauthn.New(config) if err != nil { - return nil, caos_errs.ThrowInternal(err, "WEBAU-UX9ta", "Errors.User.WebAuthN.ServerConfig") + return nil, zerrors.ThrowInternal(err, "WEBAU-UX9ta", "Errors.User.WebAuthN.ServerConfig") } return webAuthn, nil } diff --git a/internal/webauthn/webauthn_test.go b/internal/webauthn/webauthn_test.go index 7d8052048..b7c4276ae 100644 --- a/internal/webauthn/webauthn_test.go +++ b/internal/webauthn/webauthn_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "github.com/zitadel/zitadel/internal/api/authz" - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestConfig_serverFromContext(t *testing.T) { @@ -27,7 +27,7 @@ func TestConfig_serverFromContext(t *testing.T) { { name: "webauthn error", args: args{context.Background(), "", ""}, - wantErr: caos_errs.ThrowInternal(nil, "WEBAU-UX9ta", "Errors.User.WebAuthN.ServerConfig"), + wantErr: zerrors.ThrowInternal(nil, "WEBAU-UX9ta", "Errors.User.WebAuthN.ServerConfig"), }, { name: "success from ctx", diff --git a/internal/errors/already_exists.go b/internal/zerrors/already_exists.go similarity index 72% rename from internal/errors/already_exists.go rename to internal/zerrors/already_exists.go index 83f95a2be..bdc544979 100644 --- a/internal/errors/already_exists.go +++ b/internal/zerrors/already_exists.go @@ -1,4 +1,4 @@ -package errors +package zerrors import "fmt" @@ -13,15 +13,15 @@ type AlreadyExists interface { } type AlreadyExistsError struct { - *CaosError + *ZitadelError } func ThrowAlreadyExists(parent error, id, message string) error { - return &AlreadyExistsError{CreateCaosError(parent, id, message)} + return &AlreadyExistsError{CreateZitadelError(parent, id, message)} } func ThrowAlreadyExistsf(parent error, id, format string, a ...interface{}) error { - return &AlreadyExistsError{CreateCaosError(parent, id, fmt.Sprintf(format, a...))} + return &AlreadyExistsError{CreateZitadelError(parent, id, fmt.Sprintf(format, a...))} } func (err *AlreadyExistsError) IsAlreadyExists() {} @@ -31,7 +31,7 @@ func (err *AlreadyExistsError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func IsErrorAlreadyExists(err error) bool { @@ -40,5 +40,5 @@ func IsErrorAlreadyExists(err error) bool { } func (err *AlreadyExistsError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/already_exists_test.go b/internal/zerrors/already_exists_test.go new file mode 100644 index 000000000..6039c3788 --- /dev/null +++ b/internal/zerrors/already_exists_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestAlreadyExistsError(t *testing.T) { + var alreadyExistsError interface{} = new(zerrors.AlreadyExistsError) + _, ok := alreadyExistsError.(zerrors.AlreadyExists) + assert.True(t, ok) +} + +func TestThrowAlreadyExistsf(t *testing.T) { + err := zerrors.ThrowAlreadyExistsf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.AlreadyExistsError) + assert.True(t, ok) +} + +func TestIsErrorAlreadyExists(t *testing.T) { + err := zerrors.ThrowAlreadyExists(nil, "id", "msg") + ok := zerrors.IsErrorAlreadyExists(err) + assert.True(t, ok) + + err = errors.New("Already Exists!") + ok = zerrors.IsErrorAlreadyExists(err) + assert.False(t, ok) +} diff --git a/internal/errors/deadline_exceeded.go b/internal/zerrors/deadline_exceeded.go similarity index 82% rename from internal/errors/deadline_exceeded.go rename to internal/zerrors/deadline_exceeded.go index 9efe842c7..b19aac733 100644 --- a/internal/errors/deadline_exceeded.go +++ b/internal/zerrors/deadline_exceeded.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "fmt" @@ -15,11 +15,11 @@ type DeadlineExceeded interface { } type DeadlineExceededError struct { - *CaosError + *ZitadelError } func ThrowDeadlineExceeded(parent error, id, message string) error { - return &DeadlineExceededError{CreateCaosError(parent, id, message)} + return &DeadlineExceededError{CreateZitadelError(parent, id, message)} } func ThrowDeadlineExceededf(parent error, id, format string, a ...interface{}) error { @@ -38,9 +38,9 @@ func (err *DeadlineExceededError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *DeadlineExceededError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/deadline_exceeded_test.go b/internal/zerrors/deadline_exceeded_test.go new file mode 100644 index 000000000..743add716 --- /dev/null +++ b/internal/zerrors/deadline_exceeded_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestDeadlineExceededError(t *testing.T) { + var err interface{} = new(zerrors.DeadlineExceededError) + _, ok := err.(zerrors.DeadlineExceeded) + assert.True(t, ok) +} + +func TestThrowDeadlineExceededf(t *testing.T) { + err := zerrors.ThrowDeadlineExceededf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.DeadlineExceededError) + assert.True(t, ok) +} + +func TestIsDeadlineExceeded(t *testing.T) { + err := zerrors.ThrowDeadlineExceeded(nil, "id", "msg") + ok := zerrors.IsDeadlineExceeded(err) + assert.True(t, ok) + + err = errors.New("I am found!") + ok = zerrors.IsDeadlineExceeded(err) + assert.False(t, ok) +} diff --git a/internal/errors/error.go b/internal/zerrors/error.go similarity index 96% rename from internal/errors/error.go rename to internal/zerrors/error.go index 31d1fc684..a2840063c 100644 --- a/internal/errors/error.go +++ b/internal/zerrors/error.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "strings" diff --git a/internal/errors/error_test.go b/internal/zerrors/error_test.go similarity index 53% rename from internal/errors/error_test.go rename to internal/zerrors/error_test.go index 8078bca55..23ef37030 100644 --- a/internal/errors/error_test.go +++ b/internal/zerrors/error_test.go @@ -1,4 +1,4 @@ -package errors_test +package zerrors_test import ( "errors" @@ -6,14 +6,14 @@ import ( "github.com/stretchr/testify/assert" - caos_errors "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestContains(t *testing.T) { err := errors.New("hello world") - world := caos_errors.Contains(err, "hello") + world := zerrors.Contains(err, "hello") assert.True(t, world) - mars := caos_errors.Contains(err, "mars") + mars := zerrors.Contains(err, "mars") assert.False(t, mars) } diff --git a/internal/errors/generate/error.go.tmpl b/internal/zerrors/generate/error.go.tmpl similarity index 100% rename from internal/errors/generate/error.go.tmpl rename to internal/zerrors/generate/error.go.tmpl diff --git a/internal/errors/generate/error_creator.go b/internal/zerrors/generate/error_creator.go similarity index 95% rename from internal/errors/generate/error_creator.go rename to internal/zerrors/generate/error_creator.go index 2062161c7..8e16ad334 100644 --- a/internal/errors/generate/error_creator.go +++ b/internal/zerrors/generate/error_creator.go @@ -1,4 +1,4 @@ -//go generate +// go generate package main import ( @@ -32,7 +32,7 @@ func main() { fmt.Print(` !!!!! - Add status mapping in internal/api/grpc/caos_errors.go + Add status mapping in internal/api/grpc/zerrors.go !!!!!`) } diff --git a/internal/errors/generate/error_interface.go.tmpl b/internal/zerrors/generate/error_interface.go.tmpl similarity index 100% rename from internal/errors/generate/error_interface.go.tmpl rename to internal/zerrors/generate/error_interface.go.tmpl diff --git a/internal/zerrors/generate/error_test.go.tmpl b/internal/zerrors/generate/error_test.go.tmpl new file mode 100644 index 000000000..6d967e1af --- /dev/null +++ b/internal/zerrors/generate/error_test.go.tmpl @@ -0,0 +1,33 @@ +package errors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func Test{{.ErrorName}}Error(t *testing.T) { + var err interface{} + err = new(zerrors.{{.ErrorName}}Error) + _, ok := err.(*zerrors.{{.ErrorName}}) + assert.True(t, ok) +} + +func TestThrow{{.ErrorName}}f(t *testing.T) { + err := zerrors.Throw{{.ErrorName}}f(nil, "id", "msg") + _, ok := err.(*zerrors.{{.ErrorName}}Error) + assert.True(t, ok) +} + +func TestIs{{.ErrorName}}(t *testing.T) { + err := zerrors.Throw{{.ErrorName}}(nil, "id", "msg") + ok := zerrors.Is{{.ErrorName}}(err) + assert.True(t, ok) + + err = errors.New("I am found!") + ok = zerrors.Is{{.ErrorName}}(err) + assert.False(t, ok) +} diff --git a/internal/errors/internal.go b/internal/zerrors/internal.go similarity index 80% rename from internal/errors/internal.go rename to internal/zerrors/internal.go index 0b0a4272a..97c164f3e 100644 --- a/internal/errors/internal.go +++ b/internal/zerrors/internal.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "fmt" @@ -15,11 +15,11 @@ type Internal interface { } type InternalError struct { - *CaosError + *ZitadelError } func ThrowInternal(parent error, id, message string) error { - return &InternalError{CreateCaosError(parent, id, message)} + return &InternalError{CreateZitadelError(parent, id, message)} } func ThrowInternalf(parent error, id, format string, a ...interface{}) error { @@ -38,9 +38,9 @@ func (err *InternalError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *InternalError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/internal_test.go b/internal/zerrors/internal_test.go new file mode 100644 index 000000000..3448afbaf --- /dev/null +++ b/internal/zerrors/internal_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestInternalError(t *testing.T) { + var err interface{} = new(zerrors.InternalError) + _, ok := err.(zerrors.Internal) + assert.True(t, ok) +} + +func TestThrowInternalf(t *testing.T) { + err := zerrors.ThrowInternalf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.InternalError) + assert.True(t, ok) +} + +func TestIsInternal(t *testing.T) { + err := zerrors.ThrowInternal(nil, "id", "msg") + ok := zerrors.IsInternal(err) + assert.True(t, ok) + + err = errors.New("I am found!") + ok = zerrors.IsInternal(err) + assert.False(t, ok) +} diff --git a/internal/errors/invalid_argument.go b/internal/zerrors/invalid_argument.go similarity index 82% rename from internal/errors/invalid_argument.go rename to internal/zerrors/invalid_argument.go index 431885dca..b2a33fc86 100644 --- a/internal/errors/invalid_argument.go +++ b/internal/zerrors/invalid_argument.go @@ -1,4 +1,4 @@ -package errors +package zerrors import "fmt" @@ -13,11 +13,11 @@ type InvalidArgument interface { } type InvalidArgumentError struct { - *CaosError + *ZitadelError } func ThrowInvalidArgument(parent error, id, message string) error { - return &InvalidArgumentError{CreateCaosError(parent, id, message)} + return &InvalidArgumentError{CreateZitadelError(parent, id, message)} } func ThrowInvalidArgumentf(parent error, id, format string, a ...interface{}) error { @@ -36,9 +36,9 @@ func (err *InvalidArgumentError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *InvalidArgumentError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/invalid_argument_test.go b/internal/zerrors/invalid_argument_test.go new file mode 100644 index 000000000..7c1bd75ae --- /dev/null +++ b/internal/zerrors/invalid_argument_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestInvalidArgumentError(t *testing.T) { + var invalidArgumentError interface{} = new(zerrors.InvalidArgumentError) + _, ok := invalidArgumentError.(zerrors.InvalidArgument) + assert.True(t, ok) +} + +func TestThrowInvalidArgumentf(t *testing.T) { + err := zerrors.ThrowInvalidArgumentf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.InvalidArgumentError) + assert.True(t, ok) +} + +func TestIsErrorInvalidArgument(t *testing.T) { + err := zerrors.ThrowInvalidArgument(nil, "id", "msg") + ok := zerrors.IsErrorInvalidArgument(err) + assert.True(t, ok) + + err = errors.New("I am invalid!") + ok = zerrors.IsErrorInvalidArgument(err) + assert.False(t, ok) +} diff --git a/internal/errors/not_found.go b/internal/zerrors/not_found.go similarity index 77% rename from internal/errors/not_found.go rename to internal/zerrors/not_found.go index c53edeeee..450cc1aa6 100644 --- a/internal/errors/not_found.go +++ b/internal/zerrors/not_found.go @@ -1,4 +1,4 @@ -package errors +package zerrors import "fmt" @@ -8,11 +8,11 @@ type NotFound interface { } type NotFoundError struct { - *CaosError + *ZitadelError } func ThrowNotFound(parent error, id, message string) error { - return &NotFoundError{CreateCaosError(parent, id, message)} + return &NotFoundError{CreateZitadelError(parent, id, message)} } func ThrowNotFoundf(parent error, id, format string, a ...interface{}) error { @@ -31,9 +31,9 @@ func (err *NotFoundError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *NotFoundError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/not_found_test.go b/internal/zerrors/not_found_test.go new file mode 100644 index 000000000..b54c550b2 --- /dev/null +++ b/internal/zerrors/not_found_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestNotFoundError(t *testing.T) { + var notFoundError interface{} = new(zerrors.NotFoundError) + _, ok := notFoundError.(zerrors.NotFound) + assert.True(t, ok) +} + +func TestThrowNotFoundf(t *testing.T) { + err := zerrors.ThrowNotFoundf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.NotFoundError) + assert.True(t, ok) +} + +func TestIsNotFound(t *testing.T) { + err := zerrors.ThrowNotFound(nil, "id", "msg") + ok := zerrors.IsNotFound(err) + assert.True(t, ok) + + err = errors.New("I am found!") + ok = zerrors.IsNotFound(err) + assert.False(t, ok) +} diff --git a/internal/errors/permission_denied.go b/internal/zerrors/permission_denied.go similarity index 82% rename from internal/errors/permission_denied.go rename to internal/zerrors/permission_denied.go index 466530884..62bff08ed 100644 --- a/internal/errors/permission_denied.go +++ b/internal/zerrors/permission_denied.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "fmt" @@ -15,11 +15,11 @@ type PermissionDenied interface { } type PermissionDeniedError struct { - *CaosError + *ZitadelError } func ThrowPermissionDenied(parent error, id, message string) error { - return &PermissionDeniedError{CreateCaosError(parent, id, message)} + return &PermissionDeniedError{CreateZitadelError(parent, id, message)} } func ThrowPermissionDeniedf(parent error, id, format string, a ...interface{}) error { @@ -38,9 +38,9 @@ func (err *PermissionDeniedError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *PermissionDeniedError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/permission_denied_test.go b/internal/zerrors/permission_denied_test.go new file mode 100644 index 000000000..e60177055 --- /dev/null +++ b/internal/zerrors/permission_denied_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestPermissionDeniedError(t *testing.T) { + var err interface{} = new(zerrors.PermissionDeniedError) + _, ok := err.(zerrors.PermissionDenied) + assert.True(t, ok) +} + +func TestThrowPermissionDeniedf(t *testing.T) { + err := zerrors.ThrowPermissionDeniedf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.PermissionDeniedError) + assert.True(t, ok) +} + +func TestIsPermissionDenied(t *testing.T) { + err := zerrors.ThrowPermissionDenied(nil, "id", "msg") + ok := zerrors.IsPermissionDenied(err) + assert.True(t, ok) + + err = errors.New("I am found!") + ok = zerrors.IsPermissionDenied(err) + assert.False(t, ok) +} diff --git a/internal/errors/precondition_failed.go b/internal/zerrors/precondition_failed.go similarity index 82% rename from internal/errors/precondition_failed.go rename to internal/zerrors/precondition_failed.go index 2deee47aa..ebacb4aa8 100644 --- a/internal/errors/precondition_failed.go +++ b/internal/zerrors/precondition_failed.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "fmt" @@ -15,11 +15,11 @@ type PreconditionFailed interface { } type PreconditionFailedError struct { - *CaosError + *ZitadelError } func ThrowPreconditionFailed(parent error, id, message string) error { - return &PreconditionFailedError{CreateCaosError(parent, id, message)} + return &PreconditionFailedError{CreateZitadelError(parent, id, message)} } func ThrowPreconditionFailedf(parent error, id, format string, a ...interface{}) error { @@ -38,9 +38,9 @@ func (err *PreconditionFailedError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *PreconditionFailedError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/precondition_failed_test.go b/internal/zerrors/precondition_failed_test.go new file mode 100644 index 000000000..33e45dc48 --- /dev/null +++ b/internal/zerrors/precondition_failed_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestPreconditionFailedError(t *testing.T) { + var err interface{} = new(zerrors.PreconditionFailedError) + _, ok := err.(zerrors.PreconditionFailed) + assert.True(t, ok) +} + +func TestThrowPreconditionFailedf(t *testing.T) { + err := zerrors.ThrowPreconditionFailedf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.PreconditionFailedError) + assert.True(t, ok) +} + +func TestIsPreconditionFailed(t *testing.T) { + err := zerrors.ThrowPreconditionFailed(nil, "id", "msg") + ok := zerrors.IsPreconditionFailed(err) + assert.True(t, ok) + + err = errors.New("Precondition failed!") + ok = zerrors.IsPreconditionFailed(err) + assert.False(t, ok) +} diff --git a/internal/errors/resource_exhausted.go b/internal/zerrors/resource_exhausted.go similarity index 83% rename from internal/errors/resource_exhausted.go rename to internal/zerrors/resource_exhausted.go index 1485fa361..1beac0857 100644 --- a/internal/errors/resource_exhausted.go +++ b/internal/zerrors/resource_exhausted.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "fmt" @@ -15,11 +15,11 @@ type ResourceExhausted interface { } type ResourceExhaustedError struct { - *CaosError + *ZitadelError } func ThrowResourceExhausted(parent error, id, message string) error { - return &ResourceExhaustedError{CreateCaosError(parent, id, message)} + return &ResourceExhaustedError{CreateZitadelError(parent, id, message)} } func ThrowResourceExhaustedf(parent error, id, format string, a ...interface{}) error { @@ -40,9 +40,9 @@ func (err *ResourceExhaustedError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *ResourceExhaustedError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/resource_exhausted_test.go b/internal/zerrors/resource_exhausted_test.go new file mode 100644 index 000000000..680cf487f --- /dev/null +++ b/internal/zerrors/resource_exhausted_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestResourceExhaustedError(t *testing.T) { + var err interface{} = new(zerrors.ResourceExhaustedError) + _, ok := err.(zerrors.ResourceExhausted) + assert.True(t, ok) +} + +func TestThrowResourceExhaustedf(t *testing.T) { + err := zerrors.ThrowResourceExhaustedf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.ResourceExhaustedError) + assert.True(t, ok) +} + +func TestIsResourceExhausted(t *testing.T) { + err := zerrors.ThrowResourceExhausted(nil, "id", "msg") + ok := zerrors.IsResourceExhausted(err) + assert.True(t, ok) + + err = errors.New("I am found!") + ok = zerrors.IsResourceExhausted(err) + assert.False(t, ok) +} diff --git a/internal/errors/unauthenticated.go b/internal/zerrors/unauthenticated.go similarity index 82% rename from internal/errors/unauthenticated.go rename to internal/zerrors/unauthenticated.go index 29237657e..16a6a9885 100644 --- a/internal/errors/unauthenticated.go +++ b/internal/zerrors/unauthenticated.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "fmt" @@ -15,11 +15,11 @@ type Unauthenticated interface { } type UnauthenticatedError struct { - *CaosError + *ZitadelError } func ThrowUnauthenticated(parent error, id, message string) error { - return &UnauthenticatedError{CreateCaosError(parent, id, message)} + return &UnauthenticatedError{CreateZitadelError(parent, id, message)} } func ThrowUnauthenticatedf(parent error, id, format string, a ...interface{}) error { @@ -38,9 +38,9 @@ func (err *UnauthenticatedError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *UnauthenticatedError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/unauthenticated_test.go b/internal/zerrors/unauthenticated_test.go new file mode 100644 index 000000000..9fa9c0a18 --- /dev/null +++ b/internal/zerrors/unauthenticated_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestUnauthenticatedError(t *testing.T) { + var err interface{} = new(zerrors.UnauthenticatedError) + _, ok := err.(zerrors.Unauthenticated) + assert.True(t, ok) +} + +func TestThrowUnauthenticatedf(t *testing.T) { + err := zerrors.ThrowUnauthenticatedf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.UnauthenticatedError) + assert.True(t, ok) +} + +func TestIsUnauthenticated(t *testing.T) { + err := zerrors.ThrowUnauthenticated(nil, "id", "msg") + ok := zerrors.IsUnauthenticated(err) + assert.True(t, ok) + + err = errors.New("I am found!") + ok = zerrors.IsUnauthenticated(err) + assert.False(t, ok) +} diff --git a/internal/errors/unavailable.go b/internal/zerrors/unavailable.go similarity index 81% rename from internal/errors/unavailable.go rename to internal/zerrors/unavailable.go index b4b30ab7f..65572881e 100644 --- a/internal/errors/unavailable.go +++ b/internal/zerrors/unavailable.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "fmt" @@ -15,11 +15,11 @@ type Unavailable interface { } type UnavailableError struct { - *CaosError + *ZitadelError } func ThrowUnavailable(parent error, id, message string) error { - return &UnavailableError{CreateCaosError(parent, id, message)} + return &UnavailableError{CreateZitadelError(parent, id, message)} } func ThrowUnavailablef(parent error, id, format string, a ...interface{}) error { @@ -38,9 +38,9 @@ func (err *UnavailableError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *UnavailableError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/unavailable_test.go b/internal/zerrors/unavailable_test.go new file mode 100644 index 000000000..f36d25e2c --- /dev/null +++ b/internal/zerrors/unavailable_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestUnavailableError(t *testing.T) { + var err interface{} = new(zerrors.UnavailableError) + _, ok := err.(zerrors.Unavailable) + assert.True(t, ok) +} + +func TestThrowUnavailablef(t *testing.T) { + err := zerrors.ThrowUnavailablef(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.UnavailableError) + assert.True(t, ok) +} + +func TestIsUnavailable(t *testing.T) { + err := zerrors.ThrowUnavailable(nil, "id", "msg") + ok := zerrors.IsUnavailable(err) + assert.True(t, ok) + + err = errors.New("I am found!") + ok = zerrors.IsUnavailable(err) + assert.False(t, ok) +} diff --git a/internal/errors/unimplemented.go b/internal/zerrors/unimplemented.go similarity index 81% rename from internal/errors/unimplemented.go rename to internal/zerrors/unimplemented.go index 1d0b77ed2..544f05ee2 100644 --- a/internal/errors/unimplemented.go +++ b/internal/zerrors/unimplemented.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "fmt" @@ -15,11 +15,11 @@ type Unimplemented interface { } type UnimplementedError struct { - *CaosError + *ZitadelError } func ThrowUnimplemented(parent error, id, message string) error { - return &UnimplementedError{CreateCaosError(parent, id, message)} + return &UnimplementedError{CreateZitadelError(parent, id, message)} } func ThrowUnimplementedf(parent error, id, format string, a ...interface{}) error { @@ -38,9 +38,9 @@ func (err *UnimplementedError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *UnimplementedError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/unimplemented_test.go b/internal/zerrors/unimplemented_test.go new file mode 100644 index 000000000..3786ed2f4 --- /dev/null +++ b/internal/zerrors/unimplemented_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestUnimplementedError(t *testing.T) { + var unimplementedError interface{} = new(zerrors.UnimplementedError) + _, ok := unimplementedError.(zerrors.Unimplemented) + assert.True(t, ok) +} + +func TestThrowUnimplementedf(t *testing.T) { + err := zerrors.ThrowUnimplementedf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.UnimplementedError) + assert.True(t, ok) +} + +func TestIsUnimplemented(t *testing.T) { + err := zerrors.ThrowUnimplemented(nil, "id", "msg") + ok := zerrors.IsUnimplemented(err) + assert.True(t, ok) + + err = errors.New("I am found!") + ok = zerrors.IsUnimplemented(err) + assert.False(t, ok) +} diff --git a/internal/errors/unknown.go b/internal/zerrors/unknown.go similarity index 79% rename from internal/errors/unknown.go rename to internal/zerrors/unknown.go index 78eda816a..cba44de8a 100644 --- a/internal/errors/unknown.go +++ b/internal/zerrors/unknown.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "fmt" @@ -15,11 +15,11 @@ type Unknown interface { } type UnknownError struct { - *CaosError + *ZitadelError } func ThrowUnknown(parent error, id, message string) error { - return &UnknownError{CreateCaosError(parent, id, message)} + return &UnknownError{CreateZitadelError(parent, id, message)} } func ThrowUnknownf(parent error, id, format string, a ...interface{}) error { @@ -38,9 +38,9 @@ func (err *UnknownError) Is(target error) bool { if !ok { return false } - return err.CaosError.Is(t.CaosError) + return err.ZitadelError.Is(t.ZitadelError) } func (err *UnknownError) Unwrap() error { - return err.CaosError + return err.ZitadelError } diff --git a/internal/zerrors/unknown_test.go b/internal/zerrors/unknown_test.go new file mode 100644 index 000000000..973966ce7 --- /dev/null +++ b/internal/zerrors/unknown_test.go @@ -0,0 +1,33 @@ +package zerrors_test + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/zitadel/zitadel/internal/zerrors" +) + +func TestUnknownError(t *testing.T) { + var err interface{} = new(zerrors.UnknownError) + _, ok := err.(zerrors.Unknown) + assert.True(t, ok) +} + +func TestThrowUnknownf(t *testing.T) { + err := zerrors.ThrowUnknownf(nil, "id", "msg") + //nolint:errorlint + _, ok := err.(*zerrors.UnknownError) + assert.True(t, ok) +} + +func TestIsUnknown(t *testing.T) { + err := zerrors.ThrowUnknown(nil, "id", "msg") + ok := zerrors.IsUnknown(err) + assert.True(t, ok) + + err = errors.New("I am found!") + ok = zerrors.IsUnknown(err) + assert.False(t, ok) +} diff --git a/internal/errors/caos_error.go b/internal/zerrors/zerror.go similarity index 56% rename from internal/errors/caos_error.go rename to internal/zerrors/zerror.go index 83d5a7ce4..d7b85b84a 100644 --- a/internal/errors/caos_error.go +++ b/internal/zerrors/zerror.go @@ -1,4 +1,4 @@ -package errors +package zerrors import ( "errors" @@ -6,55 +6,55 @@ import ( "reflect" ) -var _ Error = (*CaosError)(nil) +var _ Error = (*ZitadelError)(nil) -type CaosError struct { +type ZitadelError struct { Parent error Message string ID string } func ThrowError(parent error, id, message string) error { - return CreateCaosError(parent, id, message) + return CreateZitadelError(parent, id, message) } -func CreateCaosError(parent error, id, message string) *CaosError { - return &CaosError{ +func CreateZitadelError(parent error, id, message string) *ZitadelError { + return &ZitadelError{ Parent: parent, ID: id, Message: message, } } -func (err *CaosError) Error() string { +func (err *ZitadelError) Error() string { if err.Parent != nil { return fmt.Sprintf("ID=%s Message=%s Parent=(%v)", err.ID, err.Message, err.Parent) } return fmt.Sprintf("ID=%s Message=%s", err.ID, err.Message) } -func (err *CaosError) Unwrap() error { +func (err *ZitadelError) Unwrap() error { return err.GetParent() } -func (err *CaosError) GetParent() error { +func (err *ZitadelError) GetParent() error { return err.Parent } -func (err *CaosError) GetMessage() string { +func (err *ZitadelError) GetMessage() string { return err.Message } -func (err *CaosError) SetMessage(msg string) { +func (err *ZitadelError) SetMessage(msg string) { err.Message = msg } -func (err *CaosError) GetID() string { +func (err *ZitadelError) GetID() string { return err.ID } -func (err *CaosError) Is(target error) bool { - t, ok := target.(*CaosError) +func (err *ZitadelError) Is(target error) bool { + t, ok := target.(*ZitadelError) if !ok { return false } @@ -71,8 +71,8 @@ func (err *CaosError) Is(target error) bool { return true } -func (err *CaosError) As(target interface{}) bool { - _, ok := target.(**CaosError) +func (err *ZitadelError) As(target interface{}) bool { + _, ok := target.(**ZitadelError) if !ok { return false } diff --git a/internal/errors/caos_error_test.go b/internal/zerrors/zerror_test.go similarity index 62% rename from internal/errors/caos_error_test.go rename to internal/zerrors/zerror_test.go index 4ce9fc7b3..dcd0d8bcf 100644 --- a/internal/errors/caos_error_test.go +++ b/internal/zerrors/zerror_test.go @@ -1,19 +1,18 @@ -package errors_test +package zerrors_test import ( "testing" "github.com/stretchr/testify/assert" - - caos_errs "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/zerrors" ) func TestErrorMethod(t *testing.T) { - err := caos_errs.ThrowError(nil, "id", "msg") + err := zerrors.ThrowError(nil, "id", "msg") expected := "ID=id Message=msg" assert.Equal(t, expected, err.Error()) - err = caos_errs.ThrowError(err, "subID", "subMsg") + err = zerrors.ThrowError(err, "subID", "subMsg") subExptected := "ID=subID Message=subMsg Parent=(ID=id Message=msg)" assert.Equal(t, subExptected, err.Error()) }