From 25ef3da9d56770706bb4b7eb15655cd2f175f75a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Wed, 3 Apr 2024 13:43:43 +0300 Subject: [PATCH] refactor(fmt): run gci on complete project (#7557) chore(fmt): run gci on complete project Fix global import formatting in go code by running the `gci` command. This allows us to just use the command directly, instead of fixing the import order manually for the linter, on each PR. Co-authored-by: Elio Bischof --- cmd/initialise/init_test.go | 1 + cmd/start/flags.go | 1 - internal/actions/http_module_config.go | 1 + internal/api/grpc/admin/iam_member_integration_test.go | 4 ++-- internal/api/grpc/admin/language.go | 1 + internal/api/grpc/admin/milestone_converter.go | 3 ++- ..._integration_allow_public_org_registrations_test.go | 4 ++-- internal/api/grpc/auth/language.go | 2 +- internal/api/grpc/auth/password.go | 3 +-- internal/api/grpc/change/changes.go | 1 - internal/api/grpc/client/middleware/tracing.go | 3 ++- internal/api/grpc/management/language.go | 1 + internal/api/grpc/management/user_converter.go | 5 ++--- internal/api/grpc/server/middleware/tracing.go | 3 ++- .../grpc/server/middleware/validation_interceptor.go | 10 +++++----- internal/api/grpc/session/v2/session.go | 3 +-- internal/api/grpc/system/instance_integration_test.go | 1 + .../limits_integration_auditlogretention_test.go | 2 +- internal/api/grpc/system/quota_converter.go | 5 +++-- internal/api/http/middleware/metrics_interceptor.go | 3 +-- internal/api/http/middleware/telemetry_interceptor.go | 3 +-- internal/api/http/origin.go | 2 +- internal/api/ui/login/mfa_init_verify_handler.go | 3 +-- internal/api/ui/login/mfa_verify_u2f_handler.go | 3 +-- internal/api/ui/login/select_user_handler.go | 3 +-- internal/command/instance_custom_login_text_model.go | 2 +- internal/command/instance_custom_message_text_model.go | 2 +- internal/command/instance_idp_config_model.go | 3 +-- internal/command/instance_idp_jwt_config_model.go | 1 - internal/command/instance_idp_oidc_config_model.go | 3 +-- internal/command/instance_policy_login_model.go | 3 +-- .../command/instance_policy_mail_template_model.go | 1 - internal/command/instance_policy_mail_template_test.go | 1 + internal/command/instance_policy_password_age_model.go | 1 - .../instance_policy_password_complexity_model.go | 1 - .../command/instance_policy_password_lockout_model.go | 1 - internal/command/org_idp_config_model.go | 3 +-- internal/command/org_idp_jwt_config_model.go | 1 - internal/command/org_idp_oidc_config_model.go | 3 +-- internal/command/org_policy_label_model.go | 1 - internal/command/org_policy_lockout_model.go | 1 - internal/command/org_policy_login_model.go | 3 +-- internal/command/org_policy_mail_template_model.go | 1 - internal/command/org_policy_password_age_model.go | 1 - .../command/org_policy_password_complexity_model.go | 1 - internal/command/preparation_test.go | 4 ++-- internal/command/project_application_api_model.go | 3 +-- internal/command/project_application_key_model.go | 3 +-- internal/command/project_application_key_test.go | 1 + internal/command/user_grant.go | 5 ++--- internal/command/user_human_access_token_model.go | 3 +-- internal/command/user_human_init_model.go | 3 +-- internal/command/user_human_password_model.go | 3 +-- internal/command/user_human_phone_model.go | 3 +-- internal/command/user_human_profile_model.go | 3 +-- internal/command/user_human_refresh_token_model.go | 3 +-- internal/command/user_machine_key_model.go | 3 +-- internal/command/user_machine_model.go | 3 +-- internal/command/user_model.go | 3 +-- internal/command/user_personal_access_token_model.go | 3 +-- internal/crypto/aes_test.go | 2 +- internal/eventstore/handler/crdb/db_mock_test.go | 1 + internal/eventstore/handler/v2/handler.go | 1 - internal/notification/channels/log/channel.go | 2 +- internal/notification/handlers/queries.go | 1 + internal/notification/handlers/user_notifier_test.go | 6 ++---- internal/notification/senders/email.go | 1 + internal/notification/senders/webhook.go | 1 + internal/notification/types/otp.go | 4 +--- internal/notification/types/templateData.go | 3 +-- internal/query/authn_key.go | 1 - internal/query/domain_policy.go | 1 - internal/query/idp.go | 1 - internal/query/idp_template.go | 1 - internal/query/lockout_policy.go | 1 - internal/query/login_policy.go | 1 - internal/query/member.go | 4 ++-- internal/query/org.go | 1 - internal/query/org_metadata.go | 1 - internal/query/password_age_policy.go | 1 - internal/query/password_complexity_policy.go | 1 - internal/query/privacy_policy.go | 1 - internal/query/project.go | 1 - internal/query/project_grant.go | 1 - internal/query/project_role.go | 1 - internal/query/projection/debug_notification.go | 3 +-- internal/query/session.go | 1 - internal/query/user_grant.go | 1 - internal/query/user_metadata.go | 1 - internal/query/user_personal_access_token.go | 1 - internal/repository/user/human_profile.go | 3 ++- internal/repository/usergrant/user_grant.go | 1 - internal/telemetry/http_handler.go | 4 ++-- internal/test/filled_checker.go | 2 +- 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 ++-- .../repository/eventsourcing/model/profile_test.go | 3 ++- internal/view/repository/db_mock_test.go | 1 + internal/view/repository/query.go | 1 - internal/view/repository/query_test.go | 1 + internal/zerrors/zerror_test.go | 1 + 103 files changed, 92 insertions(+), 139 deletions(-) diff --git a/cmd/initialise/init_test.go b/cmd/initialise/init_test.go index d549105e0..f7b2a20a7 100644 --- a/cmd/initialise/init_test.go +++ b/cmd/initialise/init_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/DATA-DOG/go-sqlmock" + "github.com/zitadel/zitadel/internal/database" db_mock "github.com/zitadel/zitadel/internal/database/mock" ) diff --git a/cmd/start/flags.go b/cmd/start/flags.go index 91d5b3c82..7e7617712 100644 --- a/cmd/start/flags.go +++ b/cmd/start/flags.go @@ -4,7 +4,6 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/cmd/key" diff --git a/internal/actions/http_module_config.go b/internal/actions/http_module_config.go index 06ee4c255..d10ad3967 100644 --- a/internal/actions/http_module_config.go +++ b/internal/actions/http_module_config.go @@ -6,6 +6,7 @@ import ( "strings" "github.com/mitchellh/mapstructure" + "github.com/zitadel/zitadel/internal/zerrors" ) diff --git a/internal/api/grpc/admin/iam_member_integration_test.go b/internal/api/grpc/admin/iam_member_integration_test.go index 12f4f321c..06a8acb91 100644 --- a/internal/api/grpc/admin/iam_member_integration_test.go +++ b/internal/api/grpc/admin/iam_member_integration_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/brianvoe/gofakeit/v6" - "google.golang.org/protobuf/types/known/timestamppb" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/types/known/timestamppb" + "github.com/zitadel/zitadel/internal/integration" admin_pb "github.com/zitadel/zitadel/pkg/grpc/admin" "github.com/zitadel/zitadel/pkg/grpc/member" diff --git a/internal/api/grpc/admin/language.go b/internal/api/grpc/admin/language.go index eecf32d4e..fd6f19f57 100644 --- a/internal/api/grpc/admin/language.go +++ b/internal/api/grpc/admin/language.go @@ -2,6 +2,7 @@ package admin import ( "context" + "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/grpc/object" "github.com/zitadel/zitadel/internal/domain" diff --git a/internal/api/grpc/admin/milestone_converter.go b/internal/api/grpc/admin/milestone_converter.go index 97ac1ae58..614cd878b 100644 --- a/internal/api/grpc/admin/milestone_converter.go +++ b/internal/api/grpc/admin/milestone_converter.go @@ -1,13 +1,14 @@ package admin import ( + "google.golang.org/protobuf/types/known/timestamppb" + "github.com/zitadel/zitadel/internal/api/grpc/object" "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" ) func listMilestonesToModel(instanceID string, req *admin_pb.ListMilestonesRequest) (*query.MilestonesSearchQueries, error) { diff --git a/internal/api/grpc/admin/restrictions_integration_allow_public_org_registrations_test.go b/internal/api/grpc/admin/restrictions_integration_allow_public_org_registrations_test.go index 92707df9d..30250e772 100644 --- a/internal/api/grpc/admin/restrictions_integration_allow_public_org_registrations_test.go +++ b/internal/api/grpc/admin/restrictions_integration_allow_public_org_registrations_test.go @@ -5,8 +5,6 @@ package admin_test import ( "bytes" "context" - "github.com/muhlemmer/gu" - "github.com/stretchr/testify/assert" "io" "net/http" "net/http/cookiejar" @@ -14,6 +12,8 @@ import ( "testing" "time" + "github.com/muhlemmer/gu" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/zitadel/zitadel/pkg/grpc/admin" diff --git a/internal/api/grpc/auth/language.go b/internal/api/grpc/auth/language.go index 9f1d65bbb..cf2d1421d 100644 --- a/internal/api/grpc/auth/language.go +++ b/internal/api/grpc/auth/language.go @@ -2,9 +2,9 @@ package auth import ( "context" + "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/i18n" - auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) diff --git a/internal/api/grpc/auth/password.go b/internal/api/grpc/auth/password.go index 0cbc8d4f6..4629fa31c 100644 --- a/internal/api/grpc/auth/password.go +++ b/internal/api/grpc/auth/password.go @@ -3,9 +3,8 @@ package auth import ( "context" - "github.com/zitadel/zitadel/internal/api/grpc/object" - "github.com/zitadel/zitadel/internal/api/authz" + "github.com/zitadel/zitadel/internal/api/grpc/object" auth_pb "github.com/zitadel/zitadel/pkg/grpc/auth" ) diff --git a/internal/api/grpc/change/changes.go b/internal/api/grpc/change/changes.go index 2205d8954..52c5afb3b 100644 --- a/internal/api/grpc/change/changes.go +++ b/internal/api/grpc/change/changes.go @@ -4,7 +4,6 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/query" change_pb "github.com/zitadel/zitadel/pkg/grpc/change" "github.com/zitadel/zitadel/pkg/grpc/message" diff --git a/internal/api/grpc/client/middleware/tracing.go b/internal/api/grpc/client/middleware/tracing.go index 0ac5a2b2b..32a144c2f 100644 --- a/internal/api/grpc/client/middleware/tracing.go +++ b/internal/api/grpc/client/middleware/tracing.go @@ -4,9 +4,10 @@ import ( "context" "strings" - grpc_utils "github.com/zitadel/zitadel/internal/api/grpc" grpc_trace "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" + + grpc_utils "github.com/zitadel/zitadel/internal/api/grpc" ) type GRPCMethod string diff --git a/internal/api/grpc/management/language.go b/internal/api/grpc/management/language.go index fbcfdc9fb..e0526a018 100644 --- a/internal/api/grpc/management/language.go +++ b/internal/api/grpc/management/language.go @@ -2,6 +2,7 @@ package management import ( "context" + "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/i18n" mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" diff --git a/internal/api/grpc/management/user_converter.go b/internal/api/grpc/management/user_converter.go index a2de7a601..32496b431 100644 --- a/internal/api/grpc/management/user_converter.go +++ b/internal/api/grpc/management/user_converter.go @@ -7,18 +7,17 @@ import ( "github.com/zitadel/logging" "golang.org/x/text/language" - "github.com/zitadel/zitadel/internal/command" - "github.com/zitadel/zitadel/pkg/grpc/user" - "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/grpc/authn" "github.com/zitadel/zitadel/internal/api/grpc/metadata" "github.com/zitadel/zitadel/internal/api/grpc/object" user_grpc "github.com/zitadel/zitadel/internal/api/grpc/user" + "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/eventstore/v1/models" "github.com/zitadel/zitadel/internal/query" mgmt_pb "github.com/zitadel/zitadel/pkg/grpc/management" + "github.com/zitadel/zitadel/pkg/grpc/user" ) func ListUsersRequestToModel(req *mgmt_pb.ListUsersRequest) (*query.UserSearchQueries, error) { diff --git a/internal/api/grpc/server/middleware/tracing.go b/internal/api/grpc/server/middleware/tracing.go index cf369bc46..748257551 100644 --- a/internal/api/grpc/server/middleware/tracing.go +++ b/internal/api/grpc/server/middleware/tracing.go @@ -4,9 +4,10 @@ import ( "context" "strings" - grpc_utils "github.com/zitadel/zitadel/internal/api/grpc" grpc_trace "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" + + grpc_utils "github.com/zitadel/zitadel/internal/api/grpc" ) type GRPCMethod string diff --git a/internal/api/grpc/server/middleware/validation_interceptor.go b/internal/api/grpc/server/middleware/validation_interceptor.go index e7f48bcb6..dee367256 100644 --- a/internal/api/grpc/server/middleware/validation_interceptor.go +++ b/internal/api/grpc/server/middleware/validation_interceptor.go @@ -3,12 +3,12 @@ package middleware import ( "context" - "google.golang.org/grpc" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" //import to make sure go.mod does not lose it //because dependency is only needed for generated code _ "github.com/envoyproxy/protoc-gen-validate/validate" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) func ValidationHandler() grpc.UnaryServerInterceptor { @@ -17,8 +17,8 @@ func ValidationHandler() grpc.UnaryServerInterceptor { } } -//validator interface needed for github.com/envoyproxy/protoc-gen-validate -//(it does not expose an interface itself) +// validator interface needed for github.com/envoyproxy/protoc-gen-validate +// (it does not expose an interface itself) type validator interface { Validate() error } diff --git a/internal/api/grpc/session/v2/session.go b/internal/api/grpc/session/v2/session.go index 29c897948..df07602e8 100644 --- a/internal/api/grpc/session/v2/session.go +++ b/internal/api/grpc/session/v2/session.go @@ -6,11 +6,10 @@ import ( "net/http" "time" + "github.com/muhlemmer/gu" "google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/muhlemmer/gu" - "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/grpc/object/v2" "github.com/zitadel/zitadel/internal/command" diff --git a/internal/api/grpc/system/instance_integration_test.go b/internal/api/grpc/system/instance_integration_test.go index a04118f59..b4a6cea22 100644 --- a/internal/api/grpc/system/instance_integration_test.go +++ b/internal/api/grpc/system/instance_integration_test.go @@ -7,6 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/zitadel/zitadel/pkg/grpc/instance" "github.com/zitadel/zitadel/pkg/grpc/object" system_pb "github.com/zitadel/zitadel/pkg/grpc/system" diff --git a/internal/api/grpc/system/limits_integration_auditlogretention_test.go b/internal/api/grpc/system/limits_integration_auditlogretention_test.go index 96ceafcdc..55ac76e99 100644 --- a/internal/api/grpc/system/limits_integration_auditlogretention_test.go +++ b/internal/api/grpc/system/limits_integration_auditlogretention_test.go @@ -4,7 +4,6 @@ package system_test import ( "context" - "google.golang.org/protobuf/types/known/timestamppb" "math/rand" "sync" "testing" @@ -13,6 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/durationpb" + "google.golang.org/protobuf/types/known/timestamppb" "github.com/zitadel/zitadel/pkg/grpc/admin" "github.com/zitadel/zitadel/pkg/grpc/auth" diff --git a/internal/api/grpc/system/quota_converter.go b/internal/api/grpc/system/quota_converter.go index 1945ff095..73d231b36 100644 --- a/internal/api/grpc/system/quota_converter.go +++ b/internal/api/grpc/system/quota_converter.go @@ -1,10 +1,11 @@ package system import ( - "github.com/zitadel/zitadel/internal/command" - "github.com/zitadel/zitadel/pkg/grpc/quota" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" + + "github.com/zitadel/zitadel/internal/command" + "github.com/zitadel/zitadel/pkg/grpc/quota" ) type setQuotaRequest interface { diff --git a/internal/api/http/middleware/metrics_interceptor.go b/internal/api/http/middleware/metrics_interceptor.go index 78d953ba3..32a84f4b1 100644 --- a/internal/api/http/middleware/metrics_interceptor.go +++ b/internal/api/http/middleware/metrics_interceptor.go @@ -3,9 +3,8 @@ package middleware import ( "net/http" - "github.com/zitadel/zitadel/internal/telemetry/metrics" - http_utils "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/telemetry/metrics" ) func DefaultMetricsHandler(handler http.Handler) http.Handler { diff --git a/internal/api/http/middleware/telemetry_interceptor.go b/internal/api/http/middleware/telemetry_interceptor.go index ab9fccca7..3fa66e71f 100644 --- a/internal/api/http/middleware/telemetry_interceptor.go +++ b/internal/api/http/middleware/telemetry_interceptor.go @@ -3,9 +3,8 @@ package middleware import ( "net/http" - "github.com/zitadel/zitadel/internal/telemetry" - http_utils "github.com/zitadel/zitadel/internal/api/http" + "github.com/zitadel/zitadel/internal/telemetry" ) func DefaultTelemetryHandler(handler http.Handler) http.Handler { diff --git a/internal/api/http/origin.go b/internal/api/http/origin.go index f8ff8a7c7..e403acd7b 100644 --- a/internal/api/http/origin.go +++ b/internal/api/http/origin.go @@ -22,7 +22,7 @@ func IsOriginAllowed(allowList []string, origin string) bool { return false } -//IsOrigin checks if provided string is an origin (scheme://hostname[:port]) without path, query or fragment +// IsOrigin checks if provided string is an origin (scheme://hostname[:port]) without path, query or fragment func IsOrigin(rawOrigin string) bool { parsedUrl, err := url.Parse(rawOrigin) if err != nil { diff --git a/internal/api/ui/login/mfa_init_verify_handler.go b/internal/api/ui/login/mfa_init_verify_handler.go index a5e7326a6..d8e930b19 100644 --- a/internal/api/ui/login/mfa_init_verify_handler.go +++ b/internal/api/ui/login/mfa_init_verify_handler.go @@ -5,12 +5,11 @@ import ( "html/template" "net/http" - "github.com/zitadel/zitadel/internal/domain" - svg "github.com/ajstarks/svgo" "github.com/boombuler/barcode/qr" http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/qrcode" ) diff --git a/internal/api/ui/login/mfa_verify_u2f_handler.go b/internal/api/ui/login/mfa_verify_u2f_handler.go index c6cbe359e..3afa41682 100644 --- a/internal/api/ui/login/mfa_verify_u2f_handler.go +++ b/internal/api/ui/login/mfa_verify_u2f_handler.go @@ -4,9 +4,8 @@ import ( "encoding/base64" "net/http" - "github.com/zitadel/zitadel/internal/domain" - http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/api/ui/login/select_user_handler.go b/internal/api/ui/login/select_user_handler.go index 2f9292d7a..3febbaed7 100644 --- a/internal/api/ui/login/select_user_handler.go +++ b/internal/api/ui/login/select_user_handler.go @@ -3,9 +3,8 @@ package login import ( "net/http" - "github.com/zitadel/zitadel/internal/domain" - http_mw "github.com/zitadel/zitadel/internal/api/http/middleware" + "github.com/zitadel/zitadel/internal/domain" ) const ( diff --git a/internal/command/instance_custom_login_text_model.go b/internal/command/instance_custom_login_text_model.go index 7b73e1da7..5cc6b8dc6 100644 --- a/internal/command/instance_custom_login_text_model.go +++ b/internal/command/instance_custom_login_text_model.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/zitadel/zitadel/internal/api/authz" "golang.org/x/text/language" + "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" ) diff --git a/internal/command/instance_custom_message_text_model.go b/internal/command/instance_custom_message_text_model.go index 4d222c0d7..675b57f6a 100644 --- a/internal/command/instance_custom_message_text_model.go +++ b/internal/command/instance_custom_message_text_model.go @@ -3,9 +3,9 @@ package command import ( "context" - "github.com/zitadel/zitadel/internal/api/authz" "golang.org/x/text/language" + "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" ) diff --git a/internal/command/instance_idp_config_model.go b/internal/command/instance_idp_config_model.go index d41b68d98..9439efc33 100644 --- a/internal/command/instance_idp_config_model.go +++ b/internal/command/instance_idp_config_model.go @@ -4,9 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/api/authz" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/instance" ) diff --git a/internal/command/instance_idp_jwt_config_model.go b/internal/command/instance_idp_jwt_config_model.go index 8b557800f..122f81829 100644 --- a/internal/command/instance_idp_jwt_config_model.go +++ b/internal/command/instance_idp_jwt_config_model.go @@ -5,7 +5,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/instance" ) diff --git a/internal/command/instance_idp_oidc_config_model.go b/internal/command/instance_idp_oidc_config_model.go index 2bfec8832..2eca9b7a5 100644 --- a/internal/command/instance_idp_oidc_config_model.go +++ b/internal/command/instance_idp_oidc_config_model.go @@ -5,10 +5,9 @@ import ( "reflect" "github.com/zitadel/zitadel/internal/api/authz" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/instance" ) diff --git a/internal/command/instance_policy_login_model.go b/internal/command/instance_policy_login_model.go index 8d854d2b0..a94240f05 100644 --- a/internal/command/instance_policy_login_model.go +++ b/internal/command/instance_policy_login_model.go @@ -5,9 +5,8 @@ import ( "time" "github.com/zitadel/zitadel/internal/api/authz" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/instance_policy_mail_template_model.go b/internal/command/instance_policy_mail_template_model.go index 489d6ebd2..ce7a902dd 100644 --- a/internal/command/instance_policy_mail_template_model.go +++ b/internal/command/instance_policy_mail_template_model.go @@ -6,7 +6,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/instance_policy_mail_template_test.go b/internal/command/instance_policy_mail_template_test.go index 4a5d9cf9a..e7003fd38 100644 --- a/internal/command/instance_policy_mail_template_test.go +++ b/internal/command/instance_policy_mail_template_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/eventstore" diff --git a/internal/command/instance_policy_password_age_model.go b/internal/command/instance_policy_password_age_model.go index ca8801612..77a2ed129 100644 --- a/internal/command/instance_policy_password_age_model.go +++ b/internal/command/instance_policy_password_age_model.go @@ -5,7 +5,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/instance_policy_password_complexity_model.go b/internal/command/instance_policy_password_complexity_model.go index c4d895e79..56e2f6480 100644 --- a/internal/command/instance_policy_password_complexity_model.go +++ b/internal/command/instance_policy_password_complexity_model.go @@ -5,7 +5,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/instance_policy_password_lockout_model.go b/internal/command/instance_policy_password_lockout_model.go index 328fa29af..dcfa0b62c 100644 --- a/internal/command/instance_policy_password_lockout_model.go +++ b/internal/command/instance_policy_password_lockout_model.go @@ -5,7 +5,6 @@ import ( "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/instance" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/org_idp_config_model.go b/internal/command/org_idp_config_model.go index 41b395071..e4d5e56ca 100644 --- a/internal/command/org_idp_config_model.go +++ b/internal/command/org_idp_config_model.go @@ -3,9 +3,8 @@ package command import ( "context" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/org" ) diff --git a/internal/command/org_idp_jwt_config_model.go b/internal/command/org_idp_jwt_config_model.go index 18ef16637..b5144e4a8 100644 --- a/internal/command/org_idp_jwt_config_model.go +++ b/internal/command/org_idp_jwt_config_model.go @@ -4,7 +4,6 @@ import ( "context" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/org" ) diff --git a/internal/command/org_idp_oidc_config_model.go b/internal/command/org_idp_oidc_config_model.go index 6d19b39f2..972e0fabf 100644 --- a/internal/command/org_idp_oidc_config_model.go +++ b/internal/command/org_idp_oidc_config_model.go @@ -4,10 +4,9 @@ import ( "context" "reflect" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/idpconfig" "github.com/zitadel/zitadel/internal/repository/org" ) diff --git a/internal/command/org_policy_label_model.go b/internal/command/org_policy_label_model.go index d8e510f42..2806c14e0 100644 --- a/internal/command/org_policy_label_model.go +++ b/internal/command/org_policy_label_model.go @@ -5,7 +5,6 @@ import ( "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/org_policy_lockout_model.go b/internal/command/org_policy_lockout_model.go index 1ce78055f..abf893fec 100644 --- a/internal/command/org_policy_lockout_model.go +++ b/internal/command/org_policy_lockout_model.go @@ -4,7 +4,6 @@ import ( "context" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/org_policy_login_model.go b/internal/command/org_policy_login_model.go index 6a7c24a9b..1ab9f0cd4 100644 --- a/internal/command/org_policy_login_model.go +++ b/internal/command/org_policy_login_model.go @@ -4,9 +4,8 @@ import ( "context" "time" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/org_policy_mail_template_model.go b/internal/command/org_policy_mail_template_model.go index 3586362a6..502aa8dc4 100644 --- a/internal/command/org_policy_mail_template_model.go +++ b/internal/command/org_policy_mail_template_model.go @@ -5,7 +5,6 @@ import ( "reflect" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/org_policy_password_age_model.go b/internal/command/org_policy_password_age_model.go index 8d62a5d68..88ba44a5f 100644 --- a/internal/command/org_policy_password_age_model.go +++ b/internal/command/org_policy_password_age_model.go @@ -4,7 +4,6 @@ import ( "context" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/org_policy_password_complexity_model.go b/internal/command/org_policy_password_complexity_model.go index 252acf32b..6491e4d2e 100644 --- a/internal/command/org_policy_password_complexity_model.go +++ b/internal/command/org_policy_password_complexity_model.go @@ -4,7 +4,6 @@ import ( "context" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/policy" ) diff --git a/internal/command/preparation_test.go b/internal/command/preparation_test.go index ddfc7b5d8..766807856 100644 --- a/internal/command/preparation_test.go +++ b/internal/command/preparation_test.go @@ -11,7 +11,7 @@ import ( "github.com/zitadel/zitadel/internal/eventstore" ) -//Want represents the expected values for each step +// Want represents the expected values for each step type Want struct { ValidationErr error CreateErr error @@ -22,7 +22,7 @@ type CommandVerifier interface { Validate(eventstore.Command) bool } -//AssertValidation checks if the validation works as inteded +// AssertValidation checks if the validation works as inteded func AssertValidation(t *testing.T, ctx context.Context, validation preparation.Validation, filter preparation.FilterToQueryReducer, want Want) { t.Helper() diff --git a/internal/command/project_application_api_model.go b/internal/command/project_application_api_model.go index f7c1ef391..bb9534185 100644 --- a/internal/command/project_application_api_model.go +++ b/internal/command/project_application_api_model.go @@ -3,10 +3,9 @@ package command import ( "context" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" ) diff --git a/internal/command/project_application_key_model.go b/internal/command/project_application_key_model.go index 75319e143..057af9ee9 100644 --- a/internal/command/project_application_key_model.go +++ b/internal/command/project_application_key_model.go @@ -3,9 +3,8 @@ package command import ( "time" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/project" ) diff --git a/internal/command/project_application_key_test.go b/internal/command/project_application_key_test.go index 907b352a7..ceeae93f7 100644 --- a/internal/command/project_application_key_test.go +++ b/internal/command/project_application_key_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/eventstore" diff --git a/internal/command/user_grant.go b/internal/command/user_grant.go index bc22e1af1..f2a8a3ddb 100644 --- a/internal/command/user_grant.go +++ b/internal/command/user_grant.go @@ -4,12 +4,11 @@ import ( "context" "reflect" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/zerrors" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/usergrant" "github.com/zitadel/zitadel/internal/telemetry/tracing" + "github.com/zitadel/zitadel/internal/zerrors" ) func (c *Commands) AddUserGrant(ctx context.Context, usergrant *domain.UserGrant, resourceOwner string) (_ *domain.UserGrant, err error) { diff --git a/internal/command/user_human_access_token_model.go b/internal/command/user_human_access_token_model.go index 5256e81c0..9a4c6cd2c 100644 --- a/internal/command/user_human_access_token_model.go +++ b/internal/command/user_human_access_token_model.go @@ -3,9 +3,8 @@ package command import ( "time" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" ) diff --git a/internal/command/user_human_init_model.go b/internal/command/user_human_init_model.go index 3ee4801bf..c1276ec7c 100644 --- a/internal/command/user_human_init_model.go +++ b/internal/command/user_human_init_model.go @@ -4,10 +4,9 @@ import ( "context" "time" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" ) diff --git a/internal/command/user_human_password_model.go b/internal/command/user_human_password_model.go index ec4d11da2..535907b3d 100644 --- a/internal/command/user_human_password_model.go +++ b/internal/command/user_human_password_model.go @@ -3,10 +3,9 @@ package command import ( "time" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" ) diff --git a/internal/command/user_human_phone_model.go b/internal/command/user_human_phone_model.go index 0bbe16497..ddac65f4b 100644 --- a/internal/command/user_human_phone_model.go +++ b/internal/command/user_human_phone_model.go @@ -4,10 +4,9 @@ import ( "context" "time" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" ) diff --git a/internal/command/user_human_profile_model.go b/internal/command/user_human_profile_model.go index de462dfdf..608ac13ca 100644 --- a/internal/command/user_human_profile_model.go +++ b/internal/command/user_human_profile_model.go @@ -3,11 +3,10 @@ package command import ( "context" - "github.com/zitadel/zitadel/internal/eventstore" - "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" ) diff --git a/internal/command/user_human_refresh_token_model.go b/internal/command/user_human_refresh_token_model.go index e731ad2f6..45ba54e73 100644 --- a/internal/command/user_human_refresh_token_model.go +++ b/internal/command/user_human_refresh_token_model.go @@ -3,9 +3,8 @@ package command import ( "time" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" ) diff --git a/internal/command/user_machine_key_model.go b/internal/command/user_machine_key_model.go index 9220a7f87..d9ba62865 100644 --- a/internal/command/user_machine_key_model.go +++ b/internal/command/user_machine_key_model.go @@ -3,9 +3,8 @@ package command import ( "time" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" ) diff --git a/internal/command/user_machine_model.go b/internal/command/user_machine_model.go index 7fea305a5..a5569faaf 100644 --- a/internal/command/user_machine_model.go +++ b/internal/command/user_machine_model.go @@ -4,9 +4,8 @@ import ( "context" "github.com/zitadel/zitadel/internal/crypto" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" ) diff --git a/internal/command/user_model.go b/internal/command/user_model.go index 7edfacfeb..10c6dd2cf 100644 --- a/internal/command/user_model.go +++ b/internal/command/user_model.go @@ -1,9 +1,8 @@ package command import ( - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" ) diff --git a/internal/command/user_personal_access_token_model.go b/internal/command/user_personal_access_token_model.go index 8053965a4..7f19b98e4 100644 --- a/internal/command/user_personal_access_token_model.go +++ b/internal/command/user_personal_access_token_model.go @@ -3,9 +3,8 @@ package command import ( "time" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/domain" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/repository/user" ) diff --git a/internal/crypto/aes_test.go b/internal/crypto/aes_test.go index 87af88d0b..5731f320e 100644 --- a/internal/crypto/aes_test.go +++ b/internal/crypto/aes_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" ) -//TODO: refactor test style +// TODO: refactor test style func TestDecrypt_OK(t *testing.T) { encryptedpw, err := EncryptAESString("ThisIsMySecretPw", "passphrasewhichneedstobe32bytes!") assert.NoError(t, err) diff --git a/internal/eventstore/handler/crdb/db_mock_test.go b/internal/eventstore/handler/crdb/db_mock_test.go index aab63a414..67f4e464e 100644 --- a/internal/eventstore/handler/crdb/db_mock_test.go +++ b/internal/eventstore/handler/crdb/db_mock_test.go @@ -5,6 +5,7 @@ import ( "time" "github.com/DATA-DOG/go-sqlmock" + "github.com/zitadel/zitadel/internal/database" ) diff --git a/internal/eventstore/handler/v2/handler.go b/internal/eventstore/handler/v2/handler.go index d9a78262f..401d80a74 100644 --- a/internal/eventstore/handler/v2/handler.go +++ b/internal/eventstore/handler/v2/handler.go @@ -11,7 +11,6 @@ import ( "time" "github.com/jackc/pgx/v5/pgconn" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/notification/channels/log/channel.go b/internal/notification/channels/log/channel.go index a435ca1b4..ecdb59c64 100644 --- a/internal/notification/channels/log/channel.go +++ b/internal/notification/channels/log/channel.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/k3a/html2text" - "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/notification/channels" ) diff --git a/internal/notification/handlers/queries.go b/internal/notification/handlers/queries.go index afaeb3419..15cbf246f 100644 --- a/internal/notification/handlers/queries.go +++ b/internal/notification/handlers/queries.go @@ -2,6 +2,7 @@ package handlers import ( "context" + "golang.org/x/text/language" "github.com/zitadel/zitadel/internal/crypto" diff --git a/internal/notification/handlers/user_notifier_test.go b/internal/notification/handlers/user_notifier_test.go index 86b843fc5..55751beb1 100644 --- a/internal/notification/handlers/user_notifier_test.go +++ b/internal/notification/handlers/user_notifier_test.go @@ -7,10 +7,6 @@ import ( "testing" "time" - "github.com/zitadel/zitadel/internal/repository/session" - - "github.com/zitadel/zitadel/internal/notification/messages" - "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" "golang.org/x/text/language" @@ -24,9 +20,11 @@ import ( "github.com/zitadel/zitadel/internal/notification/channels/twilio" "github.com/zitadel/zitadel/internal/notification/channels/webhook" "github.com/zitadel/zitadel/internal/notification/handlers/mock" + "github.com/zitadel/zitadel/internal/notification/messages" "github.com/zitadel/zitadel/internal/notification/senders" "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" ) diff --git a/internal/notification/senders/email.go b/internal/notification/senders/email.go index 5123798f4..ea93c0911 100644 --- a/internal/notification/senders/email.go +++ b/internal/notification/senders/email.go @@ -4,6 +4,7 @@ import ( "context" "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/notification/channels" "github.com/zitadel/zitadel/internal/notification/channels/fs" diff --git a/internal/notification/senders/webhook.go b/internal/notification/senders/webhook.go index 050168432..d677f9a80 100644 --- a/internal/notification/senders/webhook.go +++ b/internal/notification/senders/webhook.go @@ -4,6 +4,7 @@ import ( "context" "github.com/zitadel/logging" + "github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/notification/channels" "github.com/zitadel/zitadel/internal/notification/channels/fs" diff --git a/internal/notification/types/otp.go b/internal/notification/types/otp.go index 7919984f7..91befa23f 100644 --- a/internal/notification/types/otp.go +++ b/internal/notification/types/otp.go @@ -4,10 +4,8 @@ import ( "context" "time" - http_utils "github.com/zitadel/zitadel/internal/api/http" - "github.com/zitadel/zitadel/internal/api/authz" - + http_utils "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/domain" ) diff --git a/internal/notification/types/templateData.go b/internal/notification/types/templateData.go index d020d977c..23b7deee7 100644 --- a/internal/notification/types/templateData.go +++ b/internal/notification/types/templateData.go @@ -5,9 +5,8 @@ import ( "fmt" "strings" - http_util "github.com/zitadel/zitadel/internal/api/http" - "github.com/zitadel/zitadel/internal/api/assets" + http_util "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/i18n" "github.com/zitadel/zitadel/internal/notification/templates" "github.com/zitadel/zitadel/internal/query" diff --git a/internal/query/authn_key.go b/internal/query/authn_key.go index 584270e2b..99ccca0d9 100644 --- a/internal/query/authn_key.go +++ b/internal/query/authn_key.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/domain_policy.go b/internal/query/domain_policy.go index 922efb386..d971723bc 100644 --- a/internal/query/domain_policy.go +++ b/internal/query/domain_policy.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/idp.go b/internal/query/idp.go index 06d96a76a..268739733 100644 --- a/internal/query/idp.go +++ b/internal/query/idp.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/idp_template.go b/internal/query/idp_template.go index 1cfdc14d5..ef14aeeff 100644 --- a/internal/query/idp_template.go +++ b/internal/query/idp_template.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/lockout_policy.go b/internal/query/lockout_policy.go index e84750cc6..7aa650b19 100644 --- a/internal/query/lockout_policy.go +++ b/internal/query/lockout_policy.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/login_policy.go b/internal/query/login_policy.go index 2eb3ecf39..5ab54cfa5 100644 --- a/internal/query/login_policy.go +++ b/internal/query/login_policy.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/member.go b/internal/query/member.go index c343ea65a..2c4b4db5f 100644 --- a/internal/query/member.go +++ b/internal/query/member.go @@ -3,10 +3,10 @@ package query import ( "time" + sq "github.com/Masterminds/squirrel" + "github.com/zitadel/zitadel/internal/database" "github.com/zitadel/zitadel/internal/domain" - - sq "github.com/Masterminds/squirrel" ) type MembersQuery struct { diff --git a/internal/query/org.go b/internal/query/org.go index 65be2ff1a..eaeaf6eb2 100644 --- a/internal/query/org.go +++ b/internal/query/org.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/org_metadata.go b/internal/query/org_metadata.go index 15007e0e5..1ce95e288 100644 --- a/internal/query/org_metadata.go +++ b/internal/query/org_metadata.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/password_age_policy.go b/internal/query/password_age_policy.go index a74980686..199b75795 100644 --- a/internal/query/password_age_policy.go +++ b/internal/query/password_age_policy.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/password_complexity_policy.go b/internal/query/password_complexity_policy.go index d9aba36c5..76015af44 100644 --- a/internal/query/password_complexity_policy.go +++ b/internal/query/password_complexity_policy.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/privacy_policy.go b/internal/query/privacy_policy.go index 2705f2b75..5540c34f5 100644 --- a/internal/query/privacy_policy.go +++ b/internal/query/privacy_policy.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/project.go b/internal/query/project.go index 756039e9c..a92448f25 100644 --- a/internal/query/project.go +++ b/internal/query/project.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/project_grant.go b/internal/query/project_grant.go index ac2d8696e..1bc68e984 100644 --- a/internal/query/project_grant.go +++ b/internal/query/project_grant.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/project_role.go b/internal/query/project_role.go index bca1957ef..76e113da6 100644 --- a/internal/query/project_role.go +++ b/internal/query/project_role.go @@ -6,7 +6,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/projection/debug_notification.go b/internal/query/projection/debug_notification.go index eca16dce0..faf50d197 100644 --- a/internal/query/projection/debug_notification.go +++ b/internal/query/projection/debug_notification.go @@ -4,12 +4,11 @@ import ( "context" "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/repository/settings" - "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/settings" "github.com/zitadel/zitadel/internal/zerrors" ) diff --git a/internal/query/session.go b/internal/query/session.go index 5aa7c177b..54afbde06 100644 --- a/internal/query/session.go +++ b/internal/query/session.go @@ -9,7 +9,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/user_grant.go b/internal/query/user_grant.go index a6d92c3ea..71031b513 100644 --- a/internal/query/user_grant.go +++ b/internal/query/user_grant.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/user_metadata.go b/internal/query/user_metadata.go index d61d17b6b..3aadefd01 100644 --- a/internal/query/user_metadata.go +++ b/internal/query/user_metadata.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/query/user_personal_access_token.go b/internal/query/user_personal_access_token.go index 47f92ffc8..dadd635b6 100644 --- a/internal/query/user_personal_access_token.go +++ b/internal/query/user_personal_access_token.go @@ -7,7 +7,6 @@ import ( "time" sq "github.com/Masterminds/squirrel" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/api/authz" diff --git a/internal/repository/user/human_profile.go b/internal/repository/user/human_profile.go index 1c73b2dce..266677848 100644 --- a/internal/repository/user/human_profile.go +++ b/internal/repository/user/human_profile.go @@ -3,10 +3,11 @@ package user import ( "context" + "golang.org/x/text/language" + "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/zerrors" - "golang.org/x/text/language" ) const ( diff --git a/internal/repository/usergrant/user_grant.go b/internal/repository/usergrant/user_grant.go index bd0908f60..4f4b27572 100644 --- a/internal/repository/usergrant/user_grant.go +++ b/internal/repository/usergrant/user_grant.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/zerrors" ) diff --git a/internal/telemetry/http_handler.go b/internal/telemetry/http_handler.go index adb8bb076..32e614b34 100644 --- a/internal/telemetry/http_handler.go +++ b/internal/telemetry/http_handler.go @@ -4,9 +4,9 @@ import ( "net/http" "strings" - "github.com/zitadel/zitadel/internal/telemetry/metrics" - "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" + + "github.com/zitadel/zitadel/internal/telemetry/metrics" ) func shouldNotIgnore(endpoints ...string) func(r *http.Request) bool { diff --git a/internal/test/filled_checker.go b/internal/test/filled_checker.go index f889f3635..fb5902bb6 100644 --- a/internal/test/filled_checker.go +++ b/internal/test/filled_checker.go @@ -6,7 +6,7 @@ import ( "strings" ) -//testingT is a wrapper for testing.T +// testingT is a wrapper for testing.T // // this wrapper is needed for internal testing type testingT interface { diff --git a/internal/user/model/external_idp_view.go b/internal/user/model/external_idp_view.go index 6dc8f53dc..4d2abed6f 100644 --- a/internal/user/model/external_idp_view.go +++ b/internal/user/model/external_idp_view.go @@ -1,10 +1,10 @@ package model import ( + "time" + "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/zerrors" - - "time" ) type ExternalIDPView struct { diff --git a/internal/user/model/refresh_token_view.go b/internal/user/model/refresh_token_view.go index 5f5f5c899..4050fce8b 100644 --- a/internal/user/model/refresh_token_view.go +++ b/internal/user/model/refresh_token_view.go @@ -1,10 +1,10 @@ package model import ( + "time" + "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/zerrors" - - "time" ) type RefreshTokenView struct { diff --git a/internal/user/model/token_view.go b/internal/user/model/token_view.go index 9ee00c87e..7e182e31b 100644 --- a/internal/user/model/token_view.go +++ b/internal/user/model/token_view.go @@ -1,10 +1,10 @@ package model import ( + "time" + "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/zerrors" - - "time" ) type TokenView struct { diff --git a/internal/user/model/user_membership_view.go b/internal/user/model/user_membership_view.go index 3c68ef286..b6d0d1862 100644 --- a/internal/user/model/user_membership_view.go +++ b/internal/user/model/user_membership_view.go @@ -1,10 +1,10 @@ package model import ( + "time" + "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/zerrors" - - "time" ) type UserMembershipView struct { diff --git a/internal/user/repository/eventsourcing/model/profile_test.go b/internal/user/repository/eventsourcing/model/profile_test.go index 958659482..b9977e83b 100644 --- a/internal/user/repository/eventsourcing/model/profile_test.go +++ b/internal/user/repository/eventsourcing/model/profile_test.go @@ -3,8 +3,9 @@ package model import ( "testing" - user_model "github.com/zitadel/zitadel/internal/user/model" "golang.org/x/text/language" + + user_model "github.com/zitadel/zitadel/internal/user/model" ) func TestProfileChanges(t *testing.T) { diff --git a/internal/view/repository/db_mock_test.go b/internal/view/repository/db_mock_test.go index 10e0d002f..b78d68d4d 100644 --- a/internal/view/repository/db_mock_test.go +++ b/internal/view/repository/db_mock_test.go @@ -8,6 +8,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/jinzhu/gorm" + db_mock "github.com/zitadel/zitadel/internal/database/mock" "github.com/zitadel/zitadel/internal/domain" ) diff --git a/internal/view/repository/query.go b/internal/view/repository/query.go index b3be1f016..fc2b6d8ac 100644 --- a/internal/view/repository/query.go +++ b/internal/view/repository/query.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/jinzhu/gorm" - "github.com/zitadel/logging" "github.com/zitadel/zitadel/internal/database" diff --git a/internal/view/repository/query_test.go b/internal/view/repository/query_test.go index 49cd961b1..10ec8c942 100644 --- a/internal/view/repository/query_test.go +++ b/internal/view/repository/query_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/jinzhu/gorm" + "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/zerrors" ) diff --git a/internal/zerrors/zerror_test.go b/internal/zerrors/zerror_test.go index dcd0d8bcf..3a11a8e78 100644 --- a/internal/zerrors/zerror_test.go +++ b/internal/zerrors/zerror_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/zitadel/zitadel/internal/zerrors" )