diff --git a/internal/api/grpc/action/v2/integration_test/execution_target_test.go b/internal/api/grpc/action/v2/integration_test/execution_target_test.go index 36636563bfb..48266c8382a 100644 --- a/internal/api/grpc/action/v2/integration_test/execution_target_test.go +++ b/internal/api/grpc/action/v2/integration_test/execution_target_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/crewjam/saml" "github.com/crewjam/saml/samlsp" "github.com/stretchr/testify/assert" @@ -71,7 +70,7 @@ func TestServer_ExecutionTarget(t *testing.T) { userID := instance.Users.Get(integration.UserTypeIAMOwner).ID // create target for target changes - targetCreatedName := gofakeit.Name() + targetCreatedName := integration.TargetName() targetCreatedURL := "https://nonexistent" targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false) @@ -212,7 +211,7 @@ func TestServer_ExecutionTarget(t *testing.T) { userID := instance.Users.Get(integration.UserTypeIAMOwner).ID // create target for target changes - targetCreatedName := gofakeit.Name() + targetCreatedName := integration.TargetName() targetCreatedURL := "https://nonexistent" targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false) @@ -756,8 +755,8 @@ func TestServer_ExecutionTargetPreUserinfo(t *testing.T) { } func expectPreUserinfoExecution(ctx context.Context, t *testing.T, instance *integration.Instance, clientID string, req *oidc_pb.CreateCallbackRequest, response *oidc_api.ContextInfoResponse) (string, func()) { - userEmail := gofakeit.Email() - userPhone := "+41" + gofakeit.Phone() + userEmail := integration.Email() + userPhone := integration.Phone() userResp := instance.CreateHumanUserVerified(ctx, instance.DefaultOrg.Id, userEmail, userPhone) sessionResp := createSession(ctx, t, instance, userResp.GetUserId()) @@ -1064,8 +1063,8 @@ func TestServer_ExecutionTargetPreAccessToken(t *testing.T) { } func expectPreAccessTokenExecution(ctx context.Context, t *testing.T, instance *integration.Instance, clientID string, req *oidc_pb.CreateCallbackRequest, response *oidc_api.ContextInfoResponse) (string, func()) { - userEmail := gofakeit.Email() - userPhone := "+41" + gofakeit.Phone() + userEmail := integration.Email() + userPhone := integration.Phone() userResp := instance.CreateHumanUserVerified(ctx, instance.DefaultOrg.Id, userEmail, userPhone) sessionResp := createSession(ctx, t, instance, userResp.GetUserId()) @@ -1120,7 +1119,7 @@ func TestServer_ExecutionTargetPreSAMLResponse(t *testing.T) { }, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return samlRequestID }(), @@ -1145,7 +1144,7 @@ func TestServer_ExecutionTargetPreSAMLResponse(t *testing.T) { }, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return samlRequestID }(), @@ -1177,7 +1176,7 @@ func TestServer_ExecutionTargetPreSAMLResponse(t *testing.T) { }, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return samlRequestID }(), @@ -1229,8 +1228,8 @@ func TestServer_ExecutionTargetPreSAMLResponse(t *testing.T) { } func expectPreSAMLResponseExecution(ctx context.Context, t *testing.T, instance *integration.Instance, req *saml_pb.CreateResponseRequest, response *saml_api.ContextInfoResponse) (string, func()) { - userEmail := gofakeit.Email() - userPhone := "+41" + gofakeit.Phone() + userEmail := integration.Email() + userPhone := integration.Phone() userResp := instance.CreateHumanUserVerified(ctx, instance.DefaultOrg.Id, userEmail, userPhone) sessionResp := createSession(ctx, t, instance, userResp.GetUserId()) @@ -1251,7 +1250,7 @@ func expectPreSAMLResponseExecution(ctx context.Context, t *testing.T, instance } func createSAMLSP(t *testing.T, idpMetadata *saml.EntityDescriptor, binding string) (string, *samlsp.Middleware) { - rootURL := "example." + gofakeit.DomainName() + rootURL := "example." + integration.DomainName() spMiddleware, err := integration.CreateSAMLSP("https://"+rootURL, idpMetadata, binding) require.NoError(t, err) return rootURL, spMiddleware diff --git a/internal/api/grpc/action/v2/integration_test/target_test.go b/internal/api/grpc/action/v2/integration_test/target_test.go index 6aa7f39fae0..bf95307d391 100644 --- a/internal/api/grpc/action/v2/integration_test/target_test.go +++ b/internal/api/grpc/action/v2/integration_test/target_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/durationpb" @@ -38,7 +37,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "missing permission", ctx: instance.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner), req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), }, wantErr: true, }, @@ -54,7 +53,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "empty type", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), TargetType: nil, }, wantErr: true, @@ -63,7 +62,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "empty webhook url", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), TargetType: &action.CreateTargetRequest_RestWebhook{ RestWebhook: &action.RESTWebhook{}, }, @@ -74,7 +73,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "empty request response url", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), TargetType: &action.CreateTargetRequest_RestCall{ RestCall: &action.RESTCall{}, }, @@ -85,7 +84,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "empty timeout", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestWebhook{ RestWebhook: &action.RESTWebhook{}, @@ -111,7 +110,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "async, ok", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestAsync{ RestAsync: &action.RESTAsync{}, @@ -128,7 +127,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "webhook, ok", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestWebhook{ RestWebhook: &action.RESTWebhook{ @@ -147,7 +146,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "webhook, interrupt on error, ok", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestWebhook{ RestWebhook: &action.RESTWebhook{ @@ -166,7 +165,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "call, ok", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestCall{ RestCall: &action.RESTCall{ @@ -186,7 +185,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "call, interruptOnError, ok", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestCall{ RestCall: &action.RESTCall{ @@ -269,7 +268,7 @@ func TestServer_UpdateTarget(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner), req: &action.UpdateTargetRequest{ - Name: gu.Ptr(gofakeit.Name()), + Name: gu.Ptr(integration.TargetName()), }, }, wantErr: true, @@ -282,7 +281,7 @@ func TestServer_UpdateTarget(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, req: &action.UpdateTargetRequest{ - Name: gu.Ptr(gofakeit.Name()), + Name: gu.Ptr(integration.TargetName()), }, }, wantErr: true, @@ -314,7 +313,7 @@ func TestServer_UpdateTarget(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, req: &action.UpdateTargetRequest{ - Name: gu.Ptr(gofakeit.Name()), + Name: gu.Ptr(integration.TargetName()), }, }, want: want{ diff --git a/internal/api/grpc/action/v2beta/integration_test/execution_target_test.go b/internal/api/grpc/action/v2beta/integration_test/execution_target_test.go index a749972c005..efdb22dccce 100644 --- a/internal/api/grpc/action/v2beta/integration_test/execution_target_test.go +++ b/internal/api/grpc/action/v2beta/integration_test/execution_target_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/crewjam/saml" "github.com/crewjam/saml/samlsp" "github.com/stretchr/testify/assert" @@ -71,7 +70,7 @@ func TestServer_ExecutionTarget(t *testing.T) { userID := instance.Users.Get(integration.UserTypeIAMOwner).ID // create target for target changes - targetCreatedName := gofakeit.Name() + targetCreatedName := integration.TargetName() targetCreatedURL := "https://nonexistent" targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false) @@ -212,7 +211,7 @@ func TestServer_ExecutionTarget(t *testing.T) { userID := instance.Users.Get(integration.UserTypeIAMOwner).ID // create target for target changes - targetCreatedName := gofakeit.Name() + targetCreatedName := integration.TargetName() targetCreatedURL := "https://nonexistent" targetCreated := instance.CreateTarget(ctx, t, targetCreatedName, targetCreatedURL, target_domain.TargetTypeCall, false) @@ -547,7 +546,7 @@ func waitForTarget(ctx context.Context, t *testing.T, instance *integration.Inst func createTarget(ctx context.Context, t *testing.T, instance *integration.Instance, name, endpoint string, ty target_domain.TargetType, interrupt bool) *action.CreateTargetResponse { if name == "" { - name = gofakeit.Name() + name = integration.TargetName() } req := &action.CreateTargetRequest{ Name: name, @@ -804,8 +803,8 @@ func TestServer_ExecutionTargetPreUserinfo(t *testing.T) { } func expectPreUserinfoExecution(ctx context.Context, t *testing.T, instance *integration.Instance, clientID string, req *oidc_pb.CreateCallbackRequest, response *oidc_api.ContextInfoResponse) (string, func()) { - userEmail := gofakeit.Email() - userPhone := "+41" + gofakeit.Phone() + userEmail := integration.Email() + userPhone := integration.Phone() userResp := instance.CreateHumanUserVerified(ctx, instance.DefaultOrg.Id, userEmail, userPhone) sessionResp := createSession(ctx, t, instance, userResp.GetUserId()) @@ -1112,8 +1111,8 @@ func TestServer_ExecutionTargetPreAccessToken(t *testing.T) { } func expectPreAccessTokenExecution(ctx context.Context, t *testing.T, instance *integration.Instance, clientID string, req *oidc_pb.CreateCallbackRequest, response *oidc_api.ContextInfoResponse) (string, func()) { - userEmail := gofakeit.Email() - userPhone := "+41" + gofakeit.Phone() + userEmail := integration.Email() + userPhone := integration.Phone() userResp := instance.CreateHumanUserVerified(ctx, instance.DefaultOrg.Id, userEmail, userPhone) sessionResp := createSession(ctx, t, instance, userResp.GetUserId()) @@ -1168,7 +1167,7 @@ func TestServer_ExecutionTargetPreSAMLResponse(t *testing.T) { }, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return samlRequestID }(), @@ -1193,7 +1192,7 @@ func TestServer_ExecutionTargetPreSAMLResponse(t *testing.T) { }, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return samlRequestID }(), @@ -1225,7 +1224,7 @@ func TestServer_ExecutionTargetPreSAMLResponse(t *testing.T) { }, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, samlRequestID, err := instance.CreateSAMLAuthRequest(spMiddlewarePost, instance.Users[integration.UserTypeOrgOwner].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return samlRequestID }(), @@ -1277,8 +1276,8 @@ func TestServer_ExecutionTargetPreSAMLResponse(t *testing.T) { } func expectPreSAMLResponseExecution(ctx context.Context, t *testing.T, instance *integration.Instance, req *saml_pb.CreateResponseRequest, response *saml_api.ContextInfoResponse) (string, func()) { - userEmail := gofakeit.Email() - userPhone := "+41" + gofakeit.Phone() + userEmail := integration.Email() + userPhone := integration.Phone() userResp := instance.CreateHumanUserVerified(ctx, instance.DefaultOrg.Id, userEmail, userPhone) sessionResp := createSession(ctx, t, instance, userResp.GetUserId()) @@ -1299,14 +1298,14 @@ func expectPreSAMLResponseExecution(ctx context.Context, t *testing.T, instance } func createSAMLSP(t *testing.T, idpMetadata *saml.EntityDescriptor, binding string) (string, *samlsp.Middleware) { - rootURL := "example." + gofakeit.DomainName() + rootURL := "example." + integration.DomainName() spMiddleware, err := integration.CreateSAMLSP("https://"+rootURL, idpMetadata, binding) require.NoError(t, err) return rootURL, spMiddleware } func createSAMLApplication(ctx context.Context, t *testing.T, instance *integration.Instance, idpMetadata *saml.EntityDescriptor, binding string, projectRoleCheck, hasProjectCheck bool) (string, string, *samlsp.Middleware) { - project := instance.CreateProject(ctx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), projectRoleCheck, hasProjectCheck) + project := instance.CreateProject(ctx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), projectRoleCheck, hasProjectCheck) rootURL, sp := createSAMLSP(t, idpMetadata, binding) _, err := instance.CreateSAMLClient(ctx, project.GetId(), sp) require.NoError(t, err) diff --git a/internal/api/grpc/action/v2beta/integration_test/query_test.go b/internal/api/grpc/action/v2beta/integration_test/query_test.go index 913217bd8e5..d29fc1f539d 100644 --- a/internal/api/grpc/action/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/action/v2beta/integration_test/query_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -54,7 +53,7 @@ func TestServer_GetTarget(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error { - name := gofakeit.Name() + name := integration.TargetName() resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false) request.Id = resp.GetId() response.Target.Id = resp.GetId() @@ -81,7 +80,7 @@ func TestServer_GetTarget(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error { - name := gofakeit.Name() + name := integration.TargetName() resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeAsync, false) request.Id = resp.GetId() response.Target.Id = resp.GetId() @@ -108,7 +107,7 @@ func TestServer_GetTarget(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error { - name := gofakeit.Name() + name := integration.TargetName() resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, true) request.Id = resp.GetId() response.Target.Id = resp.GetId() @@ -137,7 +136,7 @@ func TestServer_GetTarget(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error { - name := gofakeit.Name() + name := integration.TargetName() resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeCall, false) request.Id = resp.GetId() response.Target.Id = resp.GetId() @@ -166,7 +165,7 @@ func TestServer_GetTarget(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, dep: func(ctx context.Context, request *action.GetTargetRequest, response *action.GetTargetResponse) error { - name := gofakeit.Name() + name := integration.TargetName() resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeCall, true) request.Id = resp.GetId() response.Target.Id = resp.GetId() @@ -261,7 +260,7 @@ func TestServer_ListTargets(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) { - name := gofakeit.Name() + name := integration.TargetName() resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false) request.Filters[0].Filter = &action.TargetSearchFilter_InTargetIdsFilter{ InTargetIdsFilter: &action.InTargetIDsFilter{ @@ -301,7 +300,7 @@ func TestServer_ListTargets(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) { - name := gofakeit.Name() + name := integration.TargetName() resp := instance.CreateTarget(ctx, t, name, "https://example.com", target_domain.TargetTypeWebhook, false) request.Filters[0].Filter = &action.TargetSearchFilter_TargetNameFilter{ TargetNameFilter: &action.TargetNameFilter{ @@ -342,9 +341,9 @@ func TestServer_ListTargets(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, dep: func(ctx context.Context, request *action.ListTargetsRequest, response *action.ListTargetsResponse) { - name1 := gofakeit.Name() - name2 := gofakeit.Name() - name3 := gofakeit.Name() + name1 := integration.TargetName() + name2 := integration.TargetName() + name3 := integration.TargetName() resp1 := instance.CreateTarget(ctx, t, name1, "https://example.com", target_domain.TargetTypeWebhook, false) resp2 := instance.CreateTarget(ctx, t, name2, "https://example.com", target_domain.TargetTypeCall, true) resp3 := instance.CreateTarget(ctx, t, name3, "https://example.com", target_domain.TargetTypeAsync, false) diff --git a/internal/api/grpc/action/v2beta/integration_test/target_test.go b/internal/api/grpc/action/v2beta/integration_test/target_test.go index 7354598307a..faf91f404cf 100644 --- a/internal/api/grpc/action/v2beta/integration_test/target_test.go +++ b/internal/api/grpc/action/v2beta/integration_test/target_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/durationpb" @@ -25,7 +24,7 @@ func TestServer_CreateTarget(t *testing.T) { creationDate bool signingKey bool } - alreadyExistingTargetName := gofakeit.AppName() + alreadyExistingTargetName := integration.TargetName() instance.CreateTarget(isolatedIAMOwnerCTX, t, alreadyExistingTargetName, "https://example.com", target_domain.TargetTypeAsync, false) tests := []struct { name string @@ -38,7 +37,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "missing permission", ctx: instance.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner), req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), }, wantErr: true, }, @@ -54,7 +53,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "empty type", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), TargetType: nil, }, wantErr: true, @@ -63,7 +62,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "empty webhook url", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), TargetType: &action.CreateTargetRequest_RestWebhook{ RestWebhook: &action.RESTWebhook{}, }, @@ -74,7 +73,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "empty request response url", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), TargetType: &action.CreateTargetRequest_RestCall{ RestCall: &action.RESTCall{}, }, @@ -85,7 +84,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "empty timeout", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestWebhook{ RestWebhook: &action.RESTWebhook{}, @@ -111,7 +110,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "async, ok", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestAsync{ RestAsync: &action.RESTAsync{}, @@ -128,7 +127,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "webhook, ok", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestWebhook{ RestWebhook: &action.RESTWebhook{ @@ -147,7 +146,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "webhook, interrupt on error, ok", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestWebhook{ RestWebhook: &action.RESTWebhook{ @@ -166,7 +165,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "call, ok", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestCall{ RestCall: &action.RESTCall{ @@ -186,7 +185,7 @@ func TestServer_CreateTarget(t *testing.T) { name: "call, interruptOnError, ok", ctx: isolatedIAMOwnerCTX, req: &action.CreateTargetRequest{ - Name: gofakeit.Name(), + Name: integration.TargetName(), Endpoint: "https://example.com", TargetType: &action.CreateTargetRequest_RestCall{ RestCall: &action.RESTCall{ @@ -269,7 +268,7 @@ func TestServer_UpdateTarget(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(context.Background(), integration.UserTypeOrgOwner), req: &action.UpdateTargetRequest{ - Name: gu.Ptr(gofakeit.Name()), + Name: gu.Ptr(integration.TargetName()), }, }, wantErr: true, @@ -282,7 +281,7 @@ func TestServer_UpdateTarget(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, req: &action.UpdateTargetRequest{ - Name: gu.Ptr(gofakeit.Name()), + Name: gu.Ptr(integration.TargetName()), }, }, wantErr: true, @@ -314,7 +313,7 @@ func TestServer_UpdateTarget(t *testing.T) { args: args{ ctx: isolatedIAMOwnerCTX, req: &action.UpdateTargetRequest{ - Name: gu.Ptr(gofakeit.Name()), + Name: gu.Ptr(integration.TargetName()), }, }, want: want{ diff --git a/internal/api/grpc/admin/integration_test/iam_member_test.go b/internal/api/grpc/admin/integration_test/iam_member_test.go index 93d4417cba3..3f285a00d0e 100644 --- a/internal/api/grpc/admin/integration_test/iam_member_test.go +++ b/internal/api/grpc/admin/integration_test/iam_member_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/timestamppb" @@ -35,7 +34,7 @@ func TestServer_ListIAMMemberRoles(t *testing.T) { } func TestServer_ListIAMMembers(t *testing.T) { - user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()) _, err := Client.AddIAMMember(AdminCTX, &admin_pb.AddIAMMemberRequest{ UserId: user.GetUserId(), Roles: iamRoles, @@ -116,7 +115,7 @@ func TestServer_ListIAMMembers(t *testing.T) { } func TestServer_AddIAMMember(t *testing.T) { - user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()) type args struct { ctx context.Context req *admin_pb.AddIAMMemberRequest @@ -190,7 +189,7 @@ func TestServer_AddIAMMember(t *testing.T) { } func TestServer_UpdateIAMMember(t *testing.T) { - user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()) _, err := Client.AddIAMMember(AdminCTX, &admin_pb.AddIAMMemberRequest{ UserId: user.GetUserId(), Roles: []string{"IAM_OWNER"}, @@ -271,7 +270,7 @@ func TestServer_UpdateIAMMember(t *testing.T) { } func TestServer_RemoveIAMMember(t *testing.T) { - user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(AdminCTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()) _, err := Client.AddIAMMember(AdminCTX, &admin_pb.AddIAMMemberRequest{ UserId: user.GetUserId(), Roles: []string{"IAM_OWNER"}, diff --git a/internal/api/grpc/admin/integration_test/import_test.go b/internal/api/grpc/admin/integration_test/import_test.go index 9db81d0f176..718b7ab0464 100644 --- a/internal/api/grpc/admin/integration_test/import_test.go +++ b/internal/api/grpc/admin/integration_test/import_test.go @@ -6,7 +6,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/google/uuid" "github.com/stretchr/testify/require" @@ -81,15 +80,15 @@ func TestServer_ImportData(t *testing.T) { { UserId: userIDs[0], User: &management.ImportHumanUserRequest{ - UserName: gofakeit.Username(), + UserName: integration.Username(), Profile: &management.ImportHumanUserRequest_Profile{ - FirstName: gofakeit.FirstName(), - LastName: gofakeit.LastName(), - DisplayName: gofakeit.Username(), - PreferredLanguage: gofakeit.LanguageBCP(), + FirstName: integration.FirstName(), + LastName: integration.LastName(), + DisplayName: integration.Username(), + PreferredLanguage: integration.Language(), }, Email: &management.ImportHumanUserRequest_Email{ - Email: gofakeit.Email(), + Email: integration.Email(), IsEmailVerified: true, }, }, @@ -97,15 +96,15 @@ func TestServer_ImportData(t *testing.T) { { UserId: userIDs[1], User: &management.ImportHumanUserRequest{ - UserName: gofakeit.Username(), + UserName: integration.Username(), Profile: &management.ImportHumanUserRequest_Profile{ - FirstName: gofakeit.FirstName(), - LastName: gofakeit.LastName(), - DisplayName: gofakeit.Username(), - PreferredLanguage: gofakeit.LanguageBCP(), + FirstName: integration.FirstName(), + LastName: integration.LastName(), + DisplayName: integration.Username(), + PreferredLanguage: integration.Language(), }, Email: &management.ImportHumanUserRequest_Email{ - Email: gofakeit.Email(), + Email: integration.Email(), IsEmailVerified: true, }, }, @@ -408,15 +407,15 @@ func TestServer_ImportData(t *testing.T) { { UserId: userIDs[2], User: &management.ImportHumanUserRequest{ - UserName: gofakeit.Username(), + UserName: integration.Username(), Profile: &management.ImportHumanUserRequest_Profile{ - FirstName: gofakeit.FirstName(), - LastName: gofakeit.LastName(), - DisplayName: gofakeit.Username(), - PreferredLanguage: gofakeit.LanguageBCP(), + FirstName: integration.FirstName(), + LastName: integration.LastName(), + DisplayName: integration.Username(), + PreferredLanguage: integration.Language(), }, Email: &management.ImportHumanUserRequest_Email{ - Email: gofakeit.Email(), + Email: integration.Email(), IsEmailVerified: true, }, }, diff --git a/internal/api/grpc/app/v2beta/convert/saml_app_test.go b/internal/api/grpc/app/v2beta/convert/saml_app_test.go index b41ec432b6f..321f0eb8397 100644 --- a/internal/api/grpc/app/v2beta/convert/saml_app_test.go +++ b/internal/api/grpc/app/v2beta/convert/saml_app_test.go @@ -5,12 +5,12 @@ import ( "net/url" "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/eventstore/v1/models" + "github.com/zitadel/zitadel/internal/integration" "github.com/zitadel/zitadel/internal/query" app "github.com/zitadel/zitadel/pkg/grpc/app/v2beta" ) @@ -38,7 +38,7 @@ func samlMetadataGen(entityID string) []byte { func TestCreateSAMLAppRequestToDomain(t *testing.T) { t.Parallel() - genMetaForValidRequest := samlMetadataGen(gofakeit.URL()) + genMetaForValidRequest := samlMetadataGen(integration.URL()) tt := []struct { testName string @@ -55,7 +55,7 @@ func TestCreateSAMLAppRequestToDomain(t *testing.T) { projectID: "proj-1", req: &app.CreateSAMLApplicationRequest{ Metadata: &app.CreateSAMLApplicationRequest_MetadataXml{ - MetadataXml: samlMetadataGen(gofakeit.URL()), + MetadataXml: samlMetadataGen(integration.URL()), }, LoginVersion: &app.LoginVersion{ Version: &app.LoginVersion_LoginV2{ @@ -122,7 +122,7 @@ func TestCreateSAMLAppRequestToDomain(t *testing.T) { func TestUpdateSAMLAppConfigRequestToDomain(t *testing.T) { t.Parallel() - genMetaForValidRequest := samlMetadataGen(gofakeit.URL()) + genMetaForValidRequest := samlMetadataGen(integration.URL()) tt := []struct { testName string @@ -139,7 +139,7 @@ func TestUpdateSAMLAppConfigRequestToDomain(t *testing.T) { projectID: "proj-1", req: &app.UpdateSAMLApplicationConfigurationRequest{ Metadata: &app.UpdateSAMLApplicationConfigurationRequest_MetadataXml{ - MetadataXml: samlMetadataGen(gofakeit.URL()), + MetadataXml: samlMetadataGen(integration.URL()), }, LoginVersion: &app.LoginVersion{ Version: &app.LoginVersion_LoginV2{ @@ -202,7 +202,7 @@ func TestUpdateSAMLAppConfigRequestToDomain(t *testing.T) { func TestAppSAMLConfigToPb(t *testing.T) { t.Parallel() - metadata := samlMetadataGen(gofakeit.URL()) + metadata := samlMetadataGen(integration.URL()) tt := []struct { name string diff --git a/internal/api/grpc/app/v2beta/integration_test/app_key_test.go b/internal/api/grpc/app/v2beta/integration_test/app_key_test.go index 7c3c886cffb..4d746060ba0 100644 --- a/internal/api/grpc/app/v2beta/integration_test/app_key_test.go +++ b/internal/api/grpc/app/v2beta/integration_test/app_key_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" + "github.com/zitadel/zitadel/internal/integration" app "github.com/zitadel/zitadel/pkg/grpc/app/v2beta" ) @@ -35,7 +35,7 @@ func TestCreateApplicationKey(t *testing.T) { inputCtx: IAMOwnerCtx, creationRequest: &app.CreateApplicationKeyRequest{ ProjectId: p.GetId(), - AppId: gofakeit.UUID(), + AppId: integration.ID(), ExpirationDate: timestamppb.New(time.Now().AddDate(0, 0, 1).UTC()), }, expectedErrorType: codes.FailedPrecondition, @@ -118,7 +118,7 @@ func TestDeleteApplicationKey(t *testing.T) { inputCtx: IAMOwnerCtx, deletionRequest: func(ttt *testing.T) *app.DeleteApplicationKeyRequest { return &app.DeleteApplicationKeyRequest{ - Id: gofakeit.UUID(), + Id: integration.ID(), ProjectId: p.GetId(), ApplicationId: createdApp.GetAppId(), } diff --git a/internal/api/grpc/app/v2beta/integration_test/app_test.go b/internal/api/grpc/app/v2beta/integration_test/app_test.go index 080029c37d5..3f8f25ca1ea 100644 --- a/internal/api/grpc/app/v2beta/integration_test/app_test.go +++ b/internal/api/grpc/app/v2beta/integration_test/app_test.go @@ -7,7 +7,6 @@ import ( "fmt" "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" @@ -23,7 +22,7 @@ func TestCreateApplication(t *testing.T) { t.Parallel() - notExistingProjectID := gofakeit.UUID() + notExistingProjectID := integration.ID() tt := []struct { testName string @@ -95,7 +94,7 @@ func TestCreateApplication(t *testing.T) { inputCtx: IAMOwnerCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_OidcRequest{ OidcRequest: &app.CreateOIDCApplicationRequest{ RedirectUris: []string{"http://example.com"}, @@ -125,7 +124,7 @@ func TestCreateApplication(t *testing.T) { inputCtx: IAMOwnerCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: notExistingProjectID, - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_SamlRequest{ SamlRequest: &app.CreateSAMLApplicationRequest{ Metadata: &app.CreateSAMLApplicationRequest_MetadataUrl{ @@ -148,11 +147,11 @@ func TestCreateApplication(t *testing.T) { inputCtx: IAMOwnerCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_SamlRequest{ SamlRequest: &app.CreateSAMLApplicationRequest{ Metadata: &app.CreateSAMLApplicationRequest_MetadataXml{ - MetadataXml: samlMetadataGen(gofakeit.URL()), + MetadataXml: samlMetadataGen(integration.URL()), }, LoginVersion: &app.LoginVersion{ Version: &app.LoginVersion_LoginV2{ @@ -217,7 +216,7 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { inputCtx: LoginUserCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_OidcRequest{ OidcRequest: &app.CreateOIDCApplicationRequest{ RedirectUris: []string{"http://example.com"}, @@ -247,11 +246,11 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { inputCtx: LoginUserCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_SamlRequest{ SamlRequest: &app.CreateSAMLApplicationRequest{ Metadata: &app.CreateSAMLApplicationRequest_MetadataXml{ - MetadataXml: samlMetadataGen(gofakeit.URL()), + MetadataXml: samlMetadataGen(integration.URL()), }, LoginVersion: &app.LoginVersion{ Version: &app.LoginVersion_LoginV2{ @@ -286,7 +285,7 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { inputCtx: OrgOwnerCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_OidcRequest{ OidcRequest: &app.CreateOIDCApplicationRequest{ RedirectUris: []string{"http://example.com"}, @@ -316,11 +315,11 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { inputCtx: OrgOwnerCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_SamlRequest{ SamlRequest: &app.CreateSAMLApplicationRequest{ Metadata: &app.CreateSAMLApplicationRequest_MetadataXml{ - MetadataXml: samlMetadataGen(gofakeit.URL()), + MetadataXml: samlMetadataGen(integration.URL()), }, LoginVersion: &app.LoginVersion{ Version: &app.LoginVersion_LoginV2{ @@ -355,7 +354,7 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { inputCtx: projectOwnerCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_OidcRequest{ OidcRequest: &app.CreateOIDCApplicationRequest{ RedirectUris: []string{"http://example.com"}, @@ -385,11 +384,11 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { inputCtx: projectOwnerCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_SamlRequest{ SamlRequest: &app.CreateSAMLApplicationRequest{ Metadata: &app.CreateSAMLApplicationRequest_MetadataXml{ - MetadataXml: samlMetadataGen(gofakeit.URL()), + MetadataXml: samlMetadataGen(integration.URL()), }, LoginVersion: &app.LoginVersion{ Version: &app.LoginVersion_LoginV2{ @@ -422,8 +421,8 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { } func TestUpdateApplication(t *testing.T) { - orgNotInCtx := instance.CreateOrganization(IAMOwnerCtx, integration.OrganizationName(), gofakeit.Email()) - pNotInCtx := instance.CreateProject(IAMOwnerCtx, t, orgNotInCtx.GetOrganizationId(), gofakeit.AppName(), false, false) + orgNotInCtx := instance.CreateOrganization(IAMOwnerCtx, integration.OrganizationName(), integration.Email()) + pNotInCtx := instance.CreateProject(IAMOwnerCtx, t, orgNotInCtx.GetOrganizationId(), integration.ApplicationName(), false, false) p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) @@ -461,7 +460,7 @@ func TestUpdateApplication(t *testing.T) { }, } - samlMetas := samlMetadataGen(gofakeit.URL()) + samlMetas := samlMetadataGen(integration.URL()) reqForSAMLAppCreation := &app.CreateApplicationRequest_SamlRequest{ SamlRequest: &app.CreateSAMLApplicationRequest{ Metadata: &app.CreateSAMLApplicationRequest_MetadataXml{ @@ -479,28 +478,28 @@ func TestUpdateApplication(t *testing.T) { appForNameChange, appNameChangeErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: reqForAppNameCreation, }) require.Nil(t, appNameChangeErr) appForAPIConfigChange, appAPIConfigChangeErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: reqForAPIAppCreation, }) require.Nil(t, appAPIConfigChangeErr) appForOIDCConfigChange, appOIDCConfigChangeErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: reqForOIDCAppCreation, }) require.Nil(t, appOIDCConfigChangeErr) appForSAMLConfigChange, appSAMLConfigChangeErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: reqForSAMLAppCreation, }) require.Nil(t, appSAMLConfigChangeErr) @@ -649,7 +648,7 @@ func TestUpdateApplication_WithDifferentPermissions(t *testing.T) { appForNameChange, appNameChangeErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: reqForAppNameCreation, }) require.Nil(t, appNameChangeErr) @@ -683,7 +682,7 @@ func TestUpdateApplication_WithDifferentPermissions(t *testing.T) { ProjectId: p.GetId(), Id: appForNameChange.GetAppId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), }, }, { @@ -737,7 +736,7 @@ func TestUpdateApplication_WithDifferentPermissions(t *testing.T) { ProjectId: p.GetId(), Id: appForNameChange.GetAppId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), }, }, { @@ -791,7 +790,7 @@ func TestUpdateApplication_WithDifferentPermissions(t *testing.T) { ProjectId: p.GetId(), Id: appForNameChange.GetAppId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), }, expectedErrorType: codes.PermissionDenied, }, @@ -864,7 +863,7 @@ func TestDeleteApplication(t *testing.T) { appToDelete, appNameChangeErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: reqForAppNameCreation, }) require.Nil(t, appNameChangeErr) @@ -882,7 +881,7 @@ func TestDeleteApplication(t *testing.T) { inputCtx: IAMOwnerCtx, deleteRequest: &app.DeleteApplicationRequest{ ProjectId: p.GetId(), - Id: gofakeit.Sentence(2), + Id: integration.ID(), }, expectedErrorType: codes.NotFound, }, @@ -984,7 +983,7 @@ func TestDeactivateApplication(t *testing.T) { appToDeactivate, appCreateErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: reqForAppNameCreation, }) require.NoError(t, appCreateErr) @@ -1003,7 +1002,7 @@ func TestDeactivateApplication(t *testing.T) { inputCtx: IAMOwnerCtx, deleteRequest: &app.DeactivateApplicationRequest{ ProjectId: p.GetId(), - Id: gofakeit.Sentence(2), + Id: integration.ID(), }, expectedErrorType: codes.NotFound, }, @@ -1105,7 +1104,7 @@ func TestReactivateApplication(t *testing.T) { appToReactivate, appCreateErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: reqForAppNameCreation, }) require.Nil(t, appCreateErr) @@ -1130,7 +1129,7 @@ func TestReactivateApplication(t *testing.T) { inputCtx: IAMOwnerCtx, reactivateRequest: &app.ReactivateApplicationRequest{ ProjectId: p.GetId(), - Id: gofakeit.Sentence(2), + Id: integration.ID(), }, expectedErrorType: codes.NotFound, }, @@ -1238,7 +1237,7 @@ func TestRegenerateClientSecret(t *testing.T) { apiAppToRegen, apiAppCreateErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: reqForApiAppCreation, }) require.Nil(t, apiAppCreateErr) @@ -1266,7 +1265,7 @@ func TestRegenerateClientSecret(t *testing.T) { oidcAppToRegen, oidcAppCreateErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.AppName(), + Name: integration.ApplicationName(), CreationRequestType: reqForOIDCAppCreation, }) require.Nil(t, oidcAppCreateErr) @@ -1286,7 +1285,7 @@ func TestRegenerateClientSecret(t *testing.T) { inputCtx: IAMOwnerCtx, regenRequest: &app.RegenerateClientSecretRequest{ ProjectId: p.GetId(), - ApplicationId: gofakeit.Sentence(2), + ApplicationId: integration.ID(), }, expectedErrorType: codes.InvalidArgument, }, @@ -1295,7 +1294,7 @@ func TestRegenerateClientSecret(t *testing.T) { inputCtx: IAMOwnerCtx, regenRequest: &app.RegenerateClientSecretRequest{ ProjectId: p.GetId(), - ApplicationId: gofakeit.Sentence(2), + ApplicationId: integration.ID(), AppType: &app.RegenerateClientSecretRequest_IsApi{}, }, expectedErrorType: codes.NotFound, diff --git a/internal/api/grpc/app/v2beta/integration_test/query_test.go b/internal/api/grpc/app/v2beta/integration_test/query_test.go index 14b55cb1d76..61c46b3d6e7 100644 --- a/internal/api/grpc/app/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/app/v2beta/integration_test/query_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" @@ -42,7 +41,7 @@ func TestGetApplication(t *testing.T) { CreationRequestType: &app.CreateApplicationRequest_SamlRequest{ SamlRequest: &app.CreateSAMLApplicationRequest{ LoginVersion: &app.LoginVersion{Version: &app.LoginVersion_LoginV1{LoginV1: &app.LoginV1{}}}, - Metadata: &app.CreateSAMLApplicationRequest_MetadataXml{MetadataXml: samlMetadataGen(gofakeit.URL())}, + Metadata: &app.CreateSAMLApplicationRequest_MetadataXml{MetadataXml: samlMetadataGen(integration.URL())}, }, }, }) @@ -85,7 +84,7 @@ func TestGetApplication(t *testing.T) { testName: "when unknown app ID should return not found error", inputCtx: IAMOwnerCtx, inputRequest: &app.GetApplicationRequest{ - Id: gofakeit.Sentence(2), + Id: integration.ID(), }, expectedErrorType: codes.NotFound, @@ -170,9 +169,9 @@ func TestListApplications(t *testing.T) { createdDeactivatedApiApp, deactivatedApiAppName := createAPIAppWithName(t, IAMOwnerCtx, instance, p.GetId()) deactivateApp(t, createdDeactivatedApiApp, p.GetId()) - _, createdSAMLApp, samlAppName := createSAMLAppWithName(t, gofakeit.URL(), p.GetId()) + _, createdSAMLApp, samlAppName := createSAMLAppWithName(t, integration.URL(), p.GetId()) - createdOIDCApp, oidcAppName := createOIDCAppWithName(t, gofakeit.URL(), p.GetId()) + createdOIDCApp, oidcAppName := createOIDCAppWithName(t, integration.URL(), p.GetId()) type appWithName struct { app *app.CreateApplicationResponse @@ -593,7 +592,7 @@ func TestGetApplicationKey(t *testing.T) { testName: "when unknown app ID should return not found error", inputCtx: IAMOwnerCtx, inputRequest: &app.GetApplicationKeyRequest{ - Id: gofakeit.Sentence(2), + Id: integration.ID(), }, expectedErrorType: codes.NotFound, diff --git a/internal/api/grpc/app/v2beta/integration_test/server_test.go b/internal/api/grpc/app/v2beta/integration_test/server_test.go index b9c342005db..488064930e3 100644 --- a/internal/api/grpc/app/v2beta/integration_test/server_test.go +++ b/internal/api/grpc/app/v2beta/integration_test/server_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -82,7 +81,7 @@ func samlMetadataGen(entityID string) []byte { } func createSAMLAppWithName(t *testing.T, baseURI, projectID string) ([]byte, *app.CreateApplicationResponse, string) { - samlMetas := samlMetadataGen(gofakeit.URL()) + samlMetas := samlMetadataGen(integration.URL()) appName := integration.ApplicationName() appForSAMLConfigChange, appSAMLConfigChangeErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ diff --git a/internal/api/grpc/authorization/v2beta/integration_test/authorization_test.go b/internal/api/grpc/authorization/v2beta/integration_test/authorization_test.go index 6bbbbdae295..7993b453d3b 100644 --- a/internal/api/grpc/authorization/v2beta/integration_test/authorization_test.go +++ b/internal/api/grpc/authorization/v2beta/integration_test/authorization_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -33,9 +32,9 @@ func TestServer_CreateAuthorization(t *testing.T) { name: "add authorization, project owned, PROJECT_OWNER, ok", args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.OrganizationId = &selfOrgId - request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id + request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id request.RoleKeys = []string{integration.RoleKey()} Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "") request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID @@ -51,7 +50,7 @@ func TestServer_CreateAuthorization(t *testing.T) { name: "add authorization, project owned, PROJECT_OWNER, no org id, ok", args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id request.RoleKeys = []string{integration.RoleKey()} Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "") @@ -68,7 +67,7 @@ func TestServer_CreateAuthorization(t *testing.T) { name: "add authorization, project owned, ORG_OWNER, ok", args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.OrganizationId = &selfOrgId request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id request.RoleKeys = []string{integration.RoleKey()} @@ -87,7 +86,7 @@ func TestServer_CreateAuthorization(t *testing.T) { args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.OrganizationId = &selfOrgId request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id request.RoleKeys = []string{integration.RoleKey()} @@ -105,7 +104,7 @@ func TestServer_CreateAuthorization(t *testing.T) { name: "add authorization, role does not exist, error", args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.OrganizationId = &selfOrgId request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id request.RoleKeys = []string{integration.RoleKey()} @@ -123,7 +122,7 @@ func TestServer_CreateAuthorization(t *testing.T) { name: "add authorization, project does not exist, error", args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.OrganizationId = &selfOrgId request.ProjectId = "notexists" request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID @@ -139,7 +138,7 @@ func TestServer_CreateAuthorization(t *testing.T) { name: "add authorization, org does not exist, error", args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.OrganizationId = gu.Ptr("notexists") request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID @@ -157,9 +156,9 @@ func TestServer_CreateAuthorization(t *testing.T) { name: "add authorization, project owner, project granted, no permission", args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.OrganizationId = &selfOrgId - foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()) + foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()) request.ProjectId = Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, integration.ProjectName(), false, false).Id request.RoleKeys = []string{integration.RoleKey()} Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "") @@ -178,12 +177,12 @@ func TestServer_CreateAuthorization(t *testing.T) { name: "add authorization, role key not granted, error", args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.OrganizationId = &selfOrgId - foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()) + foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()) request.ProjectId = Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, integration.ProjectName(), false, false).Id request.RoleKeys = []string{integration.RoleKey()} - Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], gofakeit.AppName(), "") + Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "") Instance.CreateProjectGrant(IAMCTX, t, request.ProjectId, selfOrgId) request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) @@ -199,9 +198,9 @@ func TestServer_CreateAuthorization(t *testing.T) { name: "add authorization, grant does not exist, error", args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.OrganizationId = &selfOrgId - foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()) + foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()) projectID := Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, integration.ProjectName(), false, false).Id request.ProjectId = projectID request.RoleKeys = []string{integration.RoleKey()} @@ -221,9 +220,9 @@ func TestServer_CreateAuthorization(t *testing.T) { name: "add authorization, PROJECT_OWNER on wrong org, error", args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId request.OrganizationId = &selfOrgId - foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()) + foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()) request.ProjectId = Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, integration.ProjectName(), false, false).Id request.RoleKeys = []string{integration.RoleKey()} Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "") @@ -272,7 +271,7 @@ func TestServer_UpdateAuthorization(t *testing.T) { name: "update authorization, owned project, ok", args: args{ func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -298,7 +297,7 @@ func TestServer_UpdateAuthorization(t *testing.T) { name: "update authorization, owned project, role not found, error", args: args{ func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -325,7 +324,7 @@ func TestServer_UpdateAuthorization(t *testing.T) { name: "update authorization, owned project, unchanged, ok, changed date is creation date", args: args{ func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -352,8 +351,8 @@ func TestServer_UpdateAuthorization(t *testing.T) { name: "update authorization, granted project, ok", args: args{ func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -382,8 +381,8 @@ func TestServer_UpdateAuthorization(t *testing.T) { name: "update authorization, granted project, role not granted, error", args: args{ func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -414,8 +413,8 @@ func TestServer_UpdateAuthorization(t *testing.T) { name: "update authorization, granted project, grant removed, error", args: args{ func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -486,7 +485,7 @@ func TestServer_DeleteAuthorization(t *testing.T) { name: "delete authorization, project owned by calling users org, ok", args: args{ func(t *testing.T, request *authorization.DeleteAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -510,11 +509,11 @@ func TestServer_DeleteAuthorization(t *testing.T) { name: "delete authorization, owned project, user membership on project owning org, ok", args: args{ func(t *testing.T, request *authorization.DeleteAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id + projectRole1 := integration.RoleKey() + projectRole2 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") preparedAuthorization, err := Instance.Client.AuthorizationV2Beta.CreateAuthorization(IAMCTX, &authorization.CreateAuthorizationRequest{ @@ -536,8 +535,8 @@ func TestServer_DeleteAuthorization(t *testing.T) { name: "delete authorization, granted project, user membership on project owning org, error", args: args{ func(t *testing.T, request *authorization.DeleteAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -567,8 +566,8 @@ func TestServer_DeleteAuthorization(t *testing.T) { name: "delete authorization, granted project, user membership on project granted org, ok", args: args{ func(t *testing.T, request *authorization.DeleteAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -595,8 +594,8 @@ func TestServer_DeleteAuthorization(t *testing.T) { name: "delete authorization, already deleted, ok, deletion date is creation date", args: args{ func(t *testing.T, request *authorization.DeleteAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") @@ -660,7 +659,7 @@ func TestServer_DeactivateAuthorization(t *testing.T) { name: "deactivate authorization, project owned by calling users org, ok", args: args{ func(t *testing.T, request *authorization.DeactivateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -684,8 +683,8 @@ func TestServer_DeactivateAuthorization(t *testing.T) { name: "deactivate authorization, owned project, user membership on project owning org, ok", args: args{ func(t *testing.T, request *authorization.DeactivateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -710,8 +709,8 @@ func TestServer_DeactivateAuthorization(t *testing.T) { name: "deactivate authorization, granted project, user membership on project owning org, error", args: args{ func(t *testing.T, request *authorization.DeactivateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -741,8 +740,8 @@ func TestServer_DeactivateAuthorization(t *testing.T) { name: "deactivate authorization, granted project, user membership on project granted org, ok", args: args{ func(t *testing.T, request *authorization.DeactivateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -768,7 +767,7 @@ func TestServer_DeactivateAuthorization(t *testing.T) { name: "deactivate authorization, already inactive, ok, change date is creation date", args: args{ func(t *testing.T, request *authorization.DeactivateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -833,7 +832,7 @@ func TestServer_ActivateAuthorization(t *testing.T) { name: "activate authorization, project owned by calling users org, ok", args: args{ func(t *testing.T, request *authorization.ActivateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -861,8 +860,8 @@ func TestServer_ActivateAuthorization(t *testing.T) { name: "activate authorization, owned project, user membership on project owning org, ok", args: args{ func(t *testing.T, request *authorization.ActivateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -891,8 +890,8 @@ func TestServer_ActivateAuthorization(t *testing.T) { name: "activate authorization, granted project, user membership on project owning org, error", args: args{ func(t *testing.T, request *authorization.ActivateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -926,8 +925,8 @@ func TestServer_ActivateAuthorization(t *testing.T) { name: "activate authorization, granted project, user membership on project granted org, ok", args: args{ func(t *testing.T, request *authorization.ActivateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -956,7 +955,7 @@ func TestServer_ActivateAuthorization(t *testing.T) { name: "activate authorization, already active, ok, change date is creation date", args: args{ func(t *testing.T, request *authorization.ActivateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id projectRole1 := integration.RoleKey() projectRole2 := integration.RoleKey() @@ -1004,7 +1003,7 @@ func TestServer_ActivateAuthorization(t *testing.T) { } func createUserWithProjectGrantMembership(ctx context.Context, t *testing.T, instance *integration.Instance, projectID, grantID string) string { - selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId callingUser := instance.CreateUserTypeMachine(ctx, selfOrgId) instance.CreateProjectGrantMembership(t, ctx, projectID, grantID, callingUser.Id) token, err := instance.Client.UserV2.AddPersonalAccessToken(IAMCTX, &user.AddPersonalAccessTokenRequest{UserId: callingUser.Id, ExpirationDate: timestamppb.New(time.Now().Add(24 * time.Hour))}) diff --git a/internal/api/grpc/authorization/v2beta/integration_test/query_test.go b/internal/api/grpc/authorization/v2beta/integration_test/query_test.go index 2b30cdbb1ab..d623da8299d 100644 --- a/internal/api/grpc/authorization/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/authorization/v2beta/integration_test/query_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -49,7 +48,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: EmptyCTX, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -69,7 +68,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: Instance.WithAuthorizationToken(EmptyCTX, integration.UserTypeNoPermission), dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -117,7 +116,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -145,7 +144,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) resp := createAuthorization(iamOwnerCtx, Instance, t, Instance.DefaultOrg.GetId(), userResp.GetId(), false) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_AuthorizationIds{ @@ -174,7 +173,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) resp := createAuthorization(iamOwnerCtx, Instance, t, Instance.DefaultOrg.GetId(), userResp.GetId(), false) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectId{ @@ -203,7 +202,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) resp := createAuthorization(iamOwnerCtx, Instance, t, Instance.DefaultOrg.GetId(), userResp.GetId(), false) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectName{ @@ -233,7 +232,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -261,7 +260,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) resp := createAuthorization(iamOwnerCtx, Instance, t, Instance.DefaultOrg.GetId(), userResp.GetId(), true) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectGrantId{ @@ -290,7 +289,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -323,7 +322,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: Instance.WithAuthorizationToken(EmptyCTX, integration.UserTypeOrgOwner), dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -353,7 +352,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: projectOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -383,7 +382,7 @@ func TestServer_ListAuthorizations(t *testing.T) { args: args{ ctx: projectGrantOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -455,7 +454,7 @@ func createAuthorizationForProject(ctx context.Context, instance *integration.In userResp, err := instance.Client.UserV2.GetUserByID(ctx, &user.GetUserByIDRequest{UserId: userID}) require.NoError(t, err) - userGrantResp := instance.CreateProjectUserGrant(t, ctx, projectID, userID) + userGrantResp := instance.CreateProjectUserGrant(t, ctx, orgID, projectID, userID) return &authorization.Authorization{ Id: userGrantResp.GetUserGrantId(), ProjectId: projectID, @@ -477,7 +476,7 @@ func createAuthorizationForProject(ctx context.Context, instance *integration.In func createAuthorizationWithProjectGrant(ctx context.Context, instance *integration.Instance, t *testing.T, orgID, userID, projectName, projectID string) *authorization.Authorization { grantedOrgName := integration.OrganizationName() - grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, gofakeit.Email()) + grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, integration.Email()) instance.CreateProjectGrant(ctx, t, projectID, grantedOrg.GetOrganizationId()) return createAuthorizationForProjectGrant(ctx, instance, t, orgID, userID, projectName, projectID, grantedOrg.GetOrganizationId()) @@ -528,7 +527,7 @@ func createProject(ctx context.Context, instance *integration.Instance, t *testi func createGrantedProject(ctx context.Context, instance *integration.Instance, t *testing.T, projectToGrant *project.Project) *project.Project { grantedOrgName := integration.OrganizationName() - grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, gofakeit.Email()) + grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, integration.Email()) projectGrantResp := instance.CreateProjectGrant(ctx, t, projectToGrant.GetId(), grantedOrg.GetOrganizationId()) return &project.Project{ @@ -581,7 +580,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: EmptyCTX, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -601,7 +600,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: InstancePermissionV2.WithAuthorizationToken(EmptyCTX, integration.UserTypeNoPermission), dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -649,7 +648,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -677,7 +676,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) resp := createAuthorization(iamOwnerCtx, InstancePermissionV2, t, InstancePermissionV2.DefaultOrg.GetId(), userResp.GetId(), false) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_AuthorizationIds{ @@ -706,7 +705,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) resp := createAuthorization(iamOwnerCtx, InstancePermissionV2, t, InstancePermissionV2.DefaultOrg.GetId(), userResp.GetId(), false) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectId{ @@ -735,7 +734,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) resp := createAuthorization(iamOwnerCtx, InstancePermissionV2, t, InstancePermissionV2.DefaultOrg.GetId(), userResp.GetId(), false) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectName{ @@ -765,7 +764,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -793,7 +792,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) resp := createAuthorization(iamOwnerCtx, InstancePermissionV2, t, InstancePermissionV2.DefaultOrg.GetId(), userResp.GetId(), true) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectGrantId{ @@ -822,7 +821,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -855,7 +854,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: InstancePermissionV2.WithAuthorizationToken(EmptyCTX, integration.UserTypeOrgOwner), dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -885,7 +884,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: projectOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ @@ -915,7 +914,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) { args: args{ ctx: projectGrantOwnerCtx, dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) { - userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{ UserId: &filter.IDFilter{ diff --git a/internal/api/grpc/idp/v2/integration_test/query_test.go b/internal/api/grpc/idp/v2/integration_test/query_test.go index 2c4be8a73b2..bdbd4946827 100644 --- a/internal/api/grpc/idp/v2/integration_test/query_test.go +++ b/internal/api/grpc/idp/v2/integration_test/query_test.go @@ -4,11 +4,9 @@ package idp_test import ( "context" - "fmt" "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/timestamppb" @@ -68,7 +66,7 @@ func TestServer_GetIDPByID(t *testing.T) { IamCTX, &idp.GetIDPByIDRequest{}, func(ctx context.Context, request *idp.GetIDPByIDRequest) *idpAttr { - name := fmt.Sprintf("GetIDPByID-%s", gofakeit.AppName()) + name := integration.IDPName() resp := Instance.AddGenericOAuthProvider(ctx, name) request.Id = resp.Id return &idpAttr{ @@ -117,7 +115,7 @@ func TestServer_GetIDPByID(t *testing.T) { UserCTX, &idp.GetIDPByIDRequest{}, func(ctx context.Context, request *idp.GetIDPByIDRequest) *idpAttr { - name := fmt.Sprintf("GetIDPByID-%s", gofakeit.AppName()) + name := integration.IDPName() resp := Instance.AddGenericOAuthProvider(IamCTX, name) request.Id = resp.Id return &idpAttr{ @@ -139,7 +137,7 @@ func TestServer_GetIDPByID(t *testing.T) { CTX, &idp.GetIDPByIDRequest{}, func(ctx context.Context, request *idp.GetIDPByIDRequest) *idpAttr { - name := fmt.Sprintf("GetIDPByID-%s", gofakeit.AppName()) + name := integration.IDPName() resp := Instance.AddOrgGenericOAuthProvider(ctx, name) request.Id = resp.Id return &idpAttr{ @@ -188,7 +186,7 @@ func TestServer_GetIDPByID(t *testing.T) { UserCTX, &idp.GetIDPByIDRequest{}, func(ctx context.Context, request *idp.GetIDPByIDRequest) *idpAttr { - name := fmt.Sprintf("GetIDPByID-%s", gofakeit.AppName()) + name := integration.IDPName() resp := Instance.AddOrgGenericOAuthProvider(CTX, name) request.Id = resp.Id return &idpAttr{ diff --git a/internal/api/grpc/instance/v2beta/integration_test/domain_test.go b/internal/api/grpc/instance/v2beta/integration_test/domain_test.go index a0e2011cfc2..fa6b175ca31 100644 --- a/internal/api/grpc/instance/v2beta/integration_test/domain_test.go +++ b/internal/api/grpc/instance/v2beta/integration_test/domain_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" @@ -45,7 +44,7 @@ func TestAddCustomDomain(t *testing.T) { testName: "when invalid context should return unauthN error", inputRequest: &instance.AddCustomDomainRequest{ InstanceId: inst.ID(), - Domain: gofakeit.DomainName(), + Domain: integration.DomainName(), }, inputContext: context.Background(), expectedErrorCode: codes.Unauthenticated, @@ -55,7 +54,7 @@ func TestAddCustomDomain(t *testing.T) { testName: "when unauthZ context should return unauthZ error", inputRequest: &instance.AddCustomDomainRequest{ InstanceId: inst.ID(), - Domain: gofakeit.DomainName(), + Domain: integration.DomainName(), }, inputContext: iamOwnerCtx, expectedErrorCode: codes.PermissionDenied, @@ -75,7 +74,7 @@ func TestAddCustomDomain(t *testing.T) { testName: "when valid request should return successful response", inputRequest: &instance.AddCustomDomainRequest{ InstanceId: inst.ID(), - Domain: " " + gofakeit.DomainName(), + Domain: " " + integration.DomainName(), }, inputContext: ctxWithSysAuthZ, }, @@ -115,7 +114,7 @@ func TestRemoveCustomDomain(t *testing.T) { inst := integration.NewInstance(ctxWithSysAuthZ) iamOwnerCtx := inst.WithAuthorization(context.Background(), integration.UserTypeIAMOwner) - customDomain := gofakeit.DomainName() + customDomain := integration.DomainName() _, err := inst.Client.InstanceV2Beta.AddCustomDomain(ctxWithSysAuthZ, &instance.AddCustomDomainRequest{InstanceId: inst.ID(), Domain: customDomain}) require.Nil(t, err) @@ -245,7 +244,7 @@ func TestAddTrustedDomain(t *testing.T) { testName: "when valid request should return successful response", inputRequest: &instance.AddTrustedDomainRequest{ InstanceId: inst.ID(), - Domain: " " + gofakeit.DomainName(), + Domain: " " + integration.DomainName(), }, inputContext: ctxWithSysAuthZ, }, @@ -285,7 +284,7 @@ func TestRemoveTrustedDomain(t *testing.T) { inst := integration.NewInstance(ctxWithSysAuthZ) orgOwnerCtx := inst.WithAuthorization(context.Background(), integration.UserTypeOrgOwner) - trustedDomain := gofakeit.DomainName() + trustedDomain := integration.DomainName() _, err := inst.Client.InstanceV2Beta.AddTrustedDomain(ctxWithSysAuthZ, &instance.AddTrustedDomainRequest{InstanceId: inst.ID(), Domain: trustedDomain}) require.Nil(t, err) diff --git a/internal/api/grpc/instance/v2beta/integration_test/query_test.go b/internal/api/grpc/instance/v2beta/integration_test/query_test.go index e59a16a932c..90c23dfd831 100644 --- a/internal/api/grpc/instance/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/instance/v2beta/integration_test/query_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" @@ -187,7 +186,7 @@ func TestListCustomDomains(t *testing.T) { inst := integration.NewInstance(ctxWithSysAuthZ) orgOwnerCtx := inst.WithAuthorization(context.Background(), integration.UserTypeOrgOwner) - d1, d2 := "custom."+gofakeit.DomainName(), "custom."+gofakeit.DomainName() + d1, d2 := "custom."+integration.DomainName(), "custom."+integration.DomainName() _, err := inst.Client.InstanceV2Beta.AddCustomDomain(ctxWithSysAuthZ, &instance.AddCustomDomainRequest{InstanceId: inst.ID(), Domain: d1}) require.Nil(t, err) @@ -256,21 +255,24 @@ func TestListCustomDomains(t *testing.T) { for _, tc := range tt { t.Run(tc.testName, func(t *testing.T) { - // Test - res, err := inst.Client.InstanceV2Beta.ListCustomDomains(tc.inputContext, tc.inputRequest) + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tc.inputContext, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + // Test + res, err := inst.Client.InstanceV2Beta.ListCustomDomains(tc.inputContext, tc.inputRequest) - // Verify - assert.Equal(t, tc.expectedErrorCode, status.Code(err)) - assert.Equal(t, tc.expectedErrorMsg, status.Convert(err).Message()) + // Verify + assert.Equal(collect, tc.expectedErrorCode, status.Code(err)) + assert.Equal(collect, tc.expectedErrorMsg, status.Convert(err).Message()) - if tc.expectedErrorMsg == "" { - domains := []string{} - for _, d := range res.GetDomains() { - domains = append(domains, d.GetDomain()) + if tc.expectedErrorMsg == "" { + domains := []string{} + for _, d := range res.GetDomains() { + domains = append(domains, d.GetDomain()) + } + + assert.Subset(collect, domains, tc.expectedDomains) } - - assert.Subset(t, domains, tc.expectedDomains) - } + }, retryDuration, tick) }) } } @@ -286,7 +288,7 @@ func TestListTrustedDomains(t *testing.T) { inst := integration.NewInstance(ctxWithSysAuthZ) orgOwnerCtx := inst.WithAuthorization(context.Background(), integration.UserTypeOrgOwner) - d1, d2 := "trusted."+gofakeit.DomainName(), "trusted."+gofakeit.DomainName() + d1, d2 := "trusted."+integration.DomainName(), "trusted."+integration.DomainName() _, err := inst.Client.InstanceV2Beta.AddTrustedDomain(ctxWithSysAuthZ, &instance.AddTrustedDomainRequest{InstanceId: inst.ID(), Domain: d1}) require.Nil(t, err) @@ -348,23 +350,26 @@ func TestListTrustedDomains(t *testing.T) { for _, tc := range tt { t.Run(tc.testName, func(t *testing.T) { - // Test - res, err := inst.Client.InstanceV2Beta.ListTrustedDomains(tc.inputContext, tc.inputRequest) + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tc.inputContext, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + // Test + res, err := inst.Client.InstanceV2Beta.ListTrustedDomains(tc.inputContext, tc.inputRequest) - // Verify - assert.Equal(t, tc.expectedErrorCode, status.Code(err)) - assert.Equal(t, tc.expectedErrorMsg, status.Convert(err).Message()) + // Verify + assert.Equal(collect, tc.expectedErrorCode, status.Code(err)) + assert.Equal(collect, tc.expectedErrorMsg, status.Convert(err).Message()) - if tc.expectedErrorMsg == "" { - require.NotNil(t, res) + if tc.expectedErrorMsg == "" { + require.NotNil(t, res) - domains := []string{} - for _, d := range res.GetTrustedDomain() { - domains = append(domains, d.GetDomain()) + domains := []string{} + for _, d := range res.GetTrustedDomain() { + domains = append(domains, d.GetDomain()) + } + + assert.Subset(collect, domains, tc.expectedDomains) } - - assert.Subset(t, domains, tc.expectedDomains) - } + }, retryDuration, tick) }) } } diff --git a/internal/api/grpc/internal_permission/v2beta/integration_test/administrator_test.go b/internal/api/grpc/internal_permission/v2beta/integration_test/administrator_test.go index 5dc57901634..3432f5fd359 100644 --- a/internal/api/grpc/internal_permission/v2beta/integration_test/administrator_test.go +++ b/internal/api/grpc/internal_permission/v2beta/integration_test/administrator_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/integration" @@ -69,7 +68,7 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "already existing, error", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -87,7 +86,7 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "instance, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -106,7 +105,7 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "instance, not existing roles", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -123,7 +122,7 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "org, not existing", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -140,7 +139,7 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "org, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -159,7 +158,7 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "org, no existing roles", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -176,7 +175,7 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "project, not existing", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -193,7 +192,7 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "project, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.UserId = userResp.GetId() @@ -214,7 +213,7 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "project, not existing roles", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.UserId = userResp.GetId() @@ -233,7 +232,7 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "project grant, not existing", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.UserId = userResp.GetId() request.Resource = &internal_permission.ResourceType{ @@ -254,9 +253,9 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "project grant, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) request.UserId = userResp.GetId() @@ -280,9 +279,9 @@ func TestServer_CreateAdministrator(t *testing.T) { name: "project grant, not existing roles", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) request.UserId = userResp.GetId() @@ -321,7 +320,7 @@ func TestServer_CreateAdministrator(t *testing.T) { func TestServer_CreateAdministrator_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) userProjectResp := instance.CreateMachineUser(iamOwnerCtx) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) @@ -350,7 +349,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "unauthenticated", ctx: CTX, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -367,7 +366,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -384,7 +383,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "instance, missing permission, org owner", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -401,7 +400,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "instance, instance owner, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -420,7 +419,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "org, instance owner, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -439,7 +438,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "org, org owner, ok", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -458,7 +457,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "org, missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.CreateAdministratorRequest{ @@ -475,7 +474,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "project, project owner, ok", ctx: projectOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, @@ -495,7 +494,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "project, missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, @@ -513,7 +512,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "project grant, project grant owner, ok", ctx: projectGrantOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, @@ -536,7 +535,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { name: "project grant, missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.CreateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, @@ -640,7 +639,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "instance, no change", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -661,7 +660,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "instance, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -682,7 +681,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "instance, not existing roles", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -700,7 +699,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "org, not existing", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.UpdateAdministratorRequest{ @@ -717,7 +716,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "org, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -738,7 +737,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "org, no change", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -759,7 +758,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "org, no existing roles", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -777,7 +776,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "project, not existing", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() }, req: &internal_permission.UpdateAdministratorRequest{ @@ -794,7 +793,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "project, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) @@ -817,7 +816,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "project, no change", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) @@ -840,7 +839,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "project, not existing roles", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) @@ -860,9 +859,9 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "project grant, not existing", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) request.UserId = userResp.GetId() @@ -884,9 +883,9 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "project grant, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) @@ -912,9 +911,9 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "project grant, no change", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) @@ -940,9 +939,9 @@ func TestServer_UpdateAdministrator(t *testing.T) { name: "project grant, not existing roles", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) request.UserId = userResp.GetId() @@ -985,7 +984,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { func TestServer_UpdateAdministrator_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) userProjectResp := instance.CreateMachineUser(iamOwnerCtx) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) @@ -1014,7 +1013,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "unauthenticated", ctx: CTX, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1032,7 +1031,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1050,7 +1049,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "instance, missing permission, org owner", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1068,7 +1067,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "instance, instance owner, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1088,7 +1087,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "org, instance owner, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1108,7 +1107,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "org, org owner, ok", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1128,7 +1127,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "org, missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1146,7 +1145,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "project, project owner, ok", ctx: projectOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1166,7 +1165,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "project, missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1184,7 +1183,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "project grant, project grant owner, ok", ctx: projectGrantOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1207,7 +1206,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "project grant, missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1228,7 +1227,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { name: "project grant, project owner, error", ctx: projectOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1305,7 +1304,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() return creationDate, time.Now().UTC() }, @@ -1323,7 +1322,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) instance.DeleteInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() @@ -1343,7 +1342,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() return creationDate, time.Time{} @@ -1362,7 +1361,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() return creationDate, time.Now().UTC() }, @@ -1380,7 +1379,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) request.UserId = userResp.GetId() return creationDate, time.Time{} @@ -1399,7 +1398,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) instance.DeleteOrgMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() @@ -1419,7 +1418,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) request.UserId = userResp.GetId() return creationDate, time.Now().UTC() }, @@ -1437,7 +1436,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) @@ -1457,7 +1456,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) instance.DeleteProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) @@ -1478,9 +1477,9 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) request.UserId = userResp.GetId() @@ -1502,9 +1501,9 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) @@ -1527,9 +1526,9 @@ func TestServer_DeleteAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) instance.DeleteProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) @@ -1568,7 +1567,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { func TestServer_DeleteAdministrator_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) userProjectResp := instance.CreateMachineUser(iamOwnerCtx) projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) @@ -1597,7 +1596,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "unauthenticated", ctx: CTX, prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1614,7 +1613,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1631,7 +1630,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "instance, missing permission, org owner", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1648,7 +1647,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "instance, instance owner, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1667,7 +1666,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "org, instance owner, ok", ctx: iamOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1686,7 +1685,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "org, org owner, ok", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1705,7 +1704,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "org, missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1722,7 +1721,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "project, project owner, ok", ctx: projectOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1741,7 +1740,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "project, missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1758,7 +1757,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "project grant, project grant owner, ok", ctx: projectGrantOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1780,7 +1779,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "project grant, missing permission", ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) request.UserId = userResp.GetId() }, @@ -1800,7 +1799,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { name: "project grant, project owner, error", ctx: projectOwnerCtx, prepare: func(request *internal_permission.DeleteAdministratorRequest) { - userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) + userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) request.UserId = userResp.GetId() }, diff --git a/internal/api/grpc/internal_permission/v2beta/integration_test/query_test.go b/internal/api/grpc/internal_permission/v2beta/integration_test/query_test.go index a7a5f10efeb..687d4de2fa9 100644 --- a/internal/api/grpc/internal_permission/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/internal_permission/v2beta/integration_test/query_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -19,9 +18,9 @@ import ( func TestServer_ListAdministrators(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - projectName := gofakeit.AppName() + projectName := integration.ProjectName() projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), projectName, false, false) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) userProjectResp := instance.CreateMachineUser(iamOwnerCtx) @@ -551,7 +550,7 @@ func assertPaginationResponse(t *assert.CollectT, expected *filter.PaginationRes } func createInstanceAdministrator(ctx context.Context, instance *integration.Instance, t *testing.T) *internal_permission.Administrator { - email := gofakeit.Email() + email := integration.Email() userResp := instance.CreateUserTypeHuman(ctx, email) memberResp := instance.CreateInstanceMembership(t, ctx, userResp.GetId()) return &internal_permission.Administrator{ @@ -571,7 +570,7 @@ func createInstanceAdministrator(ctx context.Context, instance *integration.Inst } func createOrganizationAdministrator(ctx context.Context, instance *integration.Instance, t *testing.T) *internal_permission.Administrator { - email := gofakeit.Email() + email := integration.Email() userResp := instance.CreateUserTypeHuman(ctx, email) memberResp := instance.CreateOrgMembership(t, ctx, instance.DefaultOrg.Id, userResp.GetId()) return &internal_permission.Administrator{ @@ -594,7 +593,7 @@ func createOrganizationAdministrator(ctx context.Context, instance *integration. } func createProjectAdministrator(ctx context.Context, instance *integration.Instance, t *testing.T, orgID, projectID, projectName string) *internal_permission.Administrator { - email := gofakeit.Email() + email := integration.Email() userResp := instance.CreateUserTypeHuman(ctx, email) memberResp := instance.CreateProjectMembership(t, ctx, projectID, userResp.GetId()) return &internal_permission.Administrator{ @@ -618,7 +617,7 @@ func createProjectAdministrator(ctx context.Context, instance *integration.Insta } func createProjectGrantAdministrator(ctx context.Context, instance *integration.Instance, t *testing.T, orgID, projectID, projectName, grantedOrgID string) *internal_permission.Administrator { - email := gofakeit.Email() + email := integration.Email() userResp := instance.CreateUserTypeHuman(ctx, email) memberResp := instance.CreateProjectGrantMembership(t, ctx, projectID, grantedOrgID, userResp.GetId()) return &internal_permission.Administrator{ @@ -650,7 +649,7 @@ func TestServer_ListAdministrators_PermissionV2(t *testing.T) { projectName := integration.ProjectName() projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), projectName, false, false) - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) instancePermissionV2.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) userProjectResp := instancePermissionV2.CreateMachineUser(iamOwnerCtx) diff --git a/internal/api/grpc/management/integration_test/app_key_test.go b/internal/api/grpc/management/integration_test/app_key_test.go index a08c5527095..57421b60c0e 100644 --- a/internal/api/grpc/management/integration_test/app_key_test.go +++ b/internal/api/grpc/management/integration_test/app_key_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/timestamppb" @@ -20,7 +19,7 @@ import ( func TestServer_ListAppKeys(t *testing.T) { // create project - prjName := gofakeit.Name() + prjName := integration.ProjectName() createPrjRes, err := Instance.Client.Projectv2Beta.CreateProject(IAMOwnerCTX, &project.CreateProjectRequest{ Name: prjName, OrganizationId: Instance.DefaultOrg.Id, @@ -31,7 +30,7 @@ func TestServer_ListAppKeys(t *testing.T) { // add app to project createAppjRes, err := Instance.Client.AppV2Beta.CreateApplication(IAMOwnerCTX, &app.CreateApplicationRequest{ ProjectId: prjId, - Name: gofakeit.Name(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{ AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT, @@ -53,7 +52,7 @@ func TestServer_ListAppKeys(t *testing.T) { // add other app to project createOtherAppjRes, err := Instance.Client.AppV2Beta.CreateApplication(IAMOwnerCTX, &app.CreateApplicationRequest{ ProjectId: prjId, - Name: gofakeit.Name(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{ AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT, @@ -89,19 +88,19 @@ func TestServer_ListAppKeys(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTX, time.Minute) - assert.EventuallyWithT(t, func(ct *assert.CollectT) { - expectedKeyIds := tt.expectedKeyIdsFunc() + expectedKeyIds := tt.expectedKeyIdsFunc() + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTX, time.Minute) + require.EventuallyWithT(t, func(ct *assert.CollectT) { res, err := Client.ListAppKeys(IAMOwnerCTX, &management.ListAppKeysRequest{ AppId: appId, ProjectId: prjId, }) - require.NoError(t, err) - assert.Equal(t, len(expectedKeyIds), len(res.GetResult())) + require.NoError(ct, err) + assert.Equal(ct, len(expectedKeyIds), len(res.GetResult())) for _, key := range res.GetResult() { - assert.True(t, slices.Contains(expectedKeyIds, key.Id)) + assert.True(ct, slices.Contains(expectedKeyIds, key.Id)) } }, retryDuration, tick) }) diff --git a/internal/api/grpc/management/integration_test/org_test.go b/internal/api/grpc/management/integration_test/org_test.go index 46693f14d7e..c0a0a0621e7 100644 --- a/internal/api/grpc/management/integration_test/org_test.go +++ b/internal/api/grpc/management/integration_test/org_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/timestamppb" @@ -39,7 +38,7 @@ func TestServer_ListOrgMemberRoles(t *testing.T) { } func TestServer_ListOrgMembers(t *testing.T) { - user := Instance.CreateHumanUserVerified(OrgCTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(OrgCTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()) _, err := Client.AddOrgMember(OrgCTX, &mgmt_pb.AddOrgMemberRequest{ UserId: user.GetUserId(), Roles: iamRoles[1:], @@ -120,7 +119,7 @@ func TestServer_ListOrgMembers(t *testing.T) { } func TestServer_AddOrgMember(t *testing.T) { - user := Instance.CreateHumanUserVerified(OrgCTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(OrgCTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()) type args struct { ctx context.Context req *mgmt_pb.AddOrgMemberRequest @@ -194,7 +193,7 @@ func TestServer_AddOrgMember(t *testing.T) { } func TestServer_UpdateOrgMember(t *testing.T) { - user := Instance.CreateHumanUserVerified(OrgCTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(OrgCTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()) _, err := Client.AddOrgMember(OrgCTX, &mgmt_pb.AddOrgMemberRequest{ UserId: user.GetUserId(), Roles: []string{"ORG_OWNER"}, @@ -275,7 +274,7 @@ func TestServer_UpdateOrgMember(t *testing.T) { } func TestServer_RemoveIAMMember(t *testing.T) { - user := Instance.CreateHumanUserVerified(OrgCTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(OrgCTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()) _, err := Client.AddOrgMember(OrgCTX, &mgmt_pb.AddOrgMemberRequest{ UserId: user.GetUserId(), Roles: []string{"ORG_OWNER"}, diff --git a/internal/api/grpc/oidc/v2/integration_test/oidc_test.go b/internal/api/grpc/oidc/v2/integration_test/oidc_test.go index c725231e3a0..f4f99cd7879 100644 --- a/internal/api/grpc/oidc/v2/integration_test/oidc_test.go +++ b/internal/api/grpc/oidc/v2/integration_test/oidc_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -18,6 +17,7 @@ import ( "github.com/zitadel/zitadel/internal/integration" "github.com/zitadel/zitadel/pkg/grpc/app" + mgmt "github.com/zitadel/zitadel/pkg/grpc/management" "github.com/zitadel/zitadel/pkg/grpc/object/v2" oidc_pb "github.com/zitadel/zitadel/pkg/grpc/oidc/v2" "github.com/zitadel/zitadel/pkg/grpc/session/v2" @@ -387,10 +387,10 @@ func TestServer_CreateCallback_Permission(t *testing.T) { projectID, clientID := createOIDCApplication(ctx, t, true, true) projectID2, _ := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID2, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -402,10 +402,10 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -423,10 +423,10 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectGrantUserGrant(ctx, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectGrantUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -444,8 +444,8 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { _, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -468,9 +468,9 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -482,7 +482,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) user := Instance.CreateHumanUser(ctx) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -500,7 +500,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) user := Instance.CreateHumanUser(ctx) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -528,9 +528,9 @@ func TestServer_CreateCallback_Permission(t *testing.T) { ctx: CTXLoginClient, dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -547,8 +547,8 @@ func TestServer_CreateCallback_Permission(t *testing.T) { ctx: CTXLoginClient, dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { _, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -560,10 +560,11 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectGrantUserGrant(ctx, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + + createProjectGrantUserGrant(ctx, t, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, want: &oidc_pb.CreateCallbackResponse{ @@ -580,9 +581,9 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, wantErr: true, @@ -609,8 +610,8 @@ func TestServer_CreateCallback_Permission(t *testing.T) { ctx: CTXLoginClient, dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { _, clientID := createOIDCApplication(ctx, t, false, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -622,9 +623,9 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, false, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -753,7 +754,7 @@ func TestServer_AuthorizeOrDenyDeviceAuthorization(t *testing.T) { resp, err := Instance.Client.OIDCv2.GetDeviceAuthorizationRequest(CTXLoginClient, &oidc_pb.GetDeviceAuthorizationRequestRequest{ UserCode: req.UserCode, }) - assert.NoError(t, err) + assert.NoError(collectT, err) id = resp.GetDeviceAuthorizationRequest().GetId() }, 5*time.Second, 100*time.Millisecond) return id @@ -937,3 +938,29 @@ func createOIDCApplication(ctx context.Context, t *testing.T, projectRoleCheck, require.NoError(t, err) return project.GetId(), clientV2.GetClientId() } + +func createProjectUserGrant(ctx context.Context, t *testing.T, orgID, projectID, userID string) { + resp := Instance.CreateProjectUserGrant(t, ctx, orgID, projectID, userID) + + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + _, err := Instance.Client.Mgmt.GetUserGrantByID(integration.SetOrgID(ctx, orgID), &mgmt.GetUserGrantByIDRequest{ + UserId: userID, + GrantId: resp.GetUserGrantId(), + }) + assert.NoError(collect, err) + }, retryDuration, tick) +} + +func createProjectGrantUserGrant(ctx context.Context, t *testing.T, orgID, projectID, projectGrantID, userID string) { + resp := Instance.CreateProjectGrantUserGrant(ctx, orgID, projectID, projectGrantID, userID) + + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + _, err := Instance.Client.Mgmt.GetUserGrantByID(integration.SetOrgID(ctx, orgID), &mgmt.GetUserGrantByIDRequest{ + UserId: userID, + GrantId: resp.GetUserGrantId(), + }) + assert.NoError(collect, err) + }, retryDuration, tick) +} diff --git a/internal/api/grpc/oidc/v2beta/integration_test/oidc_test.go b/internal/api/grpc/oidc/v2beta/integration_test/oidc_test.go index 4e4023b8e57..1ad63cea1de 100644 --- a/internal/api/grpc/oidc/v2beta/integration_test/oidc_test.go +++ b/internal/api/grpc/oidc/v2beta/integration_test/oidc_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -17,13 +16,14 @@ import ( "github.com/zitadel/zitadel/internal/integration" "github.com/zitadel/zitadel/pkg/grpc/app" + mgmt "github.com/zitadel/zitadel/pkg/grpc/management" object "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" oidc_pb "github.com/zitadel/zitadel/pkg/grpc/oidc/v2beta" session "github.com/zitadel/zitadel/pkg/grpc/session/v2beta" ) func TestServer_GetAuthRequest(t *testing.T) { - project := Instance.CreateProject(CTX, t, "", gofakeit.AppName(), false, false) + project := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) client, err := Instance.CreateOIDCNativeClient(CTX, redirectURI, logoutRedirectURI, project.GetId(), false) require.NoError(t, err) @@ -96,7 +96,7 @@ func TestServer_GetAuthRequest(t *testing.T) { } func TestServer_CreateCallback(t *testing.T) { - project := Instance.CreateProject(CTX, t, "", gofakeit.AppName(), false, false) + project := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) client, err := Instance.CreateOIDCNativeClient(CTX, redirectURI, logoutRedirectURI, project.GetId(), false) require.NoError(t, err) clientV2, err := Instance.CreateOIDCClientLoginVersion(CTX, redirectURI, logoutRedirectURI, project.GetId(), app.OIDCAppType_OIDC_APP_TYPE_NATIVE, app.OIDCAuthMethodType_OIDC_AUTH_METHOD_TYPE_NONE, false, loginV2) @@ -388,10 +388,10 @@ func TestServer_CreateCallback_Permission(t *testing.T) { projectID, clientID := createOIDCApplication(ctx, t, true, true) projectID2, _ := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID2, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -403,10 +403,10 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -424,10 +424,10 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectGrantUserGrant(ctx, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectGrantUserGrant(ctx, t, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -445,8 +445,8 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { _, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -469,9 +469,9 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -483,7 +483,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, true) user := Instance.CreateHumanUser(ctx) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -501,7 +501,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) user := Instance.CreateHumanUser(ctx) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -529,9 +529,9 @@ func TestServer_CreateCallback_Permission(t *testing.T) { ctx: CTXLoginClient, dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -548,8 +548,8 @@ func TestServer_CreateCallback_Permission(t *testing.T) { ctx: CTXLoginClient, dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { _, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -561,10 +561,10 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectGrantUserGrant(ctx, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectGrantUserGrant(ctx, t, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, want: &oidc_pb.CreateCallbackResponse{ @@ -581,9 +581,9 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, wantErr: true, @@ -610,8 +610,8 @@ func TestServer_CreateCallback_Permission(t *testing.T) { ctx: CTXLoginClient, dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { _, clientID := createOIDCApplication(ctx, t, false, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -623,9 +623,9 @@ func TestServer_CreateCallback_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *oidc_pb.CreateCallbackRequest { projectID, clientID := createOIDCApplication(ctx, t, false, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) }, @@ -686,8 +686,34 @@ func createSessionAndAuthRequestForCallback(ctx context.Context, t *testing.T, c } func createOIDCApplication(ctx context.Context, t *testing.T, projectRoleCheck, hasProjectCheck bool) (string, string) { - project := Instance.CreateProject(ctx, t, "", gofakeit.AppName(), projectRoleCheck, hasProjectCheck) + project := Instance.CreateProject(ctx, t, "", integration.ProjectName(), projectRoleCheck, hasProjectCheck) clientV2, err := Instance.CreateOIDCClientLoginVersion(ctx, redirectURI, logoutRedirectURI, project.GetId(), app.OIDCAppType_OIDC_APP_TYPE_NATIVE, app.OIDCAuthMethodType_OIDC_AUTH_METHOD_TYPE_NONE, false, loginV2) require.NoError(t, err) return project.GetId(), clientV2.GetClientId() } + +func createProjectUserGrant(ctx context.Context, t *testing.T, orgID, projectID, userID string) { + resp := Instance.CreateProjectUserGrant(t, ctx, orgID, projectID, userID) + + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + _, err := Instance.Client.Mgmt.GetUserGrantByID(integration.SetOrgID(ctx, orgID), &mgmt.GetUserGrantByIDRequest{ + UserId: userID, + GrantId: resp.GetUserGrantId(), + }) + assert.NoError(collect, err) + }, retryDuration, tick) +} + +func createProjectGrantUserGrant(ctx context.Context, t *testing.T, orgID, projectID, projectGrantID, userID string) { + resp := Instance.CreateProjectGrantUserGrant(ctx, orgID, projectID, projectGrantID, userID) + + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + _, err := Instance.Client.Mgmt.GetUserGrantByID(integration.SetOrgID(ctx, orgID), &mgmt.GetUserGrantByIDRequest{ + UserId: userID, + GrantId: resp.GetUserGrantId(), + }) + assert.NoError(collect, err) + }, retryDuration, tick) +} diff --git a/internal/api/grpc/org/v2/integration_test/org_test.go b/internal/api/grpc/org/v2/integration_test/org_test.go index fa31d7c10c8..1f4b6585c82 100644 --- a/internal/api/grpc/org/v2/integration_test/org_test.go +++ b/internal/api/grpc/org/v2/integration_test/org_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -108,7 +107,7 @@ func TestServer_AddOrganization(t *testing.T) { FamilyName: "lastname", }, Email: &user.SetHumanEmail{ - Email: gofakeit.Email(), + Email: integration.Email(), Verification: &user.SetHumanEmail_ReturnCode{ ReturnCode: &user.ReturnEmailVerificationCode{}, }, @@ -146,7 +145,7 @@ func TestServer_AddOrganization(t *testing.T) { FamilyName: "lastname", }, Email: &user.SetHumanEmail{ - Email: gofakeit.Email(), + Email: integration.Email(), Verification: &user.SetHumanEmail_IsVerified{ IsVerified: true, }, diff --git a/internal/api/grpc/org/v2/integration_test/query_test.go b/internal/api/grpc/org/v2/integration_test/query_test.go index 680bb643f7e..d7acf45121f 100644 --- a/internal/api/grpc/org/v2/integration_test/query_test.go +++ b/internal/api/grpc/org/v2/integration_test/query_test.go @@ -4,14 +4,12 @@ package org_test import ( "context" - "fmt" "slices" "strconv" "strings" "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/timestamppb" @@ -29,7 +27,7 @@ type orgAttr struct { } func createOrganization(ctx context.Context, name string) orgAttr { - orgResp := Instance.CreateOrganization(ctx, name, gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, name, integration.Email()) orgResp.Details.CreationDate = orgResp.Details.ChangeDate return orgAttr{ ID: orgResp.GetOrganizationId(), @@ -180,8 +178,8 @@ func TestServer_ListOrganizations(t *testing.T) { &org.ListOrganizationsRequest{}, func(ctx context.Context, request *org.ListOrganizationsRequest) ([]orgAttr, error) { orgs := make([]orgAttr, 1) - name := fmt.Sprintf("ListOrgs-%s", gofakeit.AppName()) - orgID := gofakeit.Company() + name := integration.OrganizationName() + orgID := integration.ID() orgs[0] = createOrganizationWithCustomOrgID(ctx, name, orgID) request.Queries = []*org.SearchQuery{ OrganizationIdQuery(orgID), @@ -276,7 +274,7 @@ func TestServer_ListOrganizations(t *testing.T) { func(ctx context.Context, request *org.ListOrganizationsRequest) ([]orgAttr, error) { orgs := make([]orgAttr, 1) orgs[0] = createOrganization(ctx, integration.OrganizationName()) - domain := gofakeit.DomainName() + domain := integration.DomainName() _, err := Instance.Client.Mgmt.AddOrgDomain(integration.SetOrgID(ctx, orgs[0].ID), &management.AddOrgDomainRequest{ Domain: domain, }) diff --git a/internal/api/grpc/org/v2beta/integration_test/org_test.go b/internal/api/grpc/org/v2beta/integration_test/org_test.go index 066087ab71b..ba8157a7f21 100644 --- a/internal/api/grpc/org/v2beta/integration_test/org_test.go +++ b/internal/api/grpc/org/v2beta/integration_test/org_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -78,7 +77,7 @@ func TestServer_CreateOrganization(t *testing.T) { wantErr: true, }, func() test { - orgName := gofakeit.Name() + orgName := integration.OrganizationName() return test{ name: "adding org with same name twice", ctx: CTX, @@ -144,7 +143,7 @@ func TestServer_CreateOrganization(t *testing.T) { FamilyName: "lastname", }, Email: &user_v2beta.SetHumanEmail{ - Email: gofakeit.Email(), + Email: integration.Email(), Verification: &user_v2beta.SetHumanEmail_ReturnCode{ ReturnCode: &user_v2beta.ReturnEmailVerificationCode{}, }, @@ -186,7 +185,7 @@ func TestServer_CreateOrganization(t *testing.T) { FamilyName: "lastname", }, Email: &user_v2beta.SetHumanEmail{ - Email: gofakeit.Email(), + Email: integration.Email(), Verification: &user_v2beta.SetHumanEmail_IsVerified{ IsVerified: true, }, @@ -236,20 +235,20 @@ func TestServer_CreateOrganization(t *testing.T) { }, }, func() test { - orgID := gofakeit.Name() + orgID := integration.OrganizationName() return test{ name: "adding org with same ID twice", ctx: CTX, req: &v2beta_org.CreateOrganizationRequest{ Id: &orgID, - Name: gofakeit.Name(), + Name: integration.OrganizationName(), Admins: nil, }, testFunc: func(ctx context.Context, t *testing.T) { // create org initially _, err := Client.CreateOrganization(ctx, &v2beta_org.CreateOrganizationRequest{ Id: &orgID, - Name: gofakeit.Name(), + Name: integration.OrganizationName(), }) require.NoError(t, err) }, @@ -951,7 +950,7 @@ func TestServer_AddOrganizationDomain(t *testing.T) { }{ { name: "add org domain, happy path", - domain: gofakeit.URL(), + domain: integration.DomainName(), testFunc: func() string { orgs, _, _ := createOrgs(CTX, t, Client, 1) orgId := orgs[0].Id @@ -960,13 +959,13 @@ func TestServer_AddOrganizationDomain(t *testing.T) { }, { name: "add org domain, twice", - domain: gofakeit.URL(), + domain: integration.DomainName(), testFunc: func() string { // 1. create organization orgs, _, _ := createOrgs(CTX, t, Client, 1) orgId := orgs[0].Id - domain := gofakeit.URL() + domain := integration.DomainName() // 2. add domain addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ OrganizationId: orgId, @@ -999,7 +998,7 @@ func TestServer_AddOrganizationDomain(t *testing.T) { }, { name: "add org domain to non existent org", - domain: gofakeit.URL(), + domain: integration.DomainName(), testFunc: func() string { return "non-existing-org-id" }, @@ -1030,7 +1029,7 @@ func TestServer_AddOrganizationDomain(t *testing.T) { } func TestServer_AddOrganizationDomain_ClaimDomain(t *testing.T) { - domain := gofakeit.DomainName() + domain := integration.DomainName() // create an organization, ensure it has globally unique usernames // and create a user with a loginname that matches the domain later on @@ -1043,7 +1042,7 @@ func TestServer_AddOrganizationDomain_ClaimDomain(t *testing.T) { UserLoginMustBeDomain: false, }) require.NoError(t, err) - username := gofakeit.Username() + "@" + domain + username := integration.Username() + "@" + domain ownUser := Instance.CreateHumanUserVerified(CTX, organization.GetId(), username, "") // create another organization, ensure it has globally unique usernames @@ -1058,7 +1057,7 @@ func TestServer_AddOrganizationDomain_ClaimDomain(t *testing.T) { }) require.NoError(t, err) - otherUsername := gofakeit.Username() + "@" + domain + otherUsername := integration.Username() + "@" + domain otherUser := Instance.CreateHumanUserVerified(CTX, otherOrg.GetId(), otherUsername, "") // if we add the domain now to the first organization, it should be claimed on the second organization, resp. its user(s) @@ -1096,7 +1095,7 @@ func TestServer_AddOrganizationDomain_ClaimDomain(t *testing.T) { } func TestServer_ListOrganizationDomains(t *testing.T) { - domain := gofakeit.URL() + domain := integration.DomainName() tests := []struct { name string ctx context.Context @@ -1155,7 +1154,7 @@ func TestServer_ListOrganizationDomains(t *testing.T) { } func TestServer_DeleteOrganizationDomain(t *testing.T) { - domain := gofakeit.URL() + domain := integration.DomainName() tests := []struct { name string ctx context.Context @@ -1199,13 +1198,13 @@ func TestServer_DeleteOrganizationDomain(t *testing.T) { }, { name: "delete org domain, twice", - domain: gofakeit.URL(), + domain: integration.DomainName(), testFunc: func() string { // 1. create organization orgs, _, _ := createOrgs(CTX, t, Client, 1) orgId := orgs[0].Id - domain := gofakeit.URL() + domain := integration.DomainName() // 2. add domain addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ OrganizationId: orgId, @@ -1245,7 +1244,7 @@ func TestServer_DeleteOrganizationDomain(t *testing.T) { }, { name: "delete org domain to non existent org", - domain: gofakeit.URL(), + domain: integration.DomainName(), testFunc: func() string { return "non-existing-org-id" }, @@ -1285,7 +1284,7 @@ func TestServer_AddListDeleteOrganizationDomain(t *testing.T) { orgs, _, _ := createOrgs(CTX, t, Client, 1) orgId := orgs[0].Id - domain := gofakeit.URL() + domain := integration.DomainName() // 2. add domain addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ OrganizationId: orgId, @@ -1311,17 +1310,20 @@ func TestServer_AddListDeleteOrganizationDomain(t *testing.T) { // assert.WithinRange(t, gotCD, now.Add(-time.Minute), now.Add(time.Minute)) // 4. check domain is added - queryRes, err := Client.ListOrganizationDomains(CTX, &v2beta_org.ListOrganizationDomainsRequest{ - OrganizationId: orgId, - }) - require.NoError(t, err) - found := false - for _, res := range queryRes.Domains { - if res.DomainName == domain { - found = true + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(CTX, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + queryRes, err := Client.ListOrganizationDomains(CTX, &v2beta_org.ListOrganizationDomainsRequest{ + OrganizationId: orgId, + }) + require.NoError(collect, err) + found := false + for _, res := range queryRes.Domains { + if res.DomainName == domain { + found = true + } } - } - require.True(t, found, "unable to find added domain") + require.True(collect, found, "unable to find added domain") + }, retryDuration, tick) }, }, { @@ -1331,7 +1333,7 @@ func TestServer_AddListDeleteOrganizationDomain(t *testing.T) { orgs, _, _ := createOrgs(CTX, t, Client, 1) orgId := orgs[0].Id - domain := gofakeit.URL() + domain := integration.DomainName() // 2. add domain addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ OrganizationId: orgId, @@ -1417,7 +1419,7 @@ func TestServer_ValidateOrganizationDomain(t *testing.T) { require.NoError(t, err) } - domain := gofakeit.URL() + domain := integration.DomainName() _, err = Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ OrganizationId: orgId, Domain: domain, diff --git a/internal/api/grpc/project/v2beta/integration_test/project_grant_test.go b/internal/api/grpc/project/v2beta/integration_test/project_grant_test.go index b6b43229273..fae914377de 100644 --- a/internal/api/grpc/project/v2beta/integration_test/project_grant_test.go +++ b/internal/api/grpc/project/v2beta/integration_test/project_grant_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/zitadel/zitadel/internal/integration" @@ -16,7 +15,7 @@ import ( func TestServer_CreateProjectGrant(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type want struct { creationDate bool @@ -49,7 +48,7 @@ func TestServer_CreateProjectGrant(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { request.ProjectId = "something" - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -74,7 +73,7 @@ func TestServer_CreateProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -101,7 +100,7 @@ func TestServer_CreateProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -118,7 +117,7 @@ func TestServer_CreateProjectGrant(t *testing.T) { request.ProjectId = projectResp.GetId() request.RoleKeys = roles - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -137,7 +136,7 @@ func TestServer_CreateProjectGrant(t *testing.T) { request.RoleKeys = roles - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -167,7 +166,7 @@ func TestServer_CreateProjectGrant(t *testing.T) { func TestServer_CreateProjectGrant_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) userResp := instance.CreateMachineUser(iamOwnerCtx) patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId()) @@ -191,7 +190,7 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { ctx: CTX, prepare: func(request *project.CreateProjectGrantRequest) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) - grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId() @@ -204,7 +203,7 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *project.CreateProjectGrantRequest) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) - grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId() @@ -217,7 +216,7 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { ctx: projectOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) - grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId() @@ -231,7 +230,7 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { prepare: func(request *project.CreateProjectGrantRequest) { request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -244,7 +243,7 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.CreateProjectGrantRequest) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) - grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId() @@ -259,7 +258,7 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -272,7 +271,7 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) - grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId() @@ -316,7 +315,7 @@ func assertCreateProjectGrantResponse(t *testing.T, creationDate, changeDate tim func TestServer_UpdateProjectGrant(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -354,7 +353,7 @@ func TestServer_UpdateProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -375,7 +374,7 @@ func TestServer_UpdateProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() for _, role := range roles { instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "") @@ -399,7 +398,7 @@ func TestServer_UpdateProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -436,7 +435,7 @@ func TestServer_UpdateProjectGrant(t *testing.T) { func TestServer_UpdateProjectGrant_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) userResp := instance.CreateMachineUser(iamOwnerCtx) patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId()) @@ -466,7 +465,7 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -485,7 +484,7 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -523,7 +522,7 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -543,7 +542,7 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() for _, role := range roles { instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "") @@ -568,7 +567,7 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() for _, role := range roles { instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "") @@ -623,7 +622,7 @@ func assertUpdateProjectGrantResponse(t *testing.T, creationDate, changeDate tim func TestServer_DeleteProjectGrant(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) tests := []struct { name string @@ -667,7 +666,7 @@ func TestServer_DeleteProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -684,7 +683,7 @@ func TestServer_DeleteProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -702,7 +701,7 @@ func TestServer_DeleteProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -732,7 +731,7 @@ func TestServer_DeleteProjectGrant(t *testing.T) { func TestServer_DeleteProjectGrant_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) tests := []struct { name string @@ -749,7 +748,7 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -765,7 +764,7 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -782,7 +781,7 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -799,7 +798,7 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -816,7 +815,7 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -857,7 +856,7 @@ func assertDeleteProjectGrantResponse(t *testing.T, creationDate, deletionDate t func TestServer_DeactivateProjectGrant(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -880,7 +879,7 @@ func TestServer_DeactivateProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -910,7 +909,7 @@ func TestServer_DeactivateProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -931,7 +930,7 @@ func TestServer_DeactivateProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -968,7 +967,7 @@ func TestServer_DeactivateProjectGrant(t *testing.T) { func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -991,7 +990,7 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1008,7 +1007,7 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1025,7 +1024,7 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1042,7 +1041,7 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1062,7 +1061,7 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1111,7 +1110,7 @@ func assertDeactivateProjectGrantResponse(t *testing.T, creationDate, changeDate func TestServer_ActivateProjectGrant(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -1147,7 +1146,7 @@ func TestServer_ActivateProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1167,7 +1166,7 @@ func TestServer_ActivateProjectGrant(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1205,7 +1204,7 @@ func TestServer_ActivateProjectGrant(t *testing.T) { func TestServer_ActivateProjectGrant_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -1228,7 +1227,7 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1245,7 +1244,7 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1263,7 +1262,7 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1281,7 +1280,7 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1302,7 +1301,7 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) { projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) diff --git a/internal/api/grpc/project/v2beta/integration_test/project_role_test.go b/internal/api/grpc/project/v2beta/integration_test/project_role_test.go index a1c004f22d5..8754c0e4937 100644 --- a/internal/api/grpc/project/v2beta/integration_test/project_role_test.go +++ b/internal/api/grpc/project/v2beta/integration_test/project_role_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" @@ -19,7 +18,7 @@ import ( func TestServer_AddProjectRole(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.ProjectName(), integration.Email()) alreadyExistingProject := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) alreadyExistingProjectRoleName := integration.RoleDisplayName() instance.AddProjectRole(iamOwnerCtx, t, alreadyExistingProject.GetId(), alreadyExistingProjectRoleName, alreadyExistingProjectRoleName, "") @@ -111,7 +110,7 @@ func TestServer_AddProjectRole(t *testing.T) { func TestServer_AddProjectRole_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) alreadyExistingProject := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) alreadyExistingProjectRoleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, alreadyExistingProject.GetId(), alreadyExistingProjectRoleName, alreadyExistingProjectRoleName, "") @@ -268,7 +267,7 @@ func assertAddProjectRoleResponse(t *testing.T, creationDate, changeDate time.Ti func TestServer_UpdateProjectRole(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -399,7 +398,7 @@ func TestServer_UpdateProjectRole(t *testing.T) { func TestServer_UpdateProjectRole_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -585,7 +584,7 @@ func assertUpdateProjectRoleResponse(t *testing.T, creationDate, changeDate time func TestServer_DeleteProjectRole(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) tests := []struct { name string @@ -664,7 +663,7 @@ func TestServer_DeleteProjectRole(t *testing.T) { func TestServer_DeleteProjectRole_Permission(t *testing.T) { iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type test struct { name string diff --git a/internal/api/grpc/project/v2beta/integration_test/project_test.go b/internal/api/grpc/project/v2beta/integration_test/project_test.go index 49b5b5a876b..0b591f5bd12 100644 --- a/internal/api/grpc/project/v2beta/integration_test/project_test.go +++ b/internal/api/grpc/project/v2beta/integration_test/project_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -22,7 +21,7 @@ func TestServer_CreateProject(t *testing.T) { t.Parallel() iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) alreadyExistingProjectName := integration.ProjectName() instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), alreadyExistingProjectName, false, false) @@ -95,7 +94,7 @@ func TestServer_CreateProject(t *testing.T) { func TestServer_CreateProject_Permission(t *testing.T) { t.Parallel() iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type want struct { id bool @@ -238,7 +237,7 @@ func assertCreateProjectResponse(t *testing.T, creationDate, changeDate time.Tim func TestServer_UpdateProject(t *testing.T) { t.Parallel() iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -348,7 +347,7 @@ func TestServer_UpdateProject(t *testing.T) { func TestServer_UpdateProject_Permission(t *testing.T) { t.Parallel() iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) userResp := instance.CreateMachineUser(iamOwnerCtx) patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId()) @@ -514,7 +513,7 @@ func assertUpdateProjectResponse(t *testing.T, creationDate, changeDate time.Tim func TestServer_DeleteProject(t *testing.T) { t.Parallel() iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) tests := []struct { name string @@ -587,7 +586,7 @@ func TestServer_DeleteProject(t *testing.T) { func TestServer_DeleteProject_Permission(t *testing.T) { t.Parallel() iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) userResp := instance.CreateMachineUser(iamOwnerCtx) patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId()) @@ -720,7 +719,7 @@ func assertDeleteProjectResponse(t *testing.T, creationDate, deletionDate time.T func TestServer_DeactivateProject(t *testing.T) { t.Parallel() iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -751,8 +750,7 @@ func TestServer_DeactivateProject(t *testing.T) { { name: "no change, ok", prepare: func(request *project.DeactivateProjectRequest) { - name := gofakeit.AppName() - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID instance.DeactivateProject(iamOwnerCtx, t, projectID) }, @@ -802,7 +800,7 @@ func TestServer_DeactivateProject(t *testing.T) { func TestServer_DeactivateProject_Permission(t *testing.T) { t.Parallel() iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -922,7 +920,7 @@ func assertDeactivateProjectResponse(t *testing.T, creationDate, changeDate time func TestServer_ActivateProject(t *testing.T) { t.Parallel() iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context @@ -966,8 +964,7 @@ func TestServer_ActivateProject(t *testing.T) { { name: "no change, ok", prepare: func(request *project.ActivateProjectRequest) { - name := gofakeit.AppName() - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID }, args: args{ @@ -1017,7 +1014,7 @@ func TestServer_ActivateProject(t *testing.T) { func TestServer_ActivateProject_Permission(t *testing.T) { t.Parallel() iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context diff --git a/internal/api/grpc/project/v2beta/integration_test/query_test.go b/internal/api/grpc/project/v2beta/integration_test/query_test.go index e579fcc8a3a..7c624b464db 100644 --- a/internal/api/grpc/project/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/project/v2beta/integration_test/query_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -50,9 +49,8 @@ func TestServer_GetProject(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.GetProjectRequest, response *project.GetProjectResponse) { - name := gofakeit.AppName() - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) - resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) + resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = resp.GetId() }, @@ -172,9 +170,8 @@ func TestServer_ListProjects(t *testing.T) { args: args{ ctx: CTX, dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { - name := gofakeit.AppName() orgID := instance.DefaultOrg.GetId() - resp := instance.CreateProject(iamOwnerCtx, t, orgID, name, false, false) + resp := instance.CreateProject(iamOwnerCtx, t, orgID, integration.ProjectName(), false, false) request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ Ids: []string{resp.GetId()}, @@ -192,9 +189,8 @@ func TestServer_ListProjects(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { - name := gofakeit.AppName() orgID := instance.DefaultOrg.GetId() - resp := instance.CreateProject(iamOwnerCtx, t, orgID, name, false, false) + resp := instance.CreateProject(iamOwnerCtx, t, orgID, integration.ProjectName(), false, false) request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ Ids: []string{resp.GetId()}, @@ -212,9 +208,8 @@ func TestServer_ListProjects(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { - name := gofakeit.AppName() - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) - resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) + resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ Ids: []string{resp.GetId()}, @@ -352,7 +347,7 @@ func TestServer_ListProjects(t *testing.T) { ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { orgID := instance.DefaultOrg.GetId() - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) resp1 := createProject(iamOwnerCtx, instance, t, orgResp.GetOrganizationId(), false, false) resp2 := createProject(iamOwnerCtx, instance, t, orgID, true, false) resp3 := createProject(iamOwnerCtx, instance, t, orgResp.GetOrganizationId(), false, true) @@ -384,7 +379,7 @@ func TestServer_ListProjects(t *testing.T) { ctx: projectOwnerCtx, dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { orgID := instance.DefaultOrg.GetId() - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) resp1 := createProject(iamOwnerCtx, instance, t, orgResp.GetOrganizationId(), false, false) resp2 := createProject(iamOwnerCtx, instance, t, orgID, true, false) resp3 := createProject(iamOwnerCtx, instance, t, orgResp.GetOrganizationId(), false, true) @@ -511,7 +506,7 @@ func TestServer_ListProjects(t *testing.T) { orgName := integration.OrganizationName() projectName := integration.ProjectName() - orgResp := instance.CreateOrganization(iamOwnerCtx, orgName, gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, orgName, integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), projectName, true, true) projectGrantResp := instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgID) request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{ @@ -633,7 +628,7 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) resp := createProject(iamOwnerCtx, instancePermissionV2, t, orgResp.GetOrganizationId(), false, false) request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ @@ -851,7 +846,7 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) resp1 := createProject(iamOwnerCtx, instancePermissionV2, t, orgResp.GetOrganizationId(), false, false) resp2 := createProject(iamOwnerCtx, instancePermissionV2, t, orgID, true, false) resp3 := createProject(iamOwnerCtx, instancePermissionV2, t, orgResp.GetOrganizationId(), false, true) @@ -886,7 +881,7 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) { orgName := integration.OrganizationName() projectName := integration.ProjectName() - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, orgName, gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, orgName, integration.Email()) projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), projectName, true, true) projectGrantResp := instancePermissionV2.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgID) request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{ @@ -968,7 +963,7 @@ func createProject(ctx context.Context, instance *integration.Instance, t *testi func createGrantedProject(ctx context.Context, instance *integration.Instance, t *testing.T, projectToGrant *project.Project) *project.Project { grantedOrgName := integration.OrganizationName() - grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, gofakeit.Email()) + grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, integration.Email()) projectGrantResp := instance.CreateProjectGrant(ctx, t, projectToGrant.GetId(), grantedOrg.GetOrganizationId()) return &project.Project{ @@ -1024,7 +1019,7 @@ func TestServer_ListProjectGrants(t *testing.T) { Ids: []string{projectResp.GetId()}, }, } - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{ ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, } @@ -1048,7 +1043,7 @@ func TestServer_ListProjectGrants(t *testing.T) { Ids: []string{projectResp.GetId()}, }, } - grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{ ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, } @@ -1088,7 +1083,7 @@ func TestServer_ListProjectGrants(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name := gofakeit.AppName() + name := integration.ProjectName() orgID := instance.DefaultOrg.GetId() projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ @@ -1118,8 +1113,8 @@ func TestServer_ListProjectGrants(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name := gofakeit.AppName() - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + name := integration.ProjectName() + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ @@ -1146,7 +1141,7 @@ func TestServer_ListProjectGrants(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name := gofakeit.AppName() + name := integration.ProjectName() orgID := instance.DefaultOrg.GetId() projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ @@ -1178,11 +1173,11 @@ func TestServer_ListProjectGrants(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name1 := gofakeit.AppName() - name2 := gofakeit.AppName() - name3 := gofakeit.AppName() + name1 := integration.ProjectName() + name2 := integration.ProjectName() + name3 := integration.ProjectName() orgID := instance.DefaultOrg.GetId() - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) project1Resp := instance.CreateProject(iamOwnerCtx, t, orgID, name1, false, false) project2Resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name2, false, false) project3Resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name3, false, false) @@ -1215,11 +1210,11 @@ func TestServer_ListProjectGrants(t *testing.T) { args: args{ ctx: projectGrantOwnerCtx, dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name1 := gofakeit.AppName() - name2 := gofakeit.AppName() - name3 := gofakeit.AppName() + name1 := integration.ProjectName() + name2 := integration.ProjectName() + name3 := integration.ProjectName() orgID := instance.DefaultOrg.GetId() - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) project1Resp := instance.CreateProject(iamOwnerCtx, t, orgID, name1, false, false) project2Resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name2, false, false) project3Resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name3, false, false) @@ -1252,7 +1247,7 @@ func TestServer_ListProjectGrants(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name := gofakeit.AppName() + name := integration.ProjectName() orgID := instance.DefaultOrg.GetId() projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ @@ -1282,7 +1277,7 @@ func TestServer_ListProjectGrants(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name := gofakeit.AppName() + name := integration.ProjectName() orgID := instance.DefaultOrg.GetId() projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ @@ -1366,7 +1361,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { Ids: []string{projectResp.GetId()}, }, } - grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{ ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, } @@ -1390,7 +1385,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { Ids: []string{projectResp.GetId()}, }, } - grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{ ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, } @@ -1408,7 +1403,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name := gofakeit.AppName() + name := integration.ProjectName() orgID := instancePermissionV2.DefaultOrg.GetId() projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ @@ -1438,8 +1433,8 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name := gofakeit.AppName() - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + name := integration.ProjectName() + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ @@ -1466,7 +1461,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { args: args{ ctx: iamOwnerCtx, dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name := gofakeit.AppName() + name := integration.ProjectName() orgID := instancePermissionV2.DefaultOrg.GetId() projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ @@ -1498,11 +1493,11 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - name1 := gofakeit.AppName() - name2 := gofakeit.AppName() - name3 := gofakeit.AppName() + name1 := integration.ProjectName() + name2 := integration.ProjectName() + name3 := integration.ProjectName() orgID := instancePermissionV2.DefaultOrg.GetId() - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) project1Resp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, name1, false, false) project2Resp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name2, false, false) project3Resp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name3, false, false) @@ -1559,10 +1554,27 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { } func createProjectGrant(ctx context.Context, instance *integration.Instance, t *testing.T, orgID, projectID, projectName string, roles ...string) *project.ProjectGrant { - grantedOrgName := gofakeit.AppName() - grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, gofakeit.Email()) + grantedOrgName := integration.ProjectName() + grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, integration.Email()) projectGrantResp := instance.CreateProjectGrant(ctx, t, projectID, grantedOrg.GetOrganizationId(), roles...) + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + projects, err := instance.Client.Projectv2Beta.ListProjects(ctx, &project.ListProjectsRequest{ + Filters: []*project.ProjectSearchFilter{{ + Filter: &project.ProjectSearchFilter_InProjectIdsFilter{ + InProjectIdsFilter: &filter.InIDsFilter{Ids: []string{projectID}}, + }, + }, { + Filter: &project.ProjectSearchFilter_ProjectOrganizationIdFilter{ + ProjectOrganizationIdFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, + }, + }}, + }) + require.NoError(collect, err) + require.Len(collect, projects.Projects, 1) + }, retryDuration, tick) + return &project.ProjectGrant{ OrganizationId: orgID, CreationDate: projectGrantResp.GetCreationDate(), @@ -1641,7 +1653,7 @@ func TestServer_ListProjectRoles(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { - orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() @@ -1800,7 +1812,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() diff --git a/internal/api/grpc/resources/user/v3alpha/integration_test/email_test.go b/internal/api/grpc/resources/user/v3alpha/integration_test/email_test.go index f276b8cce1c..77d0f1e5381 100644 --- a/internal/api/grpc/resources/user/v3alpha/integration_test/email_test.go +++ b/internal/api/grpc/resources/user/v3alpha/integration_test/email_test.go @@ -6,7 +6,6 @@ import ( "context" "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -33,7 +32,7 @@ func TestServer_SetContactEmail(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) type res struct { want *resource_object.Details @@ -62,7 +61,7 @@ func TestServer_SetContactEmail(t *testing.T) { }, }, Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), }, }, wantErr: true, @@ -82,7 +81,7 @@ func TestServer_SetContactEmail(t *testing.T) { }, }, Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), }, }, wantErr: true, @@ -101,7 +100,7 @@ func TestServer_SetContactEmail(t *testing.T) { }, Id: "notexisting", Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), }, }, wantErr: true, @@ -121,7 +120,7 @@ func TestServer_SetContactEmail(t *testing.T) { }, }, Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), }, }, wantErr: true, @@ -134,7 +133,7 @@ func TestServer_SetContactEmail(t *testing.T) { schemaID := schemaResp.GetDetails().GetId() userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaID, []byte(data)) req.Id = userResp.GetDetails().GetId() - email := gofakeit.Email() + email := integration.Email() instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, email) return nil }, @@ -156,7 +155,7 @@ func TestServer_SetContactEmail(t *testing.T) { schemaID := schemaResp.GetDetails().GetId() userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaID, []byte(data)) req.Id = userResp.GetDetails().GetId() - email := gofakeit.Email() + email := integration.Email() instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, email) req.Email.Address = email return nil @@ -189,7 +188,7 @@ func TestServer_SetContactEmail(t *testing.T) { }, req: &user.SetContactEmailRequest{ Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), }, }, res: res{ @@ -217,7 +216,7 @@ func TestServer_SetContactEmail(t *testing.T) { }, }, Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), Verification: &user.SetEmail_ReturnCode{}, }, }, @@ -247,7 +246,7 @@ func TestServer_SetContactEmail(t *testing.T) { }, }, Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), Verification: &user.SetEmail_SendCode{SendCode: &user.SendEmailVerificationCode{UrlTemplate: gu.Ptr("{{")}}, }, }, @@ -268,7 +267,7 @@ func TestServer_SetContactEmail(t *testing.T) { }, }, Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), Verification: &user.SetEmail_IsVerified{IsVerified: true}, }, }, @@ -297,7 +296,7 @@ func TestServer_SetContactEmail(t *testing.T) { }, }, Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), Verification: &user.SetEmail_SendCode{SendCode: &user.SendEmailVerificationCode{UrlTemplate: gu.Ptr("https://example.com/email/verify?userID={{.UserID}}&code={{.Code}}&orgID={{.OrgID}}")}}, }, }, @@ -326,7 +325,7 @@ func TestServer_SetContactEmail(t *testing.T) { }, }, Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), Verification: &user.SetEmail_SendCode{}, }, }, @@ -378,7 +377,7 @@ func TestServer_VerifyContactEmail(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) type res struct { want *resource_object.Details @@ -397,7 +396,7 @@ func TestServer_VerifyContactEmail(t *testing.T) { dep: func(req *user.VerifyContactEmailRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) req.VerificationCode = verifyResp.GetVerificationCode() return nil }, @@ -416,7 +415,7 @@ func TestServer_VerifyContactEmail(t *testing.T) { dep: func(req *user.VerifyContactEmailRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) req.VerificationCode = verifyResp.GetVerificationCode() return nil }, @@ -452,7 +451,7 @@ func TestServer_VerifyContactEmail(t *testing.T) { dep: func(req *user.VerifyContactEmailRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) req.VerificationCode = verifyResp.GetVerificationCode() return nil }, @@ -473,7 +472,7 @@ func TestServer_VerifyContactEmail(t *testing.T) { schemaID := schemaResp.GetDetails().GetId() userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaID, []byte(data)) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) return nil }, req: &user.VerifyContactEmailRequest{ @@ -492,7 +491,7 @@ func TestServer_VerifyContactEmail(t *testing.T) { dep: func(req *user.VerifyContactEmailRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) req.VerificationCode = verifyResp.GetVerificationCode() return nil }, @@ -513,7 +512,7 @@ func TestServer_VerifyContactEmail(t *testing.T) { dep: func(req *user.VerifyContactEmailRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + verifyResp := instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) req.VerificationCode = verifyResp.GetVerificationCode() return nil }, @@ -567,7 +566,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) type res struct { want *resource_object.Details @@ -587,7 +586,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) { dep: func(req *user.ResendContactEmailCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) return nil }, req: &user.ResendContactEmailCodeRequest{ @@ -605,7 +604,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) { dep: func(req *user.ResendContactEmailCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) return nil }, req: &user.ResendContactEmailCodeRequest{ @@ -639,7 +638,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) { dep: func(req *user.ResendContactEmailCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) return nil }, req: &user.ResendContactEmailCodeRequest{ @@ -676,7 +675,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) { dep: func(req *user.ResendContactEmailCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) return nil }, req: &user.ResendContactEmailCodeRequest{}, @@ -696,7 +695,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) { dep: func(req *user.ResendContactEmailCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) return nil }, req: &user.ResendContactEmailCodeRequest{ @@ -724,7 +723,7 @@ func TestServer_ResendContactEmailCode(t *testing.T) { dep: func(req *user.ResendContactEmailCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Email()) + instance.UpdateSchemaUserEmail(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Email()) return nil }, req: &user.ResendContactEmailCodeRequest{ diff --git a/internal/api/grpc/resources/user/v3alpha/integration_test/phone_test.go b/internal/api/grpc/resources/user/v3alpha/integration_test/phone_test.go index 578a3ed07e4..6cf6f65d476 100644 --- a/internal/api/grpc/resources/user/v3alpha/integration_test/phone_test.go +++ b/internal/api/grpc/resources/user/v3alpha/integration_test/phone_test.go @@ -6,7 +6,6 @@ import ( "context" "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/timestamppb" @@ -32,7 +31,7 @@ func TestServer_SetContactPhone(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) type res struct { want *resource_object.Details @@ -61,7 +60,7 @@ func TestServer_SetContactPhone(t *testing.T) { }, }, Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), }, }, wantErr: true, @@ -81,7 +80,7 @@ func TestServer_SetContactPhone(t *testing.T) { }, }, Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), }, }, wantErr: true, @@ -100,7 +99,7 @@ func TestServer_SetContactPhone(t *testing.T) { }, Id: "notexisting", Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), }, }, wantErr: true, @@ -120,7 +119,7 @@ func TestServer_SetContactPhone(t *testing.T) { }, }, Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), }, }, wantErr: true, @@ -133,7 +132,7 @@ func TestServer_SetContactPhone(t *testing.T) { schemaID := schemaResp.GetDetails().GetId() userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaID, []byte(data)) req.Id = userResp.GetDetails().GetId() - number := gofakeit.Phone() + number := integration.Phone() instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, number) req.Phone.Number = number return nil @@ -166,7 +165,7 @@ func TestServer_SetContactPhone(t *testing.T) { }, req: &user.SetContactPhoneRequest{ Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), }, }, res: res{ @@ -194,7 +193,7 @@ func TestServer_SetContactPhone(t *testing.T) { }, }, Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), Verification: &user.SetPhone_ReturnCode{}, }, }, @@ -224,7 +223,7 @@ func TestServer_SetContactPhone(t *testing.T) { }, }, Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), Verification: &user.SetPhone_IsVerified{IsVerified: true}, }, }, @@ -253,7 +252,7 @@ func TestServer_SetContactPhone(t *testing.T) { }, }, Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), Verification: &user.SetPhone_SendCode{}, }, }, @@ -305,7 +304,7 @@ func TestServer_VerifyContactPhone(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) type res struct { want *resource_object.Details @@ -325,7 +324,7 @@ func TestServer_VerifyContactPhone(t *testing.T) { dep: func(req *user.VerifyContactPhoneRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) req.VerificationCode = verifyResp.GetVerificationCode() return nil }, @@ -344,7 +343,7 @@ func TestServer_VerifyContactPhone(t *testing.T) { dep: func(req *user.VerifyContactPhoneRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) req.VerificationCode = verifyResp.GetVerificationCode() return nil }, @@ -380,7 +379,7 @@ func TestServer_VerifyContactPhone(t *testing.T) { dep: func(req *user.VerifyContactPhoneRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) req.VerificationCode = verifyResp.GetVerificationCode() return nil }, @@ -401,7 +400,7 @@ func TestServer_VerifyContactPhone(t *testing.T) { schemaID := schemaResp.GetDetails().GetId() userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaID, []byte(data)) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) return nil }, req: &user.VerifyContactPhoneRequest{ @@ -420,7 +419,7 @@ func TestServer_VerifyContactPhone(t *testing.T) { dep: func(req *user.VerifyContactPhoneRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) req.VerificationCode = verifyResp.GetVerificationCode() return nil }, @@ -441,7 +440,7 @@ func TestServer_VerifyContactPhone(t *testing.T) { dep: func(req *user.VerifyContactPhoneRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + verifyResp := instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) req.VerificationCode = verifyResp.GetVerificationCode() return nil }, @@ -496,7 +495,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) type res struct { want *resource_object.Details @@ -516,7 +515,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) { dep: func(req *user.ResendContactPhoneCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) return nil }, req: &user.ResendContactPhoneCodeRequest{ @@ -534,7 +533,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) { dep: func(req *user.ResendContactPhoneCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) return nil }, req: &user.ResendContactPhoneCodeRequest{ @@ -568,7 +567,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) { dep: func(req *user.ResendContactPhoneCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) return nil }, req: &user.ResendContactPhoneCodeRequest{ @@ -605,7 +604,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) { dep: func(req *user.ResendContactPhoneCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) return nil }, req: &user.ResendContactPhoneCodeRequest{}, @@ -625,7 +624,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) { dep: func(req *user.ResendContactPhoneCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) return nil }, req: &user.ResendContactPhoneCodeRequest{ @@ -653,7 +652,7 @@ func TestServer_ResendContactPhoneCode(t *testing.T) { dep: func(req *user.ResendContactPhoneCodeRequest) error { userResp := instance.CreateSchemaUser(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), schemaResp.GetDetails().GetId(), []byte("{\"name\": \"user\"}")) req.Id = userResp.GetDetails().GetId() - instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, gofakeit.Phone()) + instance.UpdateSchemaUserPhone(isolatedIAMOwnerCTX, orgResp.GetOrganizationId(), req.Id, integration.Phone()) return nil }, req: &user.ResendContactPhoneCodeRequest{ diff --git a/internal/api/grpc/resources/user/v3alpha/integration_test/user_test.go b/internal/api/grpc/resources/user/v3alpha/integration_test/user_test.go index 1755a4a7c11..74f82f1d5bb 100644 --- a/internal/api/grpc/resources/user/v3alpha/integration_test/user_test.go +++ b/internal/api/grpc/resources/user/v3alpha/integration_test/user_test.go @@ -6,7 +6,6 @@ import ( "context" "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -49,7 +48,7 @@ func TestServer_CreateUser(t *testing.T) { } }`) permissionSchemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, permissionSchema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) type res struct { want *resource_object.Details @@ -185,11 +184,11 @@ func TestServer_CreateUser(t *testing.T) { Data: unmarshalJSON("{\"name\": \"user\"}"), Contact: &user.SetContact{ Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), Verification: &user.SetEmail_ReturnCode{ReturnCode: &user.ReturnEmailVerificationCode{}}, }, Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), Verification: &user.SetPhone_ReturnCode{ReturnCode: &user.ReturnPhoneVerificationCode{}}, }, }, @@ -257,7 +256,7 @@ func TestServer_PatchUser(t *testing.T) { } }`) permissionSchemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, permissionSchema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) type res struct { want *resource_object.Details @@ -528,7 +527,7 @@ func TestServer_PatchUser(t *testing.T) { User: &user.PatchUser{ Contact: &user.SetContact{ Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), Verification: &user.SetEmail_ReturnCode{ReturnCode: &user.ReturnEmailVerificationCode{}}, }, }, @@ -562,7 +561,7 @@ func TestServer_PatchUser(t *testing.T) { User: &user.PatchUser{ Contact: &user.SetContact{ Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), Verification: &user.SetPhone_ReturnCode{ReturnCode: &user.ReturnPhoneVerificationCode{}}, }, }, @@ -597,11 +596,11 @@ func TestServer_PatchUser(t *testing.T) { Data: unmarshalJSON("{\"name\": \"changed\"}"), Contact: &user.SetContact{ Email: &user.SetEmail{ - Address: gofakeit.Email(), + Address: integration.Email(), Verification: &user.SetEmail_ReturnCode{ReturnCode: &user.ReturnEmailVerificationCode{}}, }, Phone: &user.SetPhone{ - Number: gofakeit.Phone(), + Number: integration.Phone(), Verification: &user.SetPhone_ReturnCode{ReturnCode: &user.ReturnPhoneVerificationCode{}}, }, }, @@ -662,7 +661,7 @@ func TestServer_DeleteUser(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) tests := []struct { name string @@ -878,7 +877,7 @@ func TestServer_LockUser(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) tests := []struct { name string @@ -1079,7 +1078,7 @@ func TestServer_UnlockUser(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) tests := []struct { name string @@ -1261,7 +1260,7 @@ func TestServer_DeactivateUser(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) tests := []struct { name string @@ -1462,7 +1461,7 @@ func TestServer_ActivateUser(t *testing.T) { } }`) schemaResp := instance.CreateUserSchema(isolatedIAMOwnerCTX, schema) - orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(isolatedIAMOwnerCTX, integration.OrganizationName(), integration.Email()) tests := []struct { name string diff --git a/internal/api/grpc/resources/userschema/v3alpha/integration_test/query_test.go b/internal/api/grpc/resources/userschema/v3alpha/integration_test/query_test.go index 31ee68ed8d9..24b3b11fb8a 100644 --- a/internal/api/grpc/resources/userschema/v3alpha/integration_test/query_test.go +++ b/internal/api/grpc/resources/userschema/v3alpha/integration_test/query_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -80,7 +79,7 @@ func TestServer_ListUserSchemas(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.SearchUserSchemasRequest{}, prepare: func(request *schema.SearchUserSchemasRequest, resp *schema.SearchUserSchemasResponse) error { - schemaType := gofakeit.Name() + schemaType := integration.UserSchemaName() createResp := instance.CreateUserSchemaEmptyWithType(isolatedIAMOwnerCTX, schemaType) request.Filters = []*schema.SearchFilter{ { @@ -126,7 +125,7 @@ func TestServer_ListUserSchemas(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.SearchUserSchemasRequest{}, prepare: func(request *schema.SearchUserSchemasRequest, resp *schema.SearchUserSchemasResponse) error { - schemaType := gofakeit.Name() + schemaType := integration.UserSchemaName() schemaType1 := schemaType + "_1" schemaType2 := schemaType + "_2" createResp := instance.CreateUserSchemaEmptyWithType(isolatedIAMOwnerCTX, schemaType1) @@ -241,7 +240,7 @@ func TestServer_GetUserSchema(t *testing.T) { ctx: instance.WithAuthorization(context.Background(), integration.UserTypeOrgOwner), req: &schema.GetUserSchemaRequest{}, prepare: func(request *schema.GetUserSchemaRequest, resp *schema.GetUserSchemaResponse) error { - schemaType := gofakeit.Name() + schemaType := integration.UserSchemaName() createResp := instance.CreateUserSchemaEmptyWithType(isolatedIAMOwnerCTX, schemaType) request.Id = createResp.GetDetails().GetId() return nil @@ -265,7 +264,7 @@ func TestServer_GetUserSchema(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.GetUserSchemaRequest{}, prepare: func(request *schema.GetUserSchemaRequest, resp *schema.GetUserSchemaResponse) error { - schemaType := gofakeit.Name() + schemaType := integration.UserSchemaName() createResp := instance.CreateUserSchemaEmptyWithType(isolatedIAMOwnerCTX, schemaType) request.Id = createResp.GetDetails().GetId() diff --git a/internal/api/grpc/resources/userschema/v3alpha/integration_test/userschema_test.go b/internal/api/grpc/resources/userschema/v3alpha/integration_test/userschema_test.go index 33b45658614..521bd045cf2 100644 --- a/internal/api/grpc/resources/userschema/v3alpha/integration_test/userschema_test.go +++ b/internal/api/grpc/resources/userschema/v3alpha/integration_test/userschema_test.go @@ -6,7 +6,6 @@ import ( "context" "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/require" "google.golang.org/protobuf/types/known/structpb" @@ -35,7 +34,7 @@ func TestServer_CreateUserSchema(t *testing.T) { ctx: instance.WithAuthorization(context.Background(), integration.UserTypeOrgOwner), req: &schema.CreateUserSchemaRequest{ UserSchema: &schema.UserSchema{ - Type: gofakeit.Name(), + Type: integration.Username(), }, }, wantErr: true, @@ -55,7 +54,7 @@ func TestServer_CreateUserSchema(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.CreateUserSchemaRequest{ UserSchema: &schema.UserSchema{ - Type: gofakeit.Name(), + Type: integration.UserSchemaName(), }, }, wantErr: true, @@ -65,7 +64,7 @@ func TestServer_CreateUserSchema(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.CreateUserSchemaRequest{ UserSchema: &schema.UserSchema{ - Type: gofakeit.Name(), + Type: integration.UserSchemaName(), DataType: &schema.UserSchema_Schema{ Schema: func() *structpb.Struct { s := new(structpb.Struct) @@ -96,7 +95,7 @@ func TestServer_CreateUserSchema(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.CreateUserSchemaRequest{ UserSchema: &schema.UserSchema{ - Type: gofakeit.Name(), + Type: integration.UserSchemaName(), DataType: &schema.UserSchema_Schema{ Schema: func() *structpb.Struct { s := new(structpb.Struct) @@ -135,7 +134,7 @@ func TestServer_CreateUserSchema(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.CreateUserSchemaRequest{ UserSchema: &schema.UserSchema{ - Type: gofakeit.Name(), + Type: integration.UserSchemaName(), DataType: &schema.UserSchema_Schema{ Schema: func() *structpb.Struct { s := new(structpb.Struct) @@ -169,7 +168,7 @@ func TestServer_CreateUserSchema(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.CreateUserSchemaRequest{ UserSchema: &schema.UserSchema{ - Type: gofakeit.Name(), + Type: integration.UserSchemaName(), DataType: &schema.UserSchema_Schema{ Schema: func() *structpb.Struct { s := new(structpb.Struct) @@ -211,7 +210,7 @@ func TestServer_CreateUserSchema(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.CreateUserSchemaRequest{ UserSchema: &schema.UserSchema{ - Type: gofakeit.Name(), + Type: integration.UserSchemaName(), DataType: &schema.UserSchema_Schema{ Schema: func() *structpb.Struct { s := new(structpb.Struct) @@ -246,7 +245,7 @@ func TestServer_CreateUserSchema(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.CreateUserSchemaRequest{ UserSchema: &schema.UserSchema{ - Type: gofakeit.Name(), + Type: integration.UserSchemaName(), DataType: &schema.UserSchema_Schema{ Schema: func() *structpb.Struct { s := new(structpb.Struct) @@ -329,7 +328,7 @@ func TestServer_UpdateUserSchema(t *testing.T) { ctx: instance.WithAuthorization(context.Background(), integration.UserTypeOrgOwner), req: &schema.PatchUserSchemaRequest{ UserSchema: &schema.PatchUserSchema{ - Type: gu.Ptr(gofakeit.Name()), + Type: gu.Ptr(integration.UserSchemaName()), }, }, }, @@ -386,7 +385,7 @@ func TestServer_UpdateUserSchema(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.PatchUserSchemaRequest{ UserSchema: &schema.PatchUserSchema{ - Type: gu.Ptr(gofakeit.Name()), + Type: gu.Ptr(integration.UserSchemaName()), }, }, }, @@ -570,7 +569,7 @@ func TestServer_UpdateUserSchema(t *testing.T) { ctx: isolatedIAMOwnerCTX, req: &schema.PatchUserSchemaRequest{ UserSchema: &schema.PatchUserSchema{ - Type: gu.Ptr(gofakeit.Name()), + Type: gu.Ptr(integration.UserSchemaName()), }, }, }, diff --git a/internal/api/grpc/saml/v2/integration_test/saml_test.go b/internal/api/grpc/saml/v2/integration_test/saml_test.go index a44cd2dc876..2c0ccd7e177 100644 --- a/internal/api/grpc/saml/v2/integration_test/saml_test.go +++ b/internal/api/grpc/saml/v2/integration_test/saml_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/crewjam/saml" "github.com/crewjam/saml/samlsp" "github.com/muhlemmer/gu" @@ -18,6 +17,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" "github.com/zitadel/zitadel/internal/integration" + mgmt "github.com/zitadel/zitadel/pkg/grpc/management" "github.com/zitadel/zitadel/pkg/grpc/object/v2" saml_pb "github.com/zitadel/zitadel/pkg/grpc/saml/v2" "github.com/zitadel/zitadel/pkg/grpc/session/v2" @@ -48,13 +48,13 @@ func TestServer_GetSAMLRequest(t *testing.T) { { name: "success, redirect binding", dep: func() (time.Time, string, error) { - return Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, gofakeit.BitcoinAddress(), saml.HTTPRedirectBinding) + return Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, integration.RelayState(), saml.HTTPRedirectBinding) }, }, { name: "success, post binding", dep: func() (time.Time, string, error) { - return Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + return Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) }, }, } @@ -120,7 +120,7 @@ func TestServer_CreateResponse(t *testing.T) { ctx: LoginCTX, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, gofakeit.BitcoinAddress(), saml.HTTPRedirectBinding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, integration.RelayState(), saml.HTTPRedirectBinding) require.NoError(t, err) return authRequestID }(), @@ -138,7 +138,7 @@ func TestServer_CreateResponse(t *testing.T) { ctx: LoginCTX, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, gofakeit.BitcoinAddress(), saml.HTTPRedirectBinding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, integration.RelayState(), saml.HTTPRedirectBinding) require.NoError(t, err) return authRequestID }(), @@ -156,7 +156,7 @@ func TestServer_CreateResponse(t *testing.T) { ctx: LoginCTX, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return authRequestID }(), @@ -185,7 +185,7 @@ func TestServer_CreateResponse(t *testing.T) { ctx: LoginCTX, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) Instance.FailSAMLAuthRequest(LoginCTX, authRequestID, saml_pb.ErrorReason_ERROR_REASON_AUTH_N_FAILED) return authRequestID @@ -204,7 +204,7 @@ func TestServer_CreateResponse(t *testing.T) { ctx: LoginCTX, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return authRequestID }(), @@ -230,7 +230,7 @@ func TestServer_CreateResponse(t *testing.T) { ctx: CTX, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return authRequestID }(), @@ -248,7 +248,7 @@ func TestServer_CreateResponse(t *testing.T) { ctx: LoginCTX, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, gofakeit.BitcoinAddress(), saml.HTTPRedirectBinding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewareRedirect, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, integration.RelayState(), saml.HTTPRedirectBinding) require.NoError(t, err) return authRequestID }(), @@ -274,7 +274,7 @@ func TestServer_CreateResponse(t *testing.T) { ctx: LoginCTX, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return authRequestID }(), @@ -303,7 +303,7 @@ func TestServer_CreateResponse(t *testing.T) { ctx: LoginCTX, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) Instance.SuccessfulSAMLAuthRequest(LoginCTX, Instance.Users[integration.UserTypeLogin].ID, authRequestID) return authRequestID @@ -322,7 +322,7 @@ func TestServer_CreateResponse(t *testing.T) { ctx: CTX, req: &saml_pb.CreateResponseRequest{ SamlRequestId: func() string { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, gofakeit.BitcoinAddress(), saml.HTTPPostBinding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(spMiddlewarePost, Instance.Users[integration.UserTypeLogin].ID, acsPost, integration.RelayState(), saml.HTTPPostBinding) require.NoError(t, err) return authRequestID }(), @@ -377,10 +377,10 @@ func TestServer_CreateResponse_Permission(t *testing.T) { projectID, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, true) projectID2, _, _ := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID2, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -391,10 +391,10 @@ func TestServer_CreateResponse_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *saml_pb.CreateResponseRequest { projectID, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -413,10 +413,10 @@ func TestServer_CreateResponse_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *saml_pb.CreateResponseRequest { projectID, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectGrantUserGrant(ctx, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectGrantUserGrant(ctx, t, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -435,8 +435,8 @@ func TestServer_CreateResponse_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *saml_pb.CreateResponseRequest { _, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, wantErr: true, @@ -456,9 +456,9 @@ func TestServer_CreateResponse_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *saml_pb.CreateResponseRequest { projectID, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -470,7 +470,7 @@ func TestServer_CreateResponse_Permission(t *testing.T) { projectID, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, true) user := Instance.CreateHumanUser(ctx) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -489,7 +489,7 @@ func TestServer_CreateResponse_Permission(t *testing.T) { projectID, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, false) user := Instance.CreateHumanUser(ctx) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -516,9 +516,9 @@ func TestServer_CreateResponse_Permission(t *testing.T) { name: "projectRoleCheck, usergrant and different resourceowner", dep: func(ctx context.Context, t *testing.T) *saml_pb.CreateResponseRequest { projectID, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectUserGrant(t, ctx, projectID, user.GetUserId()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectUserGrant(ctx, t, Instance.DefaultOrg.GetId(), projectID, user.GetUserId()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -535,8 +535,8 @@ func TestServer_CreateResponse_Permission(t *testing.T) { name: "projectRoleCheck, no usergrant and different resourceowner", dep: func(ctx context.Context, t *testing.T) *saml_pb.CreateResponseRequest { _, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -547,10 +547,10 @@ func TestServer_CreateResponse_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *saml_pb.CreateResponseRequest { projectID, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) - Instance.CreateProjectGrantUserGrant(ctx, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) + createProjectGrantUserGrant(ctx, t, orgResp.GetOrganizationId(), projectID, orgResp.GetOrganizationId(), user.GetUserId()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -568,9 +568,9 @@ func TestServer_CreateResponse_Permission(t *testing.T) { dep: func(ctx context.Context, t *testing.T) *saml_pb.CreateResponseRequest { projectID, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, true, false) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -597,8 +597,8 @@ func TestServer_CreateResponse_Permission(t *testing.T) { name: "hasProjectCheck, different resourceowner", dep: func(ctx context.Context, t *testing.T) *saml_pb.CreateResponseRequest { _, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, false, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -608,9 +608,9 @@ func TestServer_CreateResponse_Permission(t *testing.T) { name: "hasProjectCheck, different resourceowner with project grant", dep: func(ctx context.Context, t *testing.T) *saml_pb.CreateResponseRequest { projectID, _, sp := createSAMLApplication(ctx, t, idpMetadata, saml.HTTPRedirectBinding, false, true) - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) - user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) + user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), integration.Email(), integration.Phone()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -664,7 +664,7 @@ func createSession(ctx context.Context, t *testing.T, userID string) *session.Cr } func createSessionAndSmlRequestForCallback(ctx context.Context, t *testing.T, sp *samlsp.Middleware, loginClient string, acsRedirect saml.Endpoint, userID, binding string) *saml_pb.CreateResponseRequest { - _, authRequestID, err := Instance.CreateSAMLAuthRequest(sp, loginClient, acsRedirect, gofakeit.BitcoinAddress(), binding) + _, authRequestID, err := Instance.CreateSAMLAuthRequest(sp, loginClient, acsRedirect, integration.RelayState(), binding) require.NoError(t, err) sessionResp := createSession(ctx, t, userID) return &saml_pb.CreateResponseRequest{ @@ -679,7 +679,7 @@ func createSessionAndSmlRequestForCallback(ctx context.Context, t *testing.T, sp } func createSAMLSP(t *testing.T, idpMetadata *saml.EntityDescriptor, binding string) (string, *samlsp.Middleware) { - rootURL := "example." + gofakeit.DomainName() + rootURL := "example." + integration.DomainName() spMiddleware, err := integration.CreateSAMLSP("https://"+rootURL, idpMetadata, binding) require.NoError(t, err) return rootURL, spMiddleware @@ -692,3 +692,29 @@ func createSAMLApplication(ctx context.Context, t *testing.T, idpMetadata *saml. require.NoError(t, err) return project.GetId(), rootURL, sp } + +func createProjectUserGrant(ctx context.Context, t *testing.T, orgID, projectID, userID string) { + resp := Instance.CreateProjectUserGrant(t, ctx, orgID, projectID, userID) + + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + _, err := Instance.Client.Mgmt.GetUserGrantByID(integration.SetOrgID(ctx, orgID), &mgmt.GetUserGrantByIDRequest{ + UserId: userID, + GrantId: resp.GetUserGrantId(), + }) + assert.NoError(collect, err) + }, retryDuration, tick) +} + +func createProjectGrantUserGrant(ctx context.Context, t *testing.T, orgID, projectID, projectGrantID, userID string) { + resp := Instance.CreateProjectGrantUserGrant(ctx, orgID, projectID, projectGrantID, userID) + + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + _, err := Instance.Client.Mgmt.GetUserGrantByID(integration.SetOrgID(ctx, orgID), &mgmt.GetUserGrantByIDRequest{ + UserId: userID, + GrantId: resp.GetUserGrantId(), + }) + assert.NoError(collect, err) + }, retryDuration, tick) +} diff --git a/internal/api/grpc/session/v2/integration_test/session_test.go b/internal/api/grpc/session/v2/integration_test/session_test.go index b34df8c8c5a..7942135ff81 100644 --- a/internal/api/grpc/session/v2/integration_test/session_test.go +++ b/internal/api/grpc/session/v2/integration_test/session_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/pquerna/otp/totp" "github.com/stretchr/testify/assert" @@ -264,7 +263,7 @@ func TestServer_CreateSession(t *testing.T) { func TestServer_CreateSession_lock_user(t *testing.T) { // create a separate org so we don't interfere with any other test - org := Instance.CreateOrganization(IAMOwnerCTX, integration.OrganizationName(), gofakeit.Email()) + org := Instance.CreateOrganization(IAMOwnerCTX, integration.OrganizationName(), integration.Email()) userID := org.CreatedAdmins[0].GetUserId() Instance.SetUserPassword(IAMOwnerCTX, userID, integration.UserPassword, false) diff --git a/internal/api/grpc/session/v2beta/integration_test/session_test.go b/internal/api/grpc/session/v2beta/integration_test/session_test.go index 8a2c4094b67..132be5bb94e 100644 --- a/internal/api/grpc/session/v2beta/integration_test/session_test.go +++ b/internal/api/grpc/session/v2beta/integration_test/session_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/pquerna/otp/totp" "github.com/stretchr/testify/assert" @@ -264,10 +263,7 @@ func TestServer_CreateSession(t *testing.T) { func TestServer_CreateSession_lock_user(t *testing.T) { // create a separate org so we don't interfere with any other test - org := Instance.CreateOrganization(IAMOwnerCTX, - fmt.Sprintf("TestServer_CreateSession_lock_user_%s", gofakeit.AppName()), - gofakeit.Email(), - ) + org := Instance.CreateOrganization(IAMOwnerCTX, integration.OrganizationName(), integration.Email()) userID := org.CreatedAdmins[0].GetUserId() Instance.SetUserPassword(IAMOwnerCTX, userID, integration.UserPassword, false) @@ -341,7 +337,7 @@ func TestServer_CreateSession_webauthn(t *testing.T) { } func TestServer_CreateSession_successfulIntent(t *testing.T) { - idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, gofakeit.AppName()).GetId() + idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, integration.IDPName()).GetId() createResp, err := Client.CreateSession(LoginCTX, &session.CreateSessionRequest{ Checks: &session.Checks{ User: &session.CheckUser{ @@ -370,7 +366,7 @@ func TestServer_CreateSession_successfulIntent(t *testing.T) { } func TestServer_CreateSession_successfulIntent_instant(t *testing.T) { - idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, gofakeit.AppName()).GetId() + idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, integration.IDPName()).GetId() intentID, token, _, _, err := sink.SuccessfulOAuthIntent(Instance.ID(), idpID, "id", User.GetUserId(), time.Now().Add(time.Hour)) require.NoError(t, err) @@ -392,7 +388,7 @@ func TestServer_CreateSession_successfulIntent_instant(t *testing.T) { } func TestServer_CreateSession_successfulIntentUnknownUserID(t *testing.T) { - idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, gofakeit.AppName()).GetId() + idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, integration.IDPName()).GetId() // successful intent without known / linked user idpUserID := "id" @@ -421,7 +417,7 @@ func TestServer_CreateSession_successfulIntentUnknownUserID(t *testing.T) { } func TestServer_CreateSession_startedIntentFalseToken(t *testing.T) { - idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, gofakeit.AppName()).GetId() + idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, integration.IDPName()).GetId() createResp, err := Client.CreateSession(LoginCTX, &session.CreateSessionRequest{ Checks: &session.Checks{ @@ -449,7 +445,7 @@ func TestServer_CreateSession_startedIntentFalseToken(t *testing.T) { } func TestServer_CreateSession_reuseIntent(t *testing.T) { - idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, gofakeit.AppName()).GetId() + idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, integration.IDPName()).GetId() createResp, err := Client.CreateSession(IAMOwnerCTX, &session.CreateSessionRequest{ Checks: &session.Checks{ User: &session.CheckUser{ @@ -491,7 +487,7 @@ func TestServer_CreateSession_reuseIntent(t *testing.T) { } func TestServer_CreateSession_expiredIntent(t *testing.T) { - idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, gofakeit.AppName()).GetId() + idpID := Instance.AddGenericOAuthProvider(IAMOwnerCTX, integration.IDPName()).GetId() createResp, err := Client.CreateSession(IAMOwnerCTX, &session.CreateSessionRequest{ Checks: &session.Checks{ User: &session.CheckUser{ diff --git a/internal/api/grpc/settings/v2/integration_test/query_test.go b/internal/api/grpc/settings/v2/integration_test/query_test.go index 7d8f15c3d8e..044da07ae65 100644 --- a/internal/api/grpc/settings/v2/integration_test/query_test.go +++ b/internal/api/grpc/settings/v2/integration_test/query_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -359,7 +358,7 @@ func TestServer_GetActiveIdentityProviders(t *testing.T) { func TestServer_GetHostedLoginTranslation(t *testing.T) { // Given - translations := map[string]any{"loginTitle": gofakeit.Slogan()} + translations := map[string]any{"loginTitle": integration.Slogan()} protoTranslations, err := structpb.NewStruct(translations) require.NoError(t, err) @@ -369,7 +368,7 @@ func TestServer_GetHostedLoginTranslation(t *testing.T) { OrganizationId: Instance.DefaultOrg.GetId(), }, Translations: protoTranslations, - Locale: gofakeit.LanguageBCP(), + Locale: integration.Language(), } savedTranslation, err := Client.SetHostedLoginTranslation(AdminCTX, setupRequest) require.NoError(t, err) diff --git a/internal/api/grpc/user/v2/integration_test/email_test.go b/internal/api/grpc/user/v2/integration_test/email_test.go index 87f8a04dd86..fd64fd58950 100644 --- a/internal/api/grpc/user/v2/integration_test/email_test.go +++ b/internal/api/grpc/user/v2/integration_test/email_test.go @@ -5,7 +5,6 @@ package user_test import ( "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -147,7 +146,7 @@ func TestServer_Deprecated_SetEmail(t *testing.T) { func TestServer_ResendEmailCode(t *testing.T) { userID := Instance.CreateHumanUser(CTX).GetUserId() - verifiedUserID := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()).GetUserId() + verifiedUserID := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()).GetUserId() tests := []struct { name string @@ -251,7 +250,7 @@ func TestServer_ResendEmailCode(t *testing.T) { func TestServer_SendEmailCode(t *testing.T) { userID := Instance.CreateHumanUser(CTX).GetUserId() - verifiedUserID := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()).GetUserId() + verifiedUserID := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()).GetUserId() tests := []struct { name string diff --git a/internal/api/grpc/user/v2/integration_test/idp_link_test.go b/internal/api/grpc/user/v2/integration_test/idp_link_test.go index 0fbbc64a22b..71335859ed8 100644 --- a/internal/api/grpc/user/v2/integration_test/idp_link_test.go +++ b/internal/api/grpc/user/v2/integration_test/idp_link_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" @@ -98,20 +97,20 @@ func TestServer_AddIDPLink(t *testing.T) { } func TestServer_ListIDPLinks(t *testing.T) { - orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) instanceIdpResp := Instance.AddGenericOAuthProvider(IamCTX, Instance.DefaultOrg.Id) - userInstanceResp := Instance.CreateHumanUserVerified(IamCTX, orgResp.OrganizationId, gofakeit.Email(), gofakeit.Phone()) + userInstanceResp := Instance.CreateHumanUserVerified(IamCTX, orgResp.OrganizationId, integration.Email(), integration.Phone()) _, err := Instance.CreateUserIDPlink(IamCTX, userInstanceResp.GetUserId(), "external_instance", instanceIdpResp.Id, "externalUsername_instance") require.NoError(t, err) ctxOrg := metadata.AppendToOutgoingContext(IamCTX, "x-zitadel-orgid", orgResp.GetOrganizationId()) orgIdpResp := Instance.AddOrgGenericOAuthProvider(ctxOrg, orgResp.OrganizationId) - userOrgResp := Instance.CreateHumanUserVerified(ctxOrg, orgResp.OrganizationId, gofakeit.Email(), gofakeit.Phone()) + userOrgResp := Instance.CreateHumanUserVerified(ctxOrg, orgResp.OrganizationId, integration.Email(), integration.Phone()) _, err = Instance.CreateUserIDPlink(ctxOrg, userOrgResp.GetUserId(), "external_org", orgIdpResp.Id, "externalUsername_org") require.NoError(t, err) - userMultipleResp := Instance.CreateHumanUserVerified(IamCTX, orgResp.OrganizationId, gofakeit.Email(), gofakeit.Phone()) + userMultipleResp := Instance.CreateHumanUserVerified(IamCTX, orgResp.OrganizationId, integration.Email(), integration.Phone()) _, err = Instance.CreateUserIDPlink(IamCTX, userMultipleResp.GetUserId(), "external_multi", instanceIdpResp.Id, "externalUsername_multi") require.NoError(t, err) _, err = Instance.CreateUserIDPlink(ctxOrg, userMultipleResp.GetUserId(), "external_multi", orgIdpResp.Id, "externalUsername_multi") @@ -252,20 +251,20 @@ func TestServer_ListIDPLinks(t *testing.T) { } func TestServer_RemoveIDPLink(t *testing.T) { - orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) instanceIdpResp := Instance.AddGenericOAuthProvider(IamCTX, Instance.DefaultOrg.Id) - userInstanceResp := Instance.CreateHumanUserVerified(IamCTX, orgResp.OrganizationId, gofakeit.Email(), gofakeit.Phone()) + userInstanceResp := Instance.CreateHumanUserVerified(IamCTX, orgResp.OrganizationId, integration.Email(), integration.Phone()) _, err := Instance.CreateUserIDPlink(IamCTX, userInstanceResp.GetUserId(), "external_instance", instanceIdpResp.Id, "externalUsername_instance") require.NoError(t, err) ctxOrg := metadata.AppendToOutgoingContext(IamCTX, "x-zitadel-orgid", orgResp.GetOrganizationId()) orgIdpResp := Instance.AddOrgGenericOAuthProvider(ctxOrg, orgResp.OrganizationId) - userOrgResp := Instance.CreateHumanUserVerified(ctxOrg, orgResp.OrganizationId, gofakeit.Email(), gofakeit.Phone()) + userOrgResp := Instance.CreateHumanUserVerified(ctxOrg, orgResp.OrganizationId, integration.Email(), integration.Phone()) _, err = Instance.CreateUserIDPlink(ctxOrg, userOrgResp.GetUserId(), "external_org", orgIdpResp.Id, "externalUsername_org") require.NoError(t, err) - userNoLinkResp := Instance.CreateHumanUserVerified(IamCTX, orgResp.OrganizationId, gofakeit.Email(), gofakeit.Phone()) + userNoLinkResp := Instance.CreateHumanUserVerified(IamCTX, orgResp.OrganizationId, integration.Email(), integration.Phone()) type args struct { ctx context.Context diff --git a/internal/api/grpc/user/v2/integration_test/key_test.go b/internal/api/grpc/user/v2/integration_test/key_test.go index 6f44200eca7..bce39c1b93d 100644 --- a/internal/api/grpc/user/v2/integration_test/key_test.go +++ b/internal/api/grpc/user/v2/integration_test/key_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -107,7 +106,7 @@ abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ExpirationDate: expirationDate, }, func(request *user.AddKeyRequest) error { - resp := Instance.CreateUserTypeHuman(IamCTX, gofakeit.Email()) + resp := Instance.CreateUserTypeHuman(IamCTX, integration.Email()) request.UserId = resp.Id return nil }, @@ -157,12 +156,12 @@ abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 func TestServer_AddKey_Permission(t *testing.T) { OrgCTX := CTX - otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) otherOrgUser, err := Client.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ Machine: &user.CreateUserRequest_Machine{ - Name: gofakeit.Name(), + Name: integration.Username(), }, }, }) @@ -297,12 +296,12 @@ func TestServer_RemoveKey(t *testing.T) { func TestServer_RemoveKey_Permission(t *testing.T) { OrgCTX := CTX - otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) otherOrgUser, err := Client.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ Machine: &user.CreateUserRequest_Machine{ - Name: gofakeit.Name(), + Name: integration.Username(), }, }, }) @@ -376,12 +375,12 @@ func TestServer_ListKeys(t *testing.T) { want *user.ListKeysResponse } OrgCTX := CTX - otherOrg := Instance.CreateOrganization(SystemCTX, integration.OrganizationName(), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(SystemCTX, integration.OrganizationName(), integration.Email()) otherOrgUser, err := Client.CreateUser(SystemCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ Machine: &user.CreateUserRequest_Machine{ - Name: gofakeit.Name(), + Name: integration.Username(), }, }, }) diff --git a/internal/api/grpc/user/v2/integration_test/metadata_test.go b/internal/api/grpc/user/v2/integration_test/metadata_test.go index 07fa5a22264..0d95beae0bd 100644 --- a/internal/api/grpc/user/v2/integration_test/metadata_test.go +++ b/internal/api/grpc/user/v2/integration_test/metadata_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -33,7 +32,7 @@ func TestServer_SetUserMetadata(t *testing.T) { name: "missing permission", ctx: Instance.WithAuthorizationToken(context.Background(), integration.UserTypeNoPermission), dep: func(req *user.SetUserMetadataRequest) { - req.UserId = Instance.CreateUserTypeHuman(CTX, gofakeit.Email()).GetId() + req.UserId = Instance.CreateUserTypeHuman(CTX, integration.Email()).GetId() }, req: &user.SetUserMetadataRequest{ Metadata: []*user.Metadata{{Key: "key1", Value: []byte(base64.StdEncoding.EncodeToString([]byte("value1")))}}, @@ -44,7 +43,7 @@ func TestServer_SetUserMetadata(t *testing.T) { name: "set user metadata", ctx: iamOwnerCTX, dep: func(req *user.SetUserMetadataRequest) { - req.UserId = Instance.CreateUserTypeHuman(CTX, gofakeit.Email()).GetId() + req.UserId = Instance.CreateUserTypeHuman(CTX, integration.Email()).GetId() }, req: &user.SetUserMetadataRequest{ Metadata: []*user.Metadata{{Key: "key1", Value: []byte(base64.StdEncoding.EncodeToString([]byte("value1")))}}, @@ -55,7 +54,7 @@ func TestServer_SetUserMetadata(t *testing.T) { name: "set user metadata, multiple", ctx: iamOwnerCTX, dep: func(req *user.SetUserMetadataRequest) { - req.UserId = Instance.CreateUserTypeHuman(CTX, gofakeit.Email()).GetId() + req.UserId = Instance.CreateUserTypeHuman(CTX, integration.Email()).GetId() }, req: &user.SetUserMetadataRequest{ Metadata: []*user.Metadata{ @@ -79,7 +78,7 @@ func TestServer_SetUserMetadata(t *testing.T) { name: "update user metadata", ctx: Instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner), dep: func(req *user.SetUserMetadataRequest) { - req.UserId = Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() + req.UserId = Instance.CreateUserTypeHuman(iamOwnerCTX, integration.Email()).GetId() Instance.SetUserMetadata(iamOwnerCTX, req.UserId, "key1", "value1") }, req: &user.SetUserMetadataRequest{ @@ -91,7 +90,7 @@ func TestServer_SetUserMetadata(t *testing.T) { name: "update user metadata with same value", ctx: Instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner), dep: func(req *user.SetUserMetadataRequest) { - req.UserId = Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() + req.UserId = Instance.CreateUserTypeHuman(iamOwnerCTX, integration.Email()).GetId() Instance.SetUserMetadata(iamOwnerCTX, req.UserId, "key1", "value1") }, req: &user.SetUserMetadataRequest{ @@ -151,7 +150,7 @@ func TestServer_ListUserMetadata(t *testing.T) { args: args{ ctx: Instance.WithAuthorizationToken(context.Background(), integration.UserTypeNoPermission), dep: func(ctx context.Context, request *user.ListUserMetadataRequest, response *user.ListUserMetadataResponse) { - userID := Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() + userID := Instance.CreateUserTypeHuman(iamOwnerCTX, integration.Email()).GetId() request.UserId = userID Instance.SetUserMetadata(iamOwnerCTX, userID, "key1", "value1") }, @@ -164,7 +163,7 @@ func TestServer_ListUserMetadata(t *testing.T) { args: args{ ctx: iamOwnerCTX, dep: func(ctx context.Context, request *user.ListUserMetadataRequest, response *user.ListUserMetadataResponse) { - userID := Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() + userID := Instance.CreateUserTypeHuman(iamOwnerCTX, integration.Email()).GetId() request.UserId = userID metadataResp := Instance.SetUserMetadata(iamOwnerCTX, userID, "key1", "value1") @@ -192,7 +191,7 @@ func TestServer_ListUserMetadata(t *testing.T) { args: args{ ctx: iamOwnerCTX, dep: func(ctx context.Context, request *user.ListUserMetadataRequest, response *user.ListUserMetadataResponse) { - userID := Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() + userID := Instance.CreateUserTypeHuman(iamOwnerCTX, integration.Email()).GetId() request.UserId = userID key := "key1" response.Metadata[0] = setUserMetadata(iamOwnerCTX, userID, key, "value1") @@ -221,7 +220,7 @@ func TestServer_ListUserMetadata(t *testing.T) { args: args{ ctx: iamOwnerCTX, dep: func(ctx context.Context, request *user.ListUserMetadataRequest, response *user.ListUserMetadataResponse) { - userID := Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() + userID := Instance.CreateUserTypeHuman(iamOwnerCTX, integration.Email()).GetId() request.UserId = userID response.Metadata[2] = setUserMetadata(iamOwnerCTX, userID, "key1", "value1") @@ -312,7 +311,7 @@ func TestServer_DeleteUserMetadata(t *testing.T) { ctx: iamOwnerCTX, prepare: func(request *user.DeleteUserMetadataRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userID := Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() + userID := Instance.CreateUserTypeHuman(iamOwnerCTX, integration.Email()).GetId() request.UserId = userID key := "key1" Instance.SetUserMetadata(iamOwnerCTX, userID, key, "value1") @@ -327,7 +326,7 @@ func TestServer_DeleteUserMetadata(t *testing.T) { ctx: iamOwnerCTX, prepare: func(request *user.DeleteUserMetadataRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userID := Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() + userID := Instance.CreateUserTypeHuman(iamOwnerCTX, integration.Email()).GetId() request.UserId = userID key := "key1" Instance.SetUserMetadata(iamOwnerCTX, userID, key, "value1") @@ -342,7 +341,7 @@ func TestServer_DeleteUserMetadata(t *testing.T) { ctx: iamOwnerCTX, prepare: func(request *user.DeleteUserMetadataRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userID := Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() + userID := Instance.CreateUserTypeHuman(iamOwnerCTX, integration.Email()).GetId() request.UserId = userID key := "key1" Instance.SetUserMetadata(iamOwnerCTX, userID, key, "value1") @@ -358,7 +357,7 @@ func TestServer_DeleteUserMetadata(t *testing.T) { ctx: iamOwnerCTX, prepare: func(request *user.DeleteUserMetadataRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - userID := Instance.CreateUserTypeHuman(iamOwnerCTX, gofakeit.Email()).GetId() + userID := Instance.CreateUserTypeHuman(iamOwnerCTX, integration.Email()).GetId() request.UserId = userID key1 := "key1" Instance.SetUserMetadata(iamOwnerCTX, userID, key1, "value1") diff --git a/internal/api/grpc/user/v2/integration_test/pat_test.go b/internal/api/grpc/user/v2/integration_test/pat_test.go index 14f7492db25..6fe8c3637ce 100644 --- a/internal/api/grpc/user/v2/integration_test/pat_test.go +++ b/internal/api/grpc/user/v2/integration_test/pat_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -63,7 +62,7 @@ func TestServer_AddPersonalAccessToken(t *testing.T) { ExpirationDate: expirationDate, }, func(request *user.AddPersonalAccessTokenRequest) error { - resp := Instance.CreateUserTypeHuman(IamCTX, gofakeit.Email()) + resp := Instance.CreateUserTypeHuman(IamCTX, integration.Email()) request.UserId = resp.Id return nil }, @@ -109,12 +108,12 @@ func TestServer_AddPersonalAccessToken(t *testing.T) { func TestServer_AddPersonalAccessToken_Permission(t *testing.T) { OrgCTX := CTX - otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) otherOrgUser, err := Client.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ Machine: &user.CreateUserRequest_Machine{ - Name: gofakeit.Name(), + Name: integration.Username(), }, }, }) @@ -248,12 +247,12 @@ func TestServer_RemovePersonalAccessToken(t *testing.T) { } func TestServer_RemovePersonalAccessToken_Permission(t *testing.T) { - otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) otherOrgUser, err := Client.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ Machine: &user.CreateUserRequest_Machine{ - Name: gofakeit.Name(), + Name: integration.Username(), }, }, }) @@ -327,12 +326,12 @@ func TestServer_ListPersonalAccessTokens(t *testing.T) { want *user.ListPersonalAccessTokensResponse } OrgCTX := CTX - otherOrg := Instance.CreateOrganization(SystemCTX, integration.OrganizationName(), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(SystemCTX, integration.OrganizationName(), integration.Email()) otherOrgUser, err := Client.CreateUser(SystemCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ Machine: &user.CreateUserRequest_Machine{ - Name: gofakeit.Name(), + Name: integration.Username(), }, }, }) diff --git a/internal/api/grpc/user/v2/integration_test/phone_test.go b/internal/api/grpc/user/v2/integration_test/phone_test.go index 25227048f94..94d16293469 100644 --- a/internal/api/grpc/user/v2/integration_test/phone_test.go +++ b/internal/api/grpc/user/v2/integration_test/phone_test.go @@ -6,7 +6,6 @@ import ( "context" "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -123,7 +122,7 @@ func TestServer_Deprecated_SetPhone(t *testing.T) { func TestServer_ResendPhoneCode(t *testing.T) { userID := Instance.CreateHumanUser(CTX).GetUserId() - verifiedUserID := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()).GetUserId() + verifiedUserID := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()).GetUserId() tests := []struct { name string diff --git a/internal/api/grpc/user/v2/integration_test/query_test.go b/internal/api/grpc/user/v2/integration_test/query_test.go index ccd662a71ca..93135c5305a 100644 --- a/internal/api/grpc/user/v2/integration_test/query_test.go +++ b/internal/api/grpc/user/v2/integration_test/query_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -72,7 +71,7 @@ func setPermissionCheckV2Flag(t *testing.T, setFlag bool) { } func TestServer_GetUserByID(t *testing.T) { - orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context req *user.GetUserByIDRequest @@ -236,7 +235,7 @@ func TestServer_GetUserByID(t *testing.T) { } func TestServer_GetUserByID_Permission(t *testing.T) { - newOrgOwnerEmail := gofakeit.Email() + newOrgOwnerEmail := integration.Email() newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) newUserID := newOrg.CreatedAdmins[0].GetUserId() type args struct { @@ -413,13 +412,13 @@ func createUsers(ctx context.Context, orgID string, count int, passwordChangeReq } func createUser(ctx context.Context, orgID string, passwordChangeRequired bool) userAttr { - username := gofakeit.Email() + username := integration.Email() return createUserWithUserName(ctx, username, orgID, passwordChangeRequired) } func createUserWithUserName(ctx context.Context, username string, orgID string, passwordChangeRequired bool) userAttr { // used as default country prefix - phone := "+41" + gofakeit.Phone() + phone := integration.Phone() resp := Instance.CreateHumanUserVerified(ctx, orgID, username, phone) info := userAttr{resp.GetUserId(), username, phone, nil, resp.GetDetails()} // as the change date of the creation is the creation date @@ -432,18 +431,18 @@ func createUserWithUserName(ctx context.Context, username string, orgID string, } func TestServer_ListUsers(t *testing.T) { - defer func() { + t.Cleanup(func() { _, err := Instance.Client.FeatureV2.ResetInstanceFeatures(IamCTX, &feature.ResetInstanceFeaturesRequest{}) require.NoError(t, err) - }() + }) - orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context req *user.ListUsersRequest dep func(ctx context.Context, request *user.ListUsersRequest) userAttrs } - tests := []struct { + tt := []struct { name string args args want *user.ListUsersResponse @@ -622,7 +621,7 @@ func TestServer_ListUsers(t *testing.T) { }, }, { - name: "list user by id multiple, ok", + name: "list user by id and meta key multiple, ok", args: args{ IamCTX, &user.ListUsersRequest{}, @@ -639,7 +638,7 @@ func TestServer_ListUsers(t *testing.T) { TotalResult: 3, Timestamp: timestamppb.Now(), }, - SortingColumn: 0, + SortingColumn: user.UserFieldName_USER_FIELD_NAME_CREATION_DATE, Result: []*user.User{ { State: user.UserState_USER_STATE_ACTIVE, @@ -717,6 +716,8 @@ func TestServer_ListUsers(t *testing.T) { request.Queries = []*user.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId)) request.Queries = append(request.Queries, UsernameQuery(info.Username)) + + request.SortingColumn = user.UserFieldName_USER_FIELD_NAME_CREATION_DATE return []userAttr{info} }, }, @@ -725,7 +726,7 @@ func TestServer_ListUsers(t *testing.T) { TotalResult: 1, Timestamp: timestamppb.Now(), }, - SortingColumn: 0, + SortingColumn: user.UserFieldName_USER_FIELD_NAME_CREATION_DATE, Result: []*user.User{ { State: user.UserState_USER_STATE_ACTIVE, @@ -761,6 +762,7 @@ func TestServer_ListUsers(t *testing.T) { request.Queries = []*user.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId)) request.Queries = append(request.Queries, InUserEmailsQuery([]string{info.Username})) + request.SortingColumn = user.UserFieldName_USER_FIELD_NAME_CREATION_DATE return []userAttr{info} }, }, @@ -769,7 +771,7 @@ func TestServer_ListUsers(t *testing.T) { TotalResult: 1, Timestamp: timestamppb.Now(), }, - SortingColumn: 0, + SortingColumn: user.UserFieldName_USER_FIELD_NAME_CREATION_DATE, Result: []*user.User{ { State: user.UserState_USER_STATE_ACTIVE, @@ -796,7 +798,7 @@ func TestServer_ListUsers(t *testing.T) { }, }, { - name: "list user in emails multiple, ok", + name: "list user by emails and meta value multiple, ok", args: args{ IamCTX, &user.ListUsersRequest{}, @@ -813,7 +815,7 @@ func TestServer_ListUsers(t *testing.T) { TotalResult: 3, Timestamp: timestamppb.Now(), }, - SortingColumn: 0, + SortingColumn: user.UserFieldName_USER_FIELD_NAME_CREATION_DATE, Result: []*user.User{ { State: user.UserState_USER_STATE_ACTIVE, @@ -975,12 +977,13 @@ func TestServer_ListUsers(t *testing.T) { IamCTX, &user.ListUsersRequest{}, func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) infos := createUsers(ctx, orgResp.OrganizationId, 3, false) request.Queries = []*user.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId)) request.Queries = append(request.Queries, InUserEmailsQuery(infos.emails())) + request.SortingColumn = user.UserFieldName_USER_FIELD_NAME_CREATION_DATE return infos }, }, @@ -989,7 +992,7 @@ func TestServer_ListUsers(t *testing.T) { TotalResult: 3, Timestamp: timestamppb.Now(), }, - SortingColumn: 0, + SortingColumn: user.UserFieldName_USER_FIELD_NAME_CREATION_DATE, Result: []*user.User{ { State: user.UserState_USER_STATE_ACTIVE, @@ -1061,10 +1064,11 @@ func TestServer_ListUsers(t *testing.T) { IamCTX, &user.ListUsersRequest{}, func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) info := createUser(ctx, orgRespForOrgTests.OrganizationId, false) request.Queries = []*user.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgRespForOrgTests.OrganizationId)) + request.SortingColumn = user.UserFieldName_USER_FIELD_NAME_CREATION_DATE return []userAttr{info, {}} }, }, @@ -1073,7 +1077,7 @@ func TestServer_ListUsers(t *testing.T) { TotalResult: 2, Timestamp: timestamppb.Now(), }, - SortingColumn: 0, + SortingColumn: user.UserFieldName_USER_FIELD_NAME_CREATION_DATE, Result: []*user.User{ { State: user.UserState_USER_STATE_ACTIVE, @@ -1107,9 +1111,8 @@ func TestServer_ListUsers(t *testing.T) { IamCTX, &user.ListUsersRequest{}, func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) - orgRespForOrgTests2 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) - // info := createUser(ctx, orgRespForOrgTests.OrganizationId, false) + orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) + orgRespForOrgTests2 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) createUser(ctx, orgRespForOrgTests.OrganizationId, false) request.Queries = []*user.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgRespForOrgTests2.OrganizationId)) @@ -1130,52 +1133,51 @@ func TestServer_ListUsers(t *testing.T) { }, } for _, f := range permissionCheckV2Settings { - f := f - for _, tt := range tests { - t.Run(f.TestNamePrependString+tt.name, func(t *testing.T) { + for _, tc := range tt { + t.Run(f.TestNamePrependString+tc.name, func(t1 *testing.T) { setPermissionCheckV2Flag(t, f.SetFlag) - infos := tt.args.dep(IamCTX, tt.args.req) + infos := tc.args.dep(IamCTX, tc.args.req) - retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tt.args.ctx, 10*time.Minute) - require.EventuallyWithT(t, func(ttt *assert.CollectT) { - got, err := Client.ListUsers(tt.args.ctx, tt.args.req) - if tt.wantErr { + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tc.args.ctx, 20*time.Second) + require.EventuallyWithT(t1, func(ttt *assert.CollectT) { + got, err := Client.ListUsers(tc.args.ctx, tc.args.req) + if tc.wantErr { require.Error(ttt, err) return } require.NoError(ttt, err) // always only give back dependency infos which are required for the response - require.Len(ttt, tt.want.Result, len(infos)) - if assert.Len(ttt, got.Result, len(tt.want.Result)) { - tt.want.Details.TotalResult = got.Details.TotalResult + require.Len(ttt, tc.want.Result, len(infos)) + if assert.Len(ttt, got.Result, len(tc.want.Result)) { + tc.want.Details.TotalResult = got.Details.TotalResult // fill in userid and username as it is generated for i := range infos { - if tt.want.Result[i] == nil { + if tc.want.Result[i] == nil { continue } - tt.want.Result[i].UserId = infos[i].UserID - tt.want.Result[i].Username = infos[i].Username - tt.want.Result[i].PreferredLoginName = infos[i].Username - tt.want.Result[i].LoginNames = []string{infos[i].Username} - if human := tt.want.Result[i].GetHuman(); human != nil { + tc.want.Result[i].UserId = infos[i].UserID + tc.want.Result[i].Username = infos[i].Username + tc.want.Result[i].PreferredLoginName = infos[i].Username + tc.want.Result[i].LoginNames = []string{infos[i].Username} + if human := tc.want.Result[i].GetHuman(); human != nil { human.Email.Email = infos[i].Username human.Phone.Phone = infos[i].Phone - if tt.want.Result[i].GetHuman().GetPasswordChanged() != nil { + if tc.want.Result[i].GetHuman().GetPasswordChanged() != nil { human.PasswordChanged = infos[i].Changed } } - tt.want.Result[i].Details = infos[i].Details + tc.want.Result[i].Details = infos[i].Details } - for i := range tt.want.Result { - if tt.want.Result[i] == nil { + for i := range tc.want.Result { + if tc.want.Result[i] == nil { continue } - assert.EqualExportedValues(ttt, got.Result[i], tt.want.Result[i]) + assert.EqualExportedValues(ttt, got.Result[i], tc.want.Result[i]) } } - integration.AssertListDetails(ttt, tt.want, got) + integration.AssertListDetails(ttt, tc.want, got) }, retryDuration, tick, "timeout waiting for expected user result") }) } @@ -1188,9 +1190,9 @@ func TestServer_SystemUsers_ListUsers(t *testing.T) { require.NoError(t, err) }() - org1 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + org1 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) org2 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), "org2@zitadel.com") - org3 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + org3 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) _ = createUserWithUserName(IamCTX, "Test_SystemUsers_ListUser1@zitadel.com", org1.OrganizationId, false) _ = createUserWithUserName(IamCTX, "Test_SystemUsers_ListUser2@zitadel.com", org2.OrganizationId, false) _ = createUserWithUserName(IamCTX, "Test_SystemUsers_ListUser3@zitadel.com", org3.OrganizationId, false) diff --git a/internal/api/grpc/user/v2/integration_test/secret_test.go b/internal/api/grpc/user/v2/integration_test/secret_test.go index f132b0955ae..789d0eaf301 100644 --- a/internal/api/grpc/user/v2/integration_test/secret_test.go +++ b/internal/api/grpc/user/v2/integration_test/secret_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -97,12 +96,12 @@ func TestServer_AddSecret(t *testing.T) { } func TestServer_AddSecret_Permission(t *testing.T) { - otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) otherOrgUser, err := Instance.Client.UserV2.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ Machine: &user.CreateUserRequest_Machine{ - Name: gofakeit.Name(), + Name: integration.Username(), }, }, }) @@ -244,12 +243,12 @@ func TestServer_RemoveSecret(t *testing.T) { } func TestServer_RemoveSecret_Permission(t *testing.T) { - otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) otherOrgUser, err := Instance.Client.UserV2.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ Machine: &user.CreateUserRequest_Machine{ - Name: gofakeit.Name(), + Name: integration.Username(), }, }, }) diff --git a/internal/api/grpc/user/v2/integration_test/user_test.go b/internal/api/grpc/user/v2/integration_test/user_test.go index 68ab8ff7cdf..125cf41972f 100644 --- a/internal/api/grpc/user/v2/integration_test/user_test.go +++ b/internal/api/grpc/user/v2/integration_test/user_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -687,7 +686,7 @@ func TestServer_Deprecated_AddHumanUser(t *testing.T) { } func TestServer_Deprecated_AddHumanUser_Permission(t *testing.T) { - newOrgOwnerEmail := gofakeit.Email() + newOrgOwnerEmail := integration.Email() newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) type args struct { ctx context.Context @@ -915,7 +914,7 @@ func TestServer_Deprecated_UpdateHumanUser(t *testing.T) { args: args{ CTX, &user.UpdateHumanUserRequest{ - Username: gu.Ptr(gofakeit.Username()), + Username: gu.Ptr(integration.Username()), }, }, want: &user.UpdateHumanUserResponse{ @@ -1241,7 +1240,7 @@ func TestServer_Deprecated_UpdateHumanUser(t *testing.T) { } func TestServer_Deprecated_UpdateHumanUser_Permission(t *testing.T) { - newOrgOwnerEmail := gofakeit.Email() + newOrgOwnerEmail := integration.Email() newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) newUserID := newOrg.CreatedAdmins[0].GetUserId() type args struct { @@ -1260,7 +1259,7 @@ func TestServer_Deprecated_UpdateHumanUser_Permission(t *testing.T) { SystemCTX, &user.UpdateHumanUserRequest{ UserId: newUserID, - Username: gu.Ptr(gofakeit.Username()), + Username: gu.Ptr(integration.Username()), }, }, want: &user.UpdateHumanUserResponse{ @@ -1276,7 +1275,7 @@ func TestServer_Deprecated_UpdateHumanUser_Permission(t *testing.T) { IamCTX, &user.UpdateHumanUserRequest{ UserId: newUserID, - Username: gu.Ptr(gofakeit.Username()), + Username: gu.Ptr(integration.Username()), }, }, want: &user.UpdateHumanUserResponse{ @@ -1292,7 +1291,7 @@ func TestServer_Deprecated_UpdateHumanUser_Permission(t *testing.T) { CTX, &user.UpdateHumanUserRequest{ UserId: newUserID, - Username: gu.Ptr(gofakeit.Username()), + Username: gu.Ptr(integration.Username()), }, }, wantErr: true, @@ -1303,7 +1302,7 @@ func TestServer_Deprecated_UpdateHumanUser_Permission(t *testing.T) { UserCTX, &user.UpdateHumanUserRequest{ UserId: newUserID, - Username: gu.Ptr(gofakeit.Username()), + Username: gu.Ptr(integration.Username()), }, }, wantErr: true, @@ -1756,7 +1755,7 @@ func TestServer_ReactivateUser(t *testing.T) { } func TestServer_DeleteUser(t *testing.T) { - projectResp := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) + projectResp := Instance.CreateProject(CTX, t, Instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) type args struct { req *user.DeleteUserRequest @@ -1819,7 +1818,7 @@ func TestServer_DeleteUser(t *testing.T) { prepare: func(_ *testing.T, request *user.DeleteUserRequest) context.Context { resp := Instance.CreateHumanUser(CTX) request.UserId = resp.GetUserId() - Instance.CreateProjectUserGrant(t, CTX, projectResp.GetId(), request.UserId) + Instance.CreateProjectUserGrant(t, CTX, Instance.DefaultOrg.GetId(), projectResp.GetId(), request.UserId) Instance.CreateProjectMembership(t, CTX, projectResp.GetId(), request.UserId) Instance.CreateOrgMembership(t, CTX, Instance.DefaultOrg.Id, request.UserId) return CTX @@ -1846,7 +1845,7 @@ func TestServer_DeleteUser(t *testing.T) { FamilyName: "familyName", }, Email: &user.SetHumanEmail{ - Email: gofakeit.Email(), + Email: integration.Email(), Verification: &user.SetHumanEmail_IsVerified{IsVerified: true}, }, }, @@ -1855,7 +1854,7 @@ func TestServer_DeleteUser(t *testing.T) { require.NoError(t, err) request.UserId = removeUser.Id Instance.RegisterUserPasskey(CTX, removeUser.Id) - _, token, _, _ := Instance.CreateVerifiedWebAuthNSession(t, LoginCTX, removeUser.Id) + token := createVerifiedWebAuthNSession(LoginCTX, t, removeUser.Id) return integration.WithAuthorizationToken(UserCTX, token) }, }, @@ -1884,7 +1883,7 @@ func TestServer_DeleteUser(t *testing.T) { func TestServer_StartIdentityProviderIntent(t *testing.T) { idpResp := Instance.AddGenericOAuthProvider(IamCTX, Instance.DefaultOrg.Id) orgIdpResp := Instance.AddOrgGenericOAuthProvider(CTX, Instance.DefaultOrg.Id) - orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) notDefaultOrgIdpResp := Instance.AddOrgGenericOAuthProvider(IamCTX, orgResp.OrganizationId) samlIdpID := Instance.AddSAMLProvider(IamCTX) samlRedirectIdpID := Instance.AddSAMLRedirectProvider(IamCTX, "") @@ -2204,10 +2203,22 @@ func TestServer_StartIdentityProviderIntent(t *testing.T) { } } +func createVerifiedWebAuthNSession(ctx context.Context, t *testing.T, userID string) string { + // check if user is already processed + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute) + require.EventuallyWithT(t, func(collect *assert.CollectT) { + _, err := Client.GetUserByID(ctx, &user.GetUserByIDRequest{UserId: userID}) + require.NoError(collect, err) + }, retryDuration, tick) + + _, token, _, _ := Instance.CreateVerifiedWebAuthNSession(t, ctx, userID) + return token +} + func TestServer_RetrieveIdentityProviderIntent(t *testing.T) { - oauthIdpID := Instance.AddGenericOAuthProvider(IamCTX, gofakeit.AppName()).GetId() - azureIdpID := Instance.AddAzureADProvider(IamCTX, gofakeit.AppName()).GetId() - oidcIdpID := Instance.AddGenericOIDCProvider(IamCTX, gofakeit.AppName()).GetId() + oauthIdpID := Instance.AddGenericOAuthProvider(IamCTX, integration.IDPName()).GetId() + azureIdpID := Instance.AddAzureADProvider(IamCTX, integration.IDPName()).GetId() + oidcIdpID := Instance.AddGenericOIDCProvider(IamCTX, integration.IDPName()).GetId() samlIdpID := Instance.AddSAMLPostProvider(IamCTX) ldapIdpID := Instance.AddLDAPProvider(IamCTX) jwtIdPID := Instance.AddJWTProvider(IamCTX) @@ -2881,7 +2892,7 @@ func TestServer_RetrieveIdentityProviderIntent(t *testing.T) { func ctxFromNewUserWithRegisteredPasswordlessLegacy(t *testing.T) (context.Context, string, *auth.AddMyPasswordlessResponse) { userID := Instance.CreateHumanUser(CTX).GetUserId() Instance.RegisterUserPasskey(CTX, userID) - _, sessionToken, _, _ := Instance.CreateVerifiedWebAuthNSession(t, LoginCTX, userID) + sessionToken := createVerifiedWebAuthNSession(LoginCTX, t, userID) ctx := integration.WithAuthorizationToken(CTX, sessionToken) pkr, err := Instance.Client.Auth.AddMyPasswordless(ctx, &auth.AddMyPasswordlessRequest{}) @@ -3252,7 +3263,7 @@ func TestServer_ListAuthenticationFactors(t *testing.T) { }, }, dep: func(args *user.ListAuthenticationFactorsRequest, want *user.ListAuthenticationFactorsResponse) { - userWithSMS := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.GetId(), gofakeit.Email(), gofakeit.Phone()).GetUserId() + userWithSMS := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.GetId(), integration.Email(), integration.Phone()).GetUserId() Instance.RegisterUserOTPSMS(CTX, userWithSMS) args.UserId = userWithSMS @@ -3273,7 +3284,7 @@ func TestServer_ListAuthenticationFactors(t *testing.T) { }, }, dep: func(args *user.ListAuthenticationFactorsRequest, want *user.ListAuthenticationFactorsResponse) { - userWithEmail := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.GetId(), gofakeit.Email(), gofakeit.Phone()).GetUserId() + userWithEmail := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.GetId(), integration.Email(), integration.Phone()).GetUserId() Instance.RegisterUserOTPEmail(CTX, userWithEmail) args.UserId = userWithEmail @@ -3371,7 +3382,7 @@ func TestServer_ListAuthenticationFactors(t *testing.T) { } require.NoError(ttt, err) - assert.ElementsMatch(t, tt.want.GetResult(), got.GetResult()) + assert.ElementsMatch(ttt, tt.want.GetResult(), got.GetResult()) }, retryDuration, tick, "timeout waiting for expected auth methods result") }) } @@ -4435,7 +4446,7 @@ func TestServer_CreateUser(t *testing.T) { Username: &username, UserType: &user.CreateUserRequest_Machine_{ Machine: &user.CreateUserRequest_Machine{ - Name: gofakeit.Name(), + Name: integration.Username(), }, }, }, @@ -4630,7 +4641,7 @@ func TestServer_CreateUser_And_Compare(t *testing.T) { } func TestServer_CreateUser_Permission(t *testing.T) { - newOrgOwnerEmail := gofakeit.Email() + newOrgOwnerEmail := integration.Email() newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) type args struct { ctx context.Context @@ -5065,7 +5076,7 @@ func TestServer_UpdateUserTypeHuman(t *testing.T) { t.Run(tt.name, func(t *testing.T) { now := time.Now() runId := fmt.Sprint(now.UnixNano() + int64(i)) - userId := Instance.CreateUserTypeHuman(CTX, gofakeit.Email()).GetId() + userId := Instance.CreateUserTypeHuman(CTX, integration.Email()).GetId() test := tt.testCase(runId, userId) got, err := Client.UpdateUser(test.args.ctx, test.args.req) if test.wantErr { @@ -5301,7 +5312,7 @@ func TestServer_UpdateUser_And_Compare(t *testing.T) { } func TestServer_UpdateUser_Permission(t *testing.T) { - newOrgOwnerEmail := gofakeit.Email() + newOrgOwnerEmail := integration.Email() newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) newHumanUserID := newOrg.CreatedAdmins[0].GetUserId() machineUserResp, err := Instance.Client.UserV2.CreateUser(IamCTX, &user.CreateUserRequest{ diff --git a/internal/api/grpc/user/v2beta/integration_test/email_test.go b/internal/api/grpc/user/v2beta/integration_test/email_test.go index 48957e99d9b..409febd5a3d 100644 --- a/internal/api/grpc/user/v2beta/integration_test/email_test.go +++ b/internal/api/grpc/user/v2beta/integration_test/email_test.go @@ -5,7 +5,6 @@ package user_test import ( "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -147,7 +146,7 @@ func TestServer_SetEmail(t *testing.T) { func TestServer_ResendEmailCode(t *testing.T) { userID := Instance.CreateHumanUser(CTX).GetUserId() - verifiedUserID := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()).GetUserId() + verifiedUserID := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()).GetUserId() tests := []struct { name string diff --git a/internal/api/grpc/user/v2beta/integration_test/phone_test.go b/internal/api/grpc/user/v2beta/integration_test/phone_test.go index 8d1a07cca25..7a98ef2ffec 100644 --- a/internal/api/grpc/user/v2beta/integration_test/phone_test.go +++ b/internal/api/grpc/user/v2beta/integration_test/phone_test.go @@ -6,7 +6,6 @@ import ( "context" "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -125,7 +124,7 @@ func TestServer_SetPhone(t *testing.T) { func TestServer_ResendPhoneCode(t *testing.T) { userID := Instance.CreateHumanUser(CTX).GetUserId() - verifiedUserID := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.Id, gofakeit.Email(), gofakeit.Phone()).GetUserId() + verifiedUserID := Instance.CreateHumanUserVerified(CTX, Instance.DefaultOrg.Id, integration.Email(), integration.Phone()).GetUserId() tests := []struct { name string diff --git a/internal/api/grpc/user/v2beta/integration_test/query_test.go b/internal/api/grpc/user/v2beta/integration_test/query_test.go index e1b2d27f077..6181e61301a 100644 --- a/internal/api/grpc/user/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/user/v2beta/integration_test/query_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -20,7 +19,7 @@ import ( "github.com/zitadel/zitadel/pkg/grpc/object/v2" object_v2beta "github.com/zitadel/zitadel/pkg/grpc/object/v2beta" "github.com/zitadel/zitadel/pkg/grpc/session/v2" - user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" + user_v2beta "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) func detailsV2ToV2beta(obj *object.Details) *object_v2beta.Details { @@ -81,26 +80,26 @@ func setPermissionCheckV2Flag(t *testing.T, setFlag bool) { } func TestServer_GetUserByID(t *testing.T) { - orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context - req *user.GetUserByIDRequest - dep func(ctx context.Context, request *user.GetUserByIDRequest) *userAttr + req *user_v2beta.GetUserByIDRequest + dep func(ctx context.Context, request *user_v2beta.GetUserByIDRequest) *userAttr } tests := []struct { name string args args - want *user.GetUserByIDResponse + want *user_v2beta.GetUserByIDResponse wantErr bool }{ { name: "user by ID, no id provided", args: args{ IamCTX, - &user.GetUserByIDRequest{ + &user_v2beta.GetUserByIDRequest{ UserId: "", }, - func(ctx context.Context, request *user.GetUserByIDRequest) *userAttr { + func(ctx context.Context, request *user_v2beta.GetUserByIDRequest) *userAttr { return nil }, }, @@ -110,10 +109,10 @@ func TestServer_GetUserByID(t *testing.T) { name: "user by ID, not found", args: args{ IamCTX, - &user.GetUserByIDRequest{ + &user_v2beta.GetUserByIDRequest{ UserId: "unknown", }, - func(ctx context.Context, request *user.GetUserByIDRequest) *userAttr { + func(ctx context.Context, request *user_v2beta.GetUserByIDRequest) *userAttr { return nil }, }, @@ -123,34 +122,34 @@ func TestServer_GetUserByID(t *testing.T) { name: "user by ID, ok", args: args{ IamCTX, - &user.GetUserByIDRequest{}, - func(ctx context.Context, request *user.GetUserByIDRequest) *userAttr { + &user_v2beta.GetUserByIDRequest{}, + func(ctx context.Context, request *user_v2beta.GetUserByIDRequest) *userAttr { info := createUser(ctx, orgResp.OrganizationId, false) request.UserId = info.UserID return &info }, }, - want: &user.GetUserByIDResponse{ - User: &user.User{ - State: user.UserState_USER_STATE_ACTIVE, + want: &user_v2beta.GetUserByIDResponse{ + User: &user_v2beta.User{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, Username: "", LoginNames: nil, PreferredLoginName: "", - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), AvatarUrl: "", }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, @@ -166,34 +165,34 @@ func TestServer_GetUserByID(t *testing.T) { name: "user by ID, passwordChangeRequired, ok", args: args{ IamCTX, - &user.GetUserByIDRequest{}, - func(ctx context.Context, request *user.GetUserByIDRequest) *userAttr { + &user_v2beta.GetUserByIDRequest{}, + func(ctx context.Context, request *user_v2beta.GetUserByIDRequest) *userAttr { info := createUser(ctx, orgResp.OrganizationId, true) request.UserId = info.UserID return &info }, }, - want: &user.GetUserByIDResponse{ - User: &user.User{ - State: user.UserState_USER_STATE_ACTIVE, + want: &user_v2beta.GetUserByIDResponse{ + User: &user_v2beta.User{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, Username: "", LoginNames: nil, PreferredLoginName: "", - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), AvatarUrl: "", }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, PasswordChangeRequired: true, @@ -244,48 +243,48 @@ func TestServer_GetUserByID(t *testing.T) { func TestServer_GetUserByID_Permission(t *testing.T) { timeNow := time.Now().UTC() - newOrgOwnerEmail := gofakeit.Email() + newOrgOwnerEmail := integration.Email() newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) newUserID := newOrg.CreatedAdmins[0].GetUserId() type args struct { ctx context.Context - req *user.GetUserByIDRequest + req *user_v2beta.GetUserByIDRequest } tests := []struct { name string args args - want *user.GetUserByIDResponse + want *user_v2beta.GetUserByIDResponse wantErr bool }{ { name: "System, ok", args: args{ SystemCTX, - &user.GetUserByIDRequest{ + &user_v2beta.GetUserByIDRequest{ UserId: newUserID, }, }, - want: &user.GetUserByIDResponse{ - User: &user.User{ - State: user.UserState_USER_STATE_ACTIVE, + want: &user_v2beta.GetUserByIDResponse{ + User: &user_v2beta.User{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, Username: "", LoginNames: nil, PreferredLoginName: "", - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "firstname", FamilyName: "lastname", NickName: gu.Ptr(""), DisplayName: gu.Ptr("firstname lastname"), PreferredLanguage: gu.Ptr("und"), - Gender: user.Gender_GENDER_UNSPECIFIED.Enum(), + Gender: user_v2beta.Gender_GENDER_UNSPECIFIED.Enum(), AvatarUrl: "", }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ Email: newOrgOwnerEmail, }, - Phone: &user.HumanPhone{}, + Phone: &user_v2beta.HumanPhone{}, }, }, }, @@ -299,31 +298,31 @@ func TestServer_GetUserByID_Permission(t *testing.T) { name: "Instance, ok", args: args{ IamCTX, - &user.GetUserByIDRequest{ + &user_v2beta.GetUserByIDRequest{ UserId: newUserID, }, }, - want: &user.GetUserByIDResponse{ - User: &user.User{ - State: user.UserState_USER_STATE_ACTIVE, + want: &user_v2beta.GetUserByIDResponse{ + User: &user_v2beta.User{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, Username: "", LoginNames: nil, PreferredLoginName: "", - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "firstname", FamilyName: "lastname", NickName: gu.Ptr(""), DisplayName: gu.Ptr("firstname lastname"), PreferredLanguage: gu.Ptr("und"), - Gender: user.Gender_GENDER_UNSPECIFIED.Enum(), + Gender: user_v2beta.Gender_GENDER_UNSPECIFIED.Enum(), AvatarUrl: "", }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ Email: newOrgOwnerEmail, }, - Phone: &user.HumanPhone{}, + Phone: &user_v2beta.HumanPhone{}, }, }, }, @@ -337,7 +336,7 @@ func TestServer_GetUserByID_Permission(t *testing.T) { name: "Org, error", args: args{ CTX, - &user.GetUserByIDRequest{ + &user_v2beta.GetUserByIDRequest{ UserId: newUserID, }, }, @@ -347,7 +346,7 @@ func TestServer_GetUserByID_Permission(t *testing.T) { name: "User, error", args: args{ UserCTX, - &user.GetUserByIDRequest{ + &user_v2beta.GetUserByIDRequest{ UserId: newUserID, }, }, @@ -419,9 +418,9 @@ func createUsers(ctx context.Context, orgID string, count int, passwordChangeReq } func createUser(ctx context.Context, orgID string, passwordChangeRequired bool) userAttr { - username := gofakeit.Email() + username := integration.Email() // used as default country prefix - phone := "+41" + gofakeit.Phone() + phone := integration.Phone() resp := Instance.CreateHumanUserVerified(ctx, orgID, username, phone) info := userAttr{resp.GetUserId(), username, phone, nil, resp.GetDetails()} if passwordChangeRequired { @@ -432,41 +431,41 @@ func createUser(ctx context.Context, orgID string, passwordChangeRequired bool) } func TestServer_ListUsers(t *testing.T) { - defer func() { + t.Cleanup(func() { _, err := Instance.Client.FeatureV2.ResetInstanceFeatures(IamCTX, &feature.ResetInstanceFeaturesRequest{}) require.NoError(t, err) - }() + }) - orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context - req *user.ListUsersRequest - dep func(ctx context.Context, request *user.ListUsersRequest) userAttrs + req *user_v2beta.ListUsersRequest + dep func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs } - tests := []struct { + tt := []struct { name string args args - want *user.ListUsersResponse + want *user_v2beta.ListUsersResponse wantErr bool }{ { name: "list user by id, no permission machine user", args: args{ UserCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { info := createUser(ctx, orgResp.OrganizationId, false) request.Queries = append(request.Queries, InUserIDsQuery([]string{info.UserID})) return []userAttr{} }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 0, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{}, + Result: []*user_v2beta.User{}, }, }, { @@ -492,35 +491,35 @@ func TestServer_ListUsers(t *testing.T) { HumanCTX := integration.WithAuthorizationToken(IamCTX, createResp.GetSessionToken()) return args{ HumanCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { return []userAttr{info} }, } }(), - want: &user.ListUsersResponse{ // human user should return itself when calling ListUsers() even if it has no permissions + want: &user_v2beta.ListUsersResponse{ // human user should return itself when calling ListUsers() even if it has no permissions Details: &object_v2beta.ListDetails{ TotalResult: 1, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, PasswordChangeRequired: true, @@ -535,38 +534,38 @@ func TestServer_ListUsers(t *testing.T) { name: "list user by id, ok", args: args{ IamCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { info := createUser(ctx, orgResp.OrganizationId, false) - request.Queries = []*user.SearchQuery{} + request.Queries = []*user_v2beta.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId)) request.Queries = append(request.Queries, InUserIDsQuery([]string{info.UserID})) return []userAttr{info} }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 1, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, @@ -579,38 +578,38 @@ func TestServer_ListUsers(t *testing.T) { name: "list user by id, passwordChangeRequired, ok", args: args{ IamCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { info := createUser(ctx, orgResp.OrganizationId, true) - request.Queries = []*user.SearchQuery{} + request.Queries = []*user_v2beta.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId)) request.Queries = append(request.Queries, InUserIDsQuery([]string{info.UserID})) return []userAttr{info} }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 1, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, PasswordChangeRequired: true, @@ -625,80 +624,80 @@ func TestServer_ListUsers(t *testing.T) { name: "list user by id multiple, ok", args: args{ IamCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { infos := createUsers(ctx, orgResp.OrganizationId, 3, false) - request.Queries = []*user.SearchQuery{} + request.Queries = []*user_v2beta.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId)) request.Queries = append(request.Queries, InUserIDsQuery(infos.userIDs())) return infos }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 3, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, }, }, { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, }, }, { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, @@ -711,38 +710,38 @@ func TestServer_ListUsers(t *testing.T) { name: "list user by username, ok", args: args{ IamCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { info := createUser(ctx, orgResp.OrganizationId, false) - request.Queries = []*user.SearchQuery{} + request.Queries = []*user_v2beta.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId)) request.Queries = append(request.Queries, UsernameQuery(info.Username)) return []userAttr{info} }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 1, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, @@ -755,41 +754,41 @@ func TestServer_ListUsers(t *testing.T) { name: "list user in emails, ok", args: args{ IamCTX, - &user.ListUsersRequest{ - Queries: []*user.SearchQuery{ + &user_v2beta.ListUsersRequest{ + Queries: []*user_v2beta.SearchQuery{ OrganizationIdQuery(orgResp.OrganizationId), }, }, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { info := createUser(ctx, orgResp.OrganizationId, false) - request.Queries = []*user.SearchQuery{} + request.Queries = []*user_v2beta.SearchQuery{} request.Queries = append(request.Queries, InUserEmailsQuery([]string{info.Username})) return []userAttr{info} }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 1, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, @@ -802,78 +801,78 @@ func TestServer_ListUsers(t *testing.T) { name: "list user in emails multiple, ok", args: args{ IamCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { infos := createUsers(ctx, orgResp.OrganizationId, 3, false) - request.Queries = []*user.SearchQuery{} + request.Queries = []*user_v2beta.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId)) request.Queries = append(request.Queries, InUserEmailsQuery(infos.emails())) return infos }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 3, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, }, }, { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, }, }, { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, @@ -886,61 +885,61 @@ func TestServer_ListUsers(t *testing.T) { name: "list user in emails no found, ok", args: args{ IamCTX, - &user.ListUsersRequest{ - Queries: []*user.SearchQuery{ + &user_v2beta.ListUsersRequest{ + Queries: []*user_v2beta.SearchQuery{ OrganizationIdQuery(orgResp.OrganizationId), InUserEmailsQuery([]string{"notfound"}), }, }, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { return []userAttr{} }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 0, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{}, + Result: []*user_v2beta.User{}, }, }, { name: "list user phone, ok", args: args{ IamCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { info := createUser(ctx, orgResp.OrganizationId, false) - request.Queries = []*user.SearchQuery{} + request.Queries = []*user_v2beta.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId)) request.Queries = append(request.Queries, PhoneQuery(info.Phone)) return []userAttr{info} }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 1, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, @@ -953,103 +952,103 @@ func TestServer_ListUsers(t *testing.T) { name: "list user in emails no found, ok", args: args{ IamCTX, - &user.ListUsersRequest{ - Queries: []*user.SearchQuery{ + &user_v2beta.ListUsersRequest{ + Queries: []*user_v2beta.SearchQuery{ OrganizationIdQuery(orgResp.OrganizationId), InUserEmailsQuery([]string{"notfound"}), }, }, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { return []userAttr{} }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 0, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{}, + Result: []*user_v2beta.User{}, }, }, { name: "list user resourceowner multiple, ok", args: args{ IamCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), integration.Email()) infos := createUsers(ctx, orgResp.OrganizationId, 3, false) - request.Queries = []*user.SearchQuery{} + request.Queries = []*user_v2beta.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId)) request.Queries = append(request.Queries, InUserEmailsQuery(infos.emails())) return infos }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 3, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, }, }, { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, }, }, { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, @@ -1062,38 +1061,38 @@ func TestServer_ListUsers(t *testing.T) { name: "list user with org query", args: args{ IamCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { + orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) info := createUser(ctx, orgRespForOrgTests.OrganizationId, false) - request.Queries = []*user.SearchQuery{} + request.Queries = []*user_v2beta.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgRespForOrgTests.OrganizationId)) return []userAttr{info, {}} }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 2, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ { - State: user.UserState_USER_STATE_ACTIVE, - Type: &user.User_Human{ - Human: &user.HumanUser{ - Profile: &user.HumanProfile{ + State: user_v2beta.UserState_USER_STATE_ACTIVE, + Type: &user_v2beta.User_Human{ + Human: &user_v2beta.HumanUser{ + Profile: &user_v2beta.HumanProfile{ GivenName: "Mickey", FamilyName: "Mouse", NickName: gu.Ptr("Mickey"), DisplayName: gu.Ptr("Mickey Mouse"), PreferredLanguage: gu.Ptr("nl"), - Gender: user.Gender_GENDER_MALE.Enum(), + Gender: user_v2beta.Gender_GENDER_MALE.Enum(), }, - Email: &user.HumanEmail{ + Email: &user_v2beta.HumanEmail{ IsVerified: true, }, - Phone: &user.HumanPhone{ + Phone: &user_v2beta.HumanPhone{ IsVerified: true, }, }, @@ -1108,24 +1107,24 @@ func TestServer_ListUsers(t *testing.T) { name: "list user with wrong org query", args: args{ IamCTX, - &user.ListUsersRequest{}, - func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) - orgRespForOrgTests2 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + &user_v2beta.ListUsersRequest{}, + func(ctx context.Context, request *user_v2beta.ListUsersRequest) userAttrs { + orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) + orgRespForOrgTests2 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) // info := createUser(ctx, orgRespForOrgTests.OrganizationId, false) createUser(ctx, orgRespForOrgTests.OrganizationId, false) - request.Queries = []*user.SearchQuery{} + request.Queries = []*user_v2beta.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgRespForOrgTests2.OrganizationId)) return []userAttr{{}} }, }, - want: &user.ListUsersResponse{ + want: &user_v2beta.ListUsersResponse{ Details: &object_v2beta.ListDetails{ TotalResult: 0, Timestamp: timestamppb.Now(), }, SortingColumn: 0, - Result: []*user.User{ + Result: []*user_v2beta.User{ // this is the admin of the org craated in Instance.CreateOrganization() nil, }, @@ -1133,105 +1132,104 @@ func TestServer_ListUsers(t *testing.T) { }, } for _, f := range permissionCheckV2Settings { - f := f - for _, tt := range tests { - t.Run(f.TestNamePrependString+tt.name, func(t *testing.T) { - setPermissionCheckV2Flag(t, f.SetFlag) - infos := tt.args.dep(IamCTX, tt.args.req) + for _, tc := range tt { + t.Run(f.TestNamePrependString+tc.name, func(t1 *testing.T) { + setPermissionCheckV2Flag(t1, f.SetFlag) + infos := tc.args.dep(IamCTX, tc.args.req) // retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tt.args.ctx, 10*time.Minute) - retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tt.args.ctx, 20*time.Second) - require.EventuallyWithT(t, func(ttt *assert.CollectT) { - got, err := Client.ListUsers(tt.args.ctx, tt.args.req) - if tt.wantErr { + retryDuration, tick := integration.WaitForAndTickWithMaxDuration(tc.args.ctx, 20*time.Second) + require.EventuallyWithT(t1, func(ttt *assert.CollectT) { + got, err := Client.ListUsers(tc.args.ctx, tc.args.req) + if tc.wantErr { require.Error(ttt, err) return } require.NoError(ttt, err) // always only give back dependency infos which are required for the response - require.Len(ttt, tt.want.Result, len(infos)) + require.Len(ttt, tc.want.Result, len(infos)) // always first check length, otherwise its failed anyway - if assert.Len(ttt, got.Result, len(tt.want.Result)) { + if assert.Len(ttt, got.Result, len(tc.want.Result)) { // totalResult is unrelated to the tests here so gets carried over, can vary from the count of results due to permissions - tt.want.Details.TotalResult = got.Details.TotalResult + tc.want.Details.TotalResult = got.Details.TotalResult // fill in userid and username as it is generated for i := range infos { - if tt.want.Result[i] == nil { + if tc.want.Result[i] == nil { continue } - tt.want.Result[i].UserId = infos[i].UserID - tt.want.Result[i].Username = infos[i].Username - tt.want.Result[i].PreferredLoginName = infos[i].Username - tt.want.Result[i].LoginNames = []string{infos[i].Username} - if human := tt.want.Result[i].GetHuman(); human != nil { + tc.want.Result[i].UserId = infos[i].UserID + tc.want.Result[i].Username = infos[i].Username + tc.want.Result[i].PreferredLoginName = infos[i].Username + tc.want.Result[i].LoginNames = []string{infos[i].Username} + if human := tc.want.Result[i].GetHuman(); human != nil { human.Email.Email = infos[i].Username human.Phone.Phone = infos[i].Phone - if tt.want.Result[i].GetHuman().GetPasswordChanged() != nil { + if tc.want.Result[i].GetHuman().GetPasswordChanged() != nil { human.PasswordChanged = infos[i].Changed } } - tt.want.Result[i].Details = detailsV2ToV2beta(infos[i].Details) + tc.want.Result[i].Details = detailsV2ToV2beta(infos[i].Details) } - for i := range tt.want.Result { - if tt.want.Result[i] == nil { + for i := range tc.want.Result { + if tc.want.Result[i] == nil { continue } - assert.EqualExportedValues(ttt, got.Result[i], tt.want.Result[i]) + assert.EqualExportedValues(ttt, got.Result[i], tc.want.Result[i]) } } - integration.AssertListDetails(ttt, tt.want, got) + integration.AssertListDetails(ttt, tc.want, got) }, retryDuration, tick, "timeout waiting for expected user result") }) } } } -func InUserIDsQuery(ids []string) *user.SearchQuery { - return &user.SearchQuery{ - Query: &user.SearchQuery_InUserIdsQuery{ - InUserIdsQuery: &user.InUserIDQuery{ +func InUserIDsQuery(ids []string) *user_v2beta.SearchQuery { + return &user_v2beta.SearchQuery{ + Query: &user_v2beta.SearchQuery_InUserIdsQuery{ + InUserIdsQuery: &user_v2beta.InUserIDQuery{ UserIds: ids, }, }, } } -func InUserEmailsQuery(emails []string) *user.SearchQuery { - return &user.SearchQuery{ - Query: &user.SearchQuery_InUserEmailsQuery{ - InUserEmailsQuery: &user.InUserEmailsQuery{ +func InUserEmailsQuery(emails []string) *user_v2beta.SearchQuery { + return &user_v2beta.SearchQuery{ + Query: &user_v2beta.SearchQuery_InUserEmailsQuery{ + InUserEmailsQuery: &user_v2beta.InUserEmailsQuery{ UserEmails: emails, }, }, } } -func PhoneQuery(number string) *user.SearchQuery { - return &user.SearchQuery{ - Query: &user.SearchQuery_PhoneQuery{ - PhoneQuery: &user.PhoneQuery{ +func PhoneQuery(number string) *user_v2beta.SearchQuery { + return &user_v2beta.SearchQuery{ + Query: &user_v2beta.SearchQuery_PhoneQuery{ + PhoneQuery: &user_v2beta.PhoneQuery{ Number: number, }, }, } } -func UsernameQuery(username string) *user.SearchQuery { - return &user.SearchQuery{ - Query: &user.SearchQuery_UserNameQuery{ - UserNameQuery: &user.UserNameQuery{ +func UsernameQuery(username string) *user_v2beta.SearchQuery { + return &user_v2beta.SearchQuery{ + Query: &user_v2beta.SearchQuery_UserNameQuery{ + UserNameQuery: &user_v2beta.UserNameQuery{ UserName: username, }, }, } } -func OrganizationIdQuery(resourceowner string) *user.SearchQuery { - return &user.SearchQuery{ - Query: &user.SearchQuery_OrganizationIdQuery{ - OrganizationIdQuery: &user.OrganizationIdQuery{ +func OrganizationIdQuery(resourceowner string) *user_v2beta.SearchQuery { + return &user_v2beta.SearchQuery{ + Query: &user_v2beta.SearchQuery_OrganizationIdQuery{ + OrganizationIdQuery: &user_v2beta.OrganizationIdQuery{ OrganizationId: resourceowner, }, }, diff --git a/internal/api/grpc/user/v2beta/integration_test/user_test.go b/internal/api/grpc/user/v2beta/integration_test/user_test.go index 6bae84c24b1..a90067bc57a 100644 --- a/internal/api/grpc/user/v2beta/integration_test/user_test.go +++ b/internal/api/grpc/user/v2beta/integration_test/user_test.go @@ -10,7 +10,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -641,7 +640,7 @@ func TestServer_AddHumanUser(t *testing.T) { } func TestServer_AddHumanUser_Permission(t *testing.T) { - newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) type args struct { ctx context.Context req *user.AddHumanUserRequest @@ -868,7 +867,7 @@ func TestServer_UpdateHumanUser(t *testing.T) { args: args{ CTX, &user.UpdateHumanUserRequest{ - Username: gu.Ptr(gofakeit.Username()), + Username: gu.Ptr(integration.Username()), }, }, want: &user.UpdateHumanUserResponse{ @@ -1194,7 +1193,7 @@ func TestServer_UpdateHumanUser(t *testing.T) { } func TestServer_UpdateHumanUser_Permission(t *testing.T) { - newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) newUserID := newOrg.CreatedAdmins[0].GetUserId() type args struct { ctx context.Context @@ -1212,7 +1211,7 @@ func TestServer_UpdateHumanUser_Permission(t *testing.T) { SystemCTX, &user.UpdateHumanUserRequest{ UserId: newUserID, - Username: gu.Ptr(gofakeit.Username()), + Username: gu.Ptr(integration.Username()), }, }, want: &user.UpdateHumanUserResponse{ @@ -1228,7 +1227,7 @@ func TestServer_UpdateHumanUser_Permission(t *testing.T) { IamCTX, &user.UpdateHumanUserRequest{ UserId: newUserID, - Username: gu.Ptr(gofakeit.Username()), + Username: gu.Ptr(integration.Username()), }, }, want: &user.UpdateHumanUserResponse{ @@ -1244,7 +1243,7 @@ func TestServer_UpdateHumanUser_Permission(t *testing.T) { CTX, &user.UpdateHumanUserRequest{ UserId: newUserID, - Username: gu.Ptr(gofakeit.Username()), + Username: gu.Ptr(integration.Username()), }, }, wantErr: true, @@ -1255,7 +1254,7 @@ func TestServer_UpdateHumanUser_Permission(t *testing.T) { UserCTX, &user.UpdateHumanUserRequest{ UserId: newUserID, - Username: gu.Ptr(gofakeit.Username()), + Username: gu.Ptr(integration.Username()), }, }, wantErr: true, @@ -1708,7 +1707,7 @@ func TestServer_ReactivateUser(t *testing.T) { } func TestServer_DeleteUser(t *testing.T) { - projectResp := Instance.CreateProject(CTX, t, "", gofakeit.AppName(), false, false) + projectResp := Instance.CreateProject(CTX, t, Instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) type args struct { ctx context.Context req *user.DeleteUserRequest @@ -1773,7 +1772,7 @@ func TestServer_DeleteUser(t *testing.T) { prepare: func(request *user.DeleteUserRequest) { resp := Instance.CreateHumanUser(CTX) request.UserId = resp.GetUserId() - Instance.CreateProjectUserGrant(t, CTX, projectResp.GetId(), request.UserId) + Instance.CreateProjectUserGrant(t, CTX, Instance.DefaultOrg.GetId(), projectResp.GetId(), request.UserId) Instance.CreateProjectMembership(t, CTX, projectResp.GetId(), request.UserId) Instance.CreateOrgMembership(t, CTX, Instance.DefaultOrg.Id, request.UserId) }, @@ -1885,7 +1884,7 @@ func TestServer_AddIDPLink(t *testing.T) { func TestServer_StartIdentityProviderIntent(t *testing.T) { idpResp := Instance.AddGenericOAuthProvider(IamCTX, Instance.DefaultOrg.Id) orgIdpID := Instance.AddOrgGenericOAuthProvider(CTX, Instance.DefaultOrg.Id) - orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), integration.Email()) notDefaultOrgIdpID := Instance.AddOrgGenericOAuthProvider(IamCTX, orgResp.OrganizationId) samlIdpID := Instance.AddSAMLProvider(IamCTX) samlRedirectIdpID := Instance.AddSAMLRedirectProvider(IamCTX, "") @@ -2157,8 +2156,8 @@ func TestServer_StartIdentityProviderIntent(t *testing.T) { } func TestServer_RetrieveIdentityProviderIntent(t *testing.T) { - oauthIdpID := Instance.AddGenericOAuthProvider(IamCTX, gofakeit.AppName()).GetId() - oidcIdpID := Instance.AddGenericOIDCProvider(IamCTX, gofakeit.AppName()).GetId() + oauthIdpID := Instance.AddGenericOAuthProvider(IamCTX, integration.IDPName()).GetId() + oidcIdpID := Instance.AddGenericOIDCProvider(IamCTX, integration.IDPName()).GetId() samlIdpID := Instance.AddSAMLPostProvider(IamCTX) ldapIdpID := Instance.AddLDAPProvider(IamCTX) authURL, err := url.Parse(Instance.CreateIntent(CTX, oauthIdpID).GetAuthUrl()) diff --git a/internal/api/oidc/integration_test/client_test.go b/internal/api/oidc/integration_test/client_test.go index 08c17f69cb5..73c80e25dec 100644 --- a/internal/api/oidc/integration_test/client_test.go +++ b/internal/api/oidc/integration_test/client_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/zitadel/oidc/v3/pkg/client" @@ -25,20 +24,15 @@ import ( ) func TestServer_Introspect(t *testing.T) { - project := Instance.CreateProject(CTX, t, "", gofakeit.AppName(), false, false) - app, err := Instance.CreateOIDCNativeClient(CTX, redirectURI, logoutRedirectURI, project.GetId(), false) - require.NoError(t, err) - - wantAudience := []string{app.GetClientId(), project.GetId()} - tests := []struct { name string - api func(*testing.T) (apiID string, resourceServer rs.ResourceServer) + api func(*testing.T) (clientID string, audience []string, resourceServer rs.ResourceServer) wantErr bool }{ { name: "client assertion", - api: func(t *testing.T) (string, rs.ResourceServer) { + api: func(t *testing.T) (string, []string, rs.ResourceServer) { + project := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) api, err := Instance.CreateAPIClientJWT(CTX, project.GetId()) require.NoError(t, err) keyResp, err := Instance.Client.Mgmt.AddAppKey(CTX, &management.AddAppKeyRequest{ @@ -48,63 +42,81 @@ func TestServer_Introspect(t *testing.T) { ExpirationDate: nil, }) require.NoError(t, err) + + app, err := Instance.CreateOIDCNativeClient(CTX, redirectURI, logoutRedirectURI, project.GetId(), false) + require.NoError(t, err) + resourceServer, err := Instance.CreateResourceServerJWTProfile(CTX, keyResp.GetKeyDetails()) require.NoError(t, err) - return api.GetClientId(), resourceServer + return app.GetClientId(), []string{app.GetClientId(), project.GetId(), api.GetClientId()}, resourceServer }, }, { name: "client credentials", - api: func(t *testing.T) (string, rs.ResourceServer) { + api: func(t *testing.T) (string, []string, rs.ResourceServer) { + project := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) api, err := Instance.CreateAPIClientBasic(CTX, project.GetId()) require.NoError(t, err) + app, err := Instance.CreateOIDCNativeClient(CTX, redirectURI, logoutRedirectURI, project.GetId(), false) + require.NoError(t, err) + resourceServer, err := Instance.CreateResourceServerClientCredentials(CTX, api.GetClientId(), api.GetClientSecret()) require.NoError(t, err) - return api.GetClientId(), resourceServer + return app.GetClientId(), []string{app.GetClientId(), project.GetId(), api.GetClientId()}, resourceServer }, }, { name: "client invalid id, error", - api: func(t *testing.T) (string, rs.ResourceServer) { + api: func(t *testing.T) (string, []string, rs.ResourceServer) { + project := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) + app, err := Instance.CreateOIDCNativeClient(CTX, redirectURI, logoutRedirectURI, project.GetId(), false) + require.NoError(t, err) + api, err := Instance.CreateAPIClientBasic(CTX, project.GetId()) require.NoError(t, err) resourceServer, err := Instance.CreateResourceServerClientCredentials(CTX, "xxxxx", api.GetClientSecret()) require.NoError(t, err) - return api.GetClientId(), resourceServer + return app.GetClientId(), []string{app.GetClientId(), project.GetId(), api.GetClientId()}, resourceServer }, wantErr: true, }, { name: "client invalid secret, error", - api: func(t *testing.T) (string, rs.ResourceServer) { + api: func(t *testing.T) (string, []string, rs.ResourceServer) { + project := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) + app, err := Instance.CreateOIDCNativeClient(CTX, redirectURI, logoutRedirectURI, project.GetId(), false) + require.NoError(t, err) + api, err := Instance.CreateAPIClientBasic(CTX, project.GetId()) require.NoError(t, err) resourceServer, err := Instance.CreateResourceServerClientCredentials(CTX, api.GetClientId(), "xxxxx") require.NoError(t, err) - return api.GetClientId(), resourceServer + return app.GetClientId(), []string{app.GetClientId(), project.GetId(), api.GetClientId()}, resourceServer }, wantErr: true, }, { name: "client credentials on jwt client, error", - api: func(t *testing.T) (string, rs.ResourceServer) { + api: func(t *testing.T) (string, []string, rs.ResourceServer) { + project := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) + app, err := Instance.CreateOIDCNativeClient(CTX, redirectURI, logoutRedirectURI, project.GetId(), false) + require.NoError(t, err) + api, err := Instance.CreateAPIClientJWT(CTX, project.GetId()) require.NoError(t, err) resourceServer, err := Instance.CreateResourceServerClientCredentials(CTX, api.GetClientId(), "xxxxx") require.NoError(t, err) - return api.GetClientId(), resourceServer + return app.GetClientId(), []string{app.GetClientId(), project.GetId(), api.GetClientId()}, resourceServer }, wantErr: true, }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - apiID, resourceServer := tt.api(t) - // wantAudience grows for every API we add to the project. - wantAudience = append(wantAudience, apiID) + clientID, wantAudience, resourceServer := tt.api(t) scope := []string{oidc.ScopeOpenID, oidc.ScopeProfile, oidc.ScopeEmail, oidc.ScopeOfflineAccess, oidc_api.ScopeResourceOwner} - authRequestID := createAuthRequest(t, Instance, app.GetClientId(), redirectURI, scope...) + authRequestID := createAuthRequest(t, Instance, clientID, redirectURI, scope...) sessionID, sessionToken, startTime, changeTime := Instance.CreateVerifiedWebAuthNSession(t, CTXLOGIN, User.GetUserId()) linkResp, err := Instance.Client.OIDCv2.CreateCallback(CTXLOGIN, &oidc_pb.CreateCallbackRequest{ AuthRequestId: authRequestID, @@ -119,7 +131,7 @@ func TestServer_Introspect(t *testing.T) { // code exchange code := assertCodeResponse(t, linkResp.GetCallbackUrl()) - tokens, err := exchangeTokens(t, Instance, app.GetClientId(), code, redirectURI) + tokens, err := exchangeTokens(t, Instance, clientID, code, redirectURI) require.NoError(t, err) assertTokens(t, tokens, true) assertIDTokenClaims(t, tokens.IDTokenClaims, User.GetUserId(), armPasskey, startTime, changeTime, sessionID) @@ -133,7 +145,7 @@ func TestServer_Introspect(t *testing.T) { require.NoError(t, err) assertIntrospection(t, introspection, - Instance.OIDCIssuer(), app.GetClientId(), + Instance.OIDCIssuer(), clientID, scope, wantAudience, tokens.Expiry, tokens.Expiry.Add(-12*time.Hour)) }) @@ -188,8 +200,8 @@ func assertIntrospection( // with clients that have different authentication methods. func TestServer_VerifyClient(t *testing.T) { sessionID, sessionToken, startTime, changeTime := Instance.CreateVerifiedWebAuthNSession(t, CTXLOGIN, User.GetUserId()) - project := Instance.CreateProject(CTX, t, "", gofakeit.AppName(), false, false) - projectInactive := Instance.CreateProject(CTX, t, "", gofakeit.AppName(), false, false) + project := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) + projectInactive := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) inactiveClient, err := Instance.CreateOIDCInactivateClient(CTX, redirectURI, logoutRedirectURI, project.GetId()) require.NoError(t, err) diff --git a/internal/api/oidc/integration_test/oidc_test.go b/internal/api/oidc/integration_test/oidc_test.go index 1f857b9466d..f7ed2da635e 100644 --- a/internal/api/oidc/integration_test/oidc_test.go +++ b/internal/api/oidc/integration_test/oidc_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/zitadel/oidc/v3/pkg/client/rp" @@ -123,7 +122,7 @@ func Test_ZITADEL_API_missing_authentication(t *testing.T) { func Test_ZITADEL_API_missing_mfa_policy(t *testing.T) { clientID, _ := createClient(t, Instance) - org := Instance.CreateOrganization(CTXIAM, integration.OrganizationName(), gofakeit.Email()) + org := Instance.CreateOrganization(CTXIAM, integration.OrganizationName(), integration.Email()) userID := org.CreatedAdmins[0].GetUserId() Instance.SetUserPassword(CTXIAM, userID, integration.UserPassword, false) authRequestID := createAuthRequest(t, Instance, clientID, redirectURI, oidc.ScopeOpenID, zitadelAudienceScope) @@ -421,7 +420,7 @@ type clientOpts struct { func createClientWithOpts(t testing.TB, instance *integration.Instance, opts clientOpts) (clientID, projectID string) { ctx := instance.WithAuthorization(CTX, integration.UserTypeOrgOwner) - project := instance.CreateProject(ctx, t.(*testing.T), "", gofakeit.AppName(), false, false) + project := instance.CreateProject(ctx, t.(*testing.T), "", integration.ProjectName(), false, false) app, err := instance.CreateOIDCClientLoginVersion(ctx, opts.redirectURI, opts.logoutURI, project.GetId(), app.OIDCAppType_OIDC_APP_TYPE_NATIVE, app.OIDCAuthMethodType_OIDC_AUTH_METHOD_TYPE_NONE, opts.devMode, opts.LoginVersion) require.NoError(t, err) return app.GetClientId(), project.GetId() diff --git a/internal/api/oidc/integration_test/token_client_credentials_test.go b/internal/api/oidc/integration_test/token_client_credentials_test.go index 0567b4ce788..4efe1d32795 100644 --- a/internal/api/oidc/integration_test/token_client_credentials_test.go +++ b/internal/api/oidc/integration_test/token_client_credentials_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/zitadel/oidc/v3/pkg/client/rp" @@ -62,7 +61,7 @@ func TestServer_ClientCredentialsExchange(t *testing.T) { { name: "machine user without secret error", clientID: func() string { - name := gofakeit.Username() + name := integration.Username() _, err := Instance.Client.Mgmt.AddMachineUser(CTX, &management.AddMachineUserRequest{ Name: name, UserName: name, diff --git a/internal/api/oidc/integration_test/token_device_test.go b/internal/api/oidc/integration_test/token_device_test.go index 9692909205b..81f3854998e 100644 --- a/internal/api/oidc/integration_test/token_device_test.go +++ b/internal/api/oidc/integration_test/token_device_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/zitadel/oidc/v3/pkg/client/rp" @@ -22,7 +21,7 @@ import ( ) func TestServer_DeviceAuth(t *testing.T) { - project := Instance.CreateProject(CTX, t, "", gofakeit.AppName(), false, false) + project := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false) client, err := Instance.CreateOIDCClient(CTX, redirectURI, logoutRedirectURI, project.GetId(), app.OIDCAppType_OIDC_APP_TYPE_NATIVE, app.OIDCAuthMethodType_OIDC_AUTH_METHOD_TYPE_NONE, false, app.OIDCGrantType_OIDC_GRANT_TYPE_DEVICE_CODE) require.NoError(t, err) diff --git a/internal/api/oidc/integration_test/userinfo_test.go b/internal/api/oidc/integration_test/userinfo_test.go index 24b51015a78..b1b63686903 100644 --- a/internal/api/oidc/integration_test/userinfo_test.go +++ b/internal/api/oidc/integration_test/userinfo_test.go @@ -7,7 +7,6 @@ import ( "strings" "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/zitadel/oidc/v3/pkg/client/rp" @@ -77,14 +76,14 @@ func TestServer_UserInfo(t *testing.T) { prepare: func(t *testing.T, clientID string, scope []string) *oidc.Tokens[*oidc.IDTokenClaims] { _, err := Instance.Client.Mgmt.UpdateProject(CTX, &management.UpdateProjectRequest{ Id: projectID, - Name: fmt.Sprintf("project-%s", gofakeit.AppName()), + Name: integration.ProjectName(), ProjectRoleAssertion: true, }) require.NoError(t, err) t.Cleanup(func() { _, err := Instance.Client.Mgmt.UpdateProject(CTX, &management.UpdateProjectRequest{ Id: projectID, - Name: fmt.Sprintf("project-%s", gofakeit.AppName()), + Name: integration.ProjectName(), ProjectRoleAssertion: false, }) require.NoError(t, err) @@ -187,7 +186,7 @@ func TestServer_UserInfo_OrgIDRoles(t *testing.T) { _, err := Instance.Client.Mgmt.UpdateProject(CTX, &management.UpdateProjectRequest{ Id: projectID, - Name: fmt.Sprintf("project-%s", gofakeit.AppName()), + Name: integration.ProjectName(), ProjectRoleAssertion: true, }) require.NoError(t, err) @@ -251,7 +250,7 @@ func TestServer_UserInfo_Issue6662(t *testing.T) { roleBar = "bar" ) - projectID := Instance.CreateProject(CTX, t, "", gofakeit.AppName(), false, false).GetId() + projectID := Instance.CreateProject(CTX, t, "", integration.ProjectName(), false, false).GetId() user, _, clientID, clientSecret, err := Instance.CreateOIDCCredentialsClient(CTX) require.NoError(t, err) addProjectRolesGrants(t, user.GetUserId(), projectID, roleFoo, roleBar) @@ -296,7 +295,7 @@ func addProjectRolesGrants(t *testing.T, userID, projectID string, roles ...stri // addProjectOrgGrant adds a new organization which will be granted on the projectID with the specified roles. // The userID will be granted in the new organization to the project with the same roles. func addProjectOrgGrant(t *testing.T, userID, projectID string, roles ...string) (grantedOrgID string) { - grantedOrg := Instance.CreateOrganization(CTXIAM, integration.OrganizationName(), gofakeit.Email()) + grantedOrg := Instance.CreateOrganization(CTXIAM, integration.OrganizationName(), integration.Email()) projectGrant, err := Instance.Client.Mgmt.AddProjectGrant(CTX, &management.AddProjectGrantRequest{ ProjectId: projectID, GrantedOrgId: grantedOrg.GetOrganizationId(), diff --git a/internal/api/scim/integration_test/bulk_test.go b/internal/api/scim/integration_test/bulk_test.go index 7b959a395bc..15867073bc8 100644 --- a/internal/api/scim/integration_test/bulk_test.go +++ b/internal/api/scim/integration_test/bulk_test.go @@ -13,7 +13,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/text/language" @@ -50,7 +49,7 @@ func init() { func TestBulk(t *testing.T) { iamOwnerCtx := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - secondaryOrg := Instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + secondaryOrg := Instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) createdSecondaryOrgUser := createHumanUser(t, iamOwnerCtx, secondaryOrg.OrganizationId, 0) bulkMinimalUpdateSecondaryOrgJson := test.Must(json.Marshal(buildMinimalUpdateRequest(createdSecondaryOrgUser.UserId))) @@ -480,7 +479,7 @@ func TestBulk(t *testing.T) { }, { name: "fail on errors", - body: withUsername(bulkFailOnErrorsJson, gofakeit.Username()), + body: withUsername(bulkFailOnErrorsJson, integration.Username()), want: &scim.BulkResponse{ Schemas: []schemas.ScimSchemaType{schemas.IdBulkResponse}, Operations: []*scim.BulkResponseOperation{ @@ -680,7 +679,7 @@ func buildTooManyOperationsRequest() *scim.BulkRequest { req.Operations[i] = &scim.BulkRequestOperation{ Method: http.MethodPost, Path: "/Users", - Data: withUsername(minimalUserJson, gofakeit.Username()), + Data: withUsername(minimalUserJson, integration.Username()), } } diff --git a/internal/api/scim/integration_test/scim_test.go b/internal/api/scim/integration_test/scim_test.go index e32a720ec4a..14de86f0174 100644 --- a/internal/api/scim/integration_test/scim_test.go +++ b/internal/api/scim/integration_test/scim_test.go @@ -9,8 +9,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" - "github.com/zitadel/zitadel/internal/integration" "github.com/zitadel/zitadel/pkg/grpc/org/v2" ) @@ -35,7 +33,7 @@ func TestMain(m *testing.M) { CTX = Instance.WithAuthorizationToken(ctx, integration.UserTypeOrgOwner) iamOwnerCtx := Instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - SecondaryOrganization = Instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + SecondaryOrganization = Instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) return m.Run() }()) diff --git a/internal/api/scim/integration_test/users_create_test.go b/internal/api/scim/integration_test/users_create_test.go index 71356c7b438..6e0036187f4 100644 --- a/internal/api/scim/integration_test/users_create_test.go +++ b/internal/api/scim/integration_test/users_create_test.go @@ -13,7 +13,6 @@ import ( "text/template" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/text/language" @@ -173,7 +172,7 @@ func withUsername(fixture []byte, username string) []byte { } func TestCreateUser(t *testing.T) { - minimalUsername := gofakeit.Username() + minimalUsername := integration.Username() tests := []struct { name string body []byte @@ -278,21 +277,21 @@ func TestCreateUser(t *testing.T) { }, { name: "not authenticated", - body: withUsername(minimalUserJson, gofakeit.Username()), + body: withUsername(minimalUserJson, integration.Username()), ctx: context.Background(), wantErr: true, errorStatus: http.StatusUnauthorized, }, { name: "no permissions", - body: withUsername(minimalUserJson, gofakeit.Username()), + body: withUsername(minimalUserJson, integration.Username()), ctx: Instance.WithAuthorization(CTX, integration.UserTypeNoPermission), wantErr: true, errorStatus: http.StatusNotFound, }, { name: "another org", - body: withUsername(minimalUserJson, gofakeit.Username()), + body: withUsername(minimalUserJson, integration.Username()), orgID: SecondaryOrganization.OrganizationId, wantErr: true, errorStatus: http.StatusNotFound, @@ -356,7 +355,7 @@ func TestCreateUser(t *testing.T) { } func TestCreateUser_duplicate(t *testing.T) { - parsedMinimalUserJson := withUsername(minimalUserJson, gofakeit.Username()) + parsedMinimalUserJson := withUsername(minimalUserJson, integration.Username()) createdUser, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, parsedMinimalUserJson) require.NoError(t, err) @@ -370,7 +369,7 @@ func TestCreateUser_duplicate(t *testing.T) { } func TestCreateUser_metadata(t *testing.T) { - username := gofakeit.Username() + username := integration.Username() createdUser, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) @@ -408,7 +407,7 @@ func TestCreateUser_scopedExternalID(t *testing.T) { require.NoError(t, err) ctx := integration.WithAuthorizationToken(CTX, callingUserPat) setProvisioningDomain(t, callingUserId, "fooBar") - createdUser, err := Instance.Client.SCIM.Users.Create(ctx, Instance.DefaultOrg.Id, withUsername(fullUserJson, gofakeit.Username())) + createdUser, err := Instance.Client.SCIM.Users.Create(ctx, Instance.DefaultOrg.Id, withUsername(fullUserJson, integration.Username())) require.NoError(t, err) retryDuration, tick := integration.WaitForAndTickWithMaxDuration(ctx, time.Minute) require.EventuallyWithT(t, func(tt *assert.CollectT) { diff --git a/internal/api/scim/integration_test/users_delete_test.go b/internal/api/scim/integration_test/users_delete_test.go index 23c335f93cf..3ca5c4a4bc1 100644 --- a/internal/api/scim/integration_test/users_delete_test.go +++ b/internal/api/scim/integration_test/users_delete_test.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" @@ -77,9 +76,9 @@ func TestDeleteUser_errors(t *testing.T) { func TestDeleteUser_ensureReallyDeleted(t *testing.T) { // create user and dependencies createUserResp := Instance.CreateHumanUser(CTX) - proj := Instance.CreateProject(CTX, t, "", gofakeit.AppName(), false, false) + proj := Instance.CreateProject(CTX, t, Instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) - Instance.CreateProjectUserGrant(t, CTX, proj.Id, createUserResp.UserId) + Instance.CreateProjectUserGrant(t, CTX, Instance.DefaultOrg.GetId(), proj.Id, createUserResp.UserId) // delete user via scim err := Instance.Client.SCIM.Users.Delete(CTX, Instance.DefaultOrg.Id, createUserResp.UserId) diff --git a/internal/api/scim/integration_test/users_get_test.go b/internal/api/scim/integration_test/users_get_test.go index 08e09946fb1..374bd5967dc 100644 --- a/internal/api/scim/integration_test/users_get_test.go +++ b/internal/api/scim/integration_test/users_get_test.go @@ -9,7 +9,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/text/language" @@ -108,7 +107,7 @@ func TestGetUser(t *testing.T) { { name: "created via scim", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() createdUser, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ @@ -221,7 +220,7 @@ func TestGetUser(t *testing.T) { { name: "scoped externalID", setup: func(t *testing.T) testCase { - createdUser, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, gofakeit.Username())) + createdUser, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, integration.Username())) require.NoError(t, err) callingUserId, callingUserPat, err := Instance.CreateMachineUserPATWithMembership(CTX, "ORG_OWNER") require.NoError(t, err) diff --git a/internal/api/scim/integration_test/users_list_test.go b/internal/api/scim/integration_test/users_list_test.go index 81fbf1a5bc7..7d422574a7c 100644 --- a/internal/api/scim/integration_test/users_list_test.go +++ b/internal/api/scim/integration_test/users_list_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/require" "github.com/zitadel/zitadel/internal/api/scim/resources" + "github.com/zitadel/zitadel/internal/integration" "github.com/zitadel/zitadel/pkg/grpc/object/v2" user_v2 "github.com/zitadel/zitadel/pkg/grpc/user/v2" ) @@ -27,7 +27,7 @@ var totalCountOfHumanUsers = 13 // these should never be modified. // This allows testing list requests without filters. iamOwnerCtx := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - secondaryOrg := Instance.CreateOrganization(iamOwnerCtx, gofakeit.Name(), gofakeit.Email()) + secondaryOrg := Instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) secondaryOrgCreatedUserIDs := createUsers(t, iamOwnerCtx, secondaryOrg.OrganizationId) testsInitializedUtc := time.Now().UTC() @@ -292,8 +292,8 @@ var totalCountOfHumanUsers = 13 UserId: userID, Profile: &user_v2.SetHumanProfile{ - GivenName: "scim-user-given-name-modified-0: " + gofakeit.FirstName(), - FamilyName: "scim-user-family-name-modified-0: " + gofakeit.LastName(), + GivenName: "scim-user-given-name-modified-0: " + integration.FirstName(), + FamilyName: "scim-user-family-name-modified-0: " + integration.LastName(), }, }) require.NoError(t, err) @@ -348,7 +348,7 @@ var totalCountOfHumanUsers = 13 name: "do not count user of other org", prepare: func(t require.TestingT) *scim.ListRequest { iamOwnerCtx := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - org := Instance.CreateOrganization(iamOwnerCtx, gofakeit.Name(), gofakeit.Email()) + org := Instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email()) resp := createHumanUser(t, iamOwnerCtx, org.OrganizationId, 102) return &scim.ListRequest{ @@ -442,7 +442,7 @@ func createUsers(t *testing.T, ctx context.Context, orgID string) []string { // create the full scim user if on primary org if orgID == Instance.DefaultOrg.Id { - fullUserCreatedResp, err := Instance.Client.SCIM.Users.Create(ctx, orgID, withUsername(fullUserJson, gofakeit.Username())) + fullUserCreatedResp, err := Instance.Client.SCIM.Users.Create(ctx, orgID, withUsername(fullUserJson, integration.Username())) require.NoError(t, err) createdUserIDs = append(createdUserIDs, fullUserCreatedResp.ID) count-- @@ -473,15 +473,15 @@ func createHumanUser(t require.TestingT, ctx context.Context, orgID string, i in OrgId: orgID, }, }, - Username: gu.Ptr(fmt.Sprintf("scim-username-%d: %s", i, gofakeit.Username())), + Username: gu.Ptr(fmt.Sprintf("scim-username-%d: %s", i, integration.Username())), Profile: &user_v2.SetHumanProfile{ - GivenName: fmt.Sprintf("scim-givenname-%d: %s", i, gofakeit.FirstName()), - FamilyName: fmt.Sprintf("scim-familyname-%d: %s", i, gofakeit.LastName()), + GivenName: fmt.Sprintf("scim-givenname-%d: %s", i, integration.FirstName()), + FamilyName: fmt.Sprintf("scim-familyname-%d: %s", i, integration.LastName()), PreferredLanguage: gu.Ptr("en-US"), Gender: gu.Ptr(user_v2.Gender_GENDER_MALE), }, Email: &user_v2.SetHumanEmail{ - Email: fmt.Sprintf("scim-email-%d-%d@example.com", i, gofakeit.Number(0, 1_000_000)), + Email: fmt.Sprintf("scim-email-%d-%d@example.com", i, integration.Number()), }, }) require.NoError(t, err) diff --git a/internal/api/scim/integration_test/users_replace_test.go b/internal/api/scim/integration_test/users_replace_test.go index 7896ed4e00d..0d4cd2ba935 100644 --- a/internal/api/scim/integration_test/users_replace_test.go +++ b/internal/api/scim/integration_test/users_replace_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/text/language" @@ -200,28 +199,28 @@ func TestReplaceUser(t *testing.T) { }, { name: "not authenticated", - body: withUsername(minimalUserJson, gofakeit.Username()), + body: withUsername(minimalUserJson, integration.Username()), ctx: context.Background(), wantErr: true, errorStatus: http.StatusUnauthorized, }, { name: "no permissions", - body: withUsername(minimalUserJson, gofakeit.Username()), + body: withUsername(minimalUserJson, integration.Username()), ctx: Instance.WithAuthorization(CTX, integration.UserTypeNoPermission), wantErr: true, errorStatus: http.StatusNotFound, }, { name: "another org", - body: withUsername(minimalUserJson, gofakeit.Username()), + body: withUsername(minimalUserJson, integration.Username()), replaceUserOrgID: SecondaryOrganization.OrganizationId, wantErr: true, errorStatus: http.StatusNotFound, }, { name: "another org with permissions", - body: withUsername(minimalUserJson, gofakeit.Username()), + body: withUsername(minimalUserJson, integration.Username()), replaceUserOrgID: SecondaryOrganization.OrganizationId, ctx: Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner), wantErr: true, @@ -231,7 +230,7 @@ func TestReplaceUser(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { // use iam owner => we don't want to test permissions of the create endpoint. - createdUser, err := Instance.Client.SCIM.Users.Create(Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner), Instance.DefaultOrg.Id, withUsername(fullUserJson, gofakeit.Username())) + createdUser, err := Instance.Client.SCIM.Users.Create(Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner), Instance.DefaultOrg.Id, withUsername(fullUserJson, integration.Username())) require.NoError(t, err) ctx := tt.ctx @@ -290,7 +289,7 @@ func TestReplaceUser(t *testing.T) { func TestReplaceUser_removeOldMetadata(t *testing.T) { // ensure old metadata is removed correctly - username := gofakeit.Username() + username := integration.Username() createdUser, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) @@ -315,10 +314,10 @@ func TestReplaceUser_removeOldMetadata(t *testing.T) { func TestReplaceUser_emailType(t *testing.T) { // ensure old metadata is removed correctly - createdUser, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, gofakeit.Username())) + createdUser, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, integration.Username())) require.NoError(t, err) - replacedUsername := gofakeit.Username() + replacedUsername := integration.Username() _, err = Instance.Client.SCIM.Users.Replace(CTX, Instance.DefaultOrg.Id, createdUser.ID, withUsername(minimalUserWithEmailTypeReplaceJson, replacedUsername)) require.NoError(t, err) @@ -340,7 +339,7 @@ func TestReplaceUser_emailType(t *testing.T) { } func TestReplaceUser_scopedExternalID(t *testing.T) { - createdUser, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, gofakeit.Username())) + createdUser, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, integration.Username())) require.NoError(t, err) callingUserId, callingUserPat, err := Instance.CreateMachineUserPATWithMembership(CTX, "ORG_OWNER") require.NoError(t, err) diff --git a/internal/api/scim/integration_test/users_update_test.go b/internal/api/scim/integration_test/users_update_test.go index f8a65a8a691..ee735e8f43b 100644 --- a/internal/api/scim/integration_test/users_update_test.go +++ b/internal/api/scim/integration_test/users_update_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/text/language" @@ -53,7 +52,7 @@ func TestUpdateUser(t *testing.T) { { name: "not authenticated", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() created, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ @@ -68,7 +67,7 @@ func TestUpdateUser(t *testing.T) { { name: "no permissions", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() created, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ @@ -83,7 +82,7 @@ func TestUpdateUser(t *testing.T) { { name: "other org", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() created, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ @@ -98,7 +97,7 @@ func TestUpdateUser(t *testing.T) { { name: "other org with permissions", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() created, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ @@ -114,7 +113,7 @@ func TestUpdateUser(t *testing.T) { { name: "invalid patch json", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() created, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ @@ -128,7 +127,7 @@ func TestUpdateUser(t *testing.T) { { name: "password complexity violation", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() created, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ @@ -142,7 +141,7 @@ func TestUpdateUser(t *testing.T) { { name: "invalid profile url", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() created, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ @@ -156,7 +155,7 @@ func TestUpdateUser(t *testing.T) { { name: "invalid time zone", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() created, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ @@ -170,7 +169,7 @@ func TestUpdateUser(t *testing.T) { { name: "invalid locale", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() created, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ @@ -195,7 +194,7 @@ func TestUpdateUser(t *testing.T) { { name: "full", setup: func(t *testing.T) testCase { - username := gofakeit.Username() + username := integration.Username() created, err := Instance.Client.SCIM.Users.Create(CTX, Instance.DefaultOrg.Id, withUsername(fullUserJson, username)) require.NoError(t, err) return testCase{ diff --git a/internal/integration/client.go b/internal/integration/client.go index a5db09d9682..aa3b16781c4 100644 --- a/internal/integration/client.go +++ b/internal/integration/client.go @@ -8,7 +8,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/muhlemmer/gu" "github.com/stretchr/testify/require" "github.com/zitadel/logging" @@ -939,8 +938,9 @@ func (i *Instance) ActivateProjectGrant(ctx context.Context, t *testing.T, proje return resp } -func (i *Instance) CreateProjectUserGrant(t *testing.T, ctx context.Context, projectID, userID string) *mgmt.AddUserGrantResponse { - resp, err := i.Client.Mgmt.AddUserGrant(ctx, &mgmt.AddUserGrantRequest{ +func (i *Instance) CreateProjectUserGrant(t *testing.T, ctx context.Context, orgID, projectID, userID string) *mgmt.AddUserGrantResponse { + //nolint:staticcheck + resp, err := i.Client.Mgmt.AddUserGrant(SetOrgID(ctx, orgID), &mgmt.AddUserGrantRequest{ UserId: userID, ProjectId: projectID, }) @@ -949,6 +949,7 @@ func (i *Instance) CreateProjectUserGrant(t *testing.T, ctx context.Context, pro } func (i *Instance) CreateProjectGrantUserGrant(ctx context.Context, orgID, projectID, projectGrantID, userID string) *mgmt.AddUserGrantResponse { + //nolint:staticcheck resp, err := i.Client.Mgmt.AddUserGrant(SetOrgID(ctx, orgID), &mgmt.AddUserGrantRequest{ UserId: userID, ProjectId: projectID, @@ -1046,7 +1047,7 @@ func (i *Instance) DeleteProjectGrantMembership(t *testing.T, ctx context.Contex func (i *Instance) CreateTarget(ctx context.Context, t *testing.T, name, endpoint string, ty target_domain.TargetType, interrupt bool) *action.CreateTargetResponse { if name == "" { - name = gofakeit.Name() + name = TargetName() } req := &action.CreateTargetRequest{ Name: name, diff --git a/internal/integration/instance.go b/internal/integration/instance.go index 9e262cb3d94..704c8c50501 100644 --- a/internal/integration/instance.go +++ b/internal/integration/instance.go @@ -11,7 +11,6 @@ import ( "path/filepath" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/zitadel/logging" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/proto" @@ -263,7 +262,7 @@ func (i *Instance) setOrganization(ctx context.Context) { func (i *Instance) createMachineUser(ctx context.Context, userType UserType) (userID string) { mustAwait(func() error { - username := gofakeit.Username() + username := Username() userResp, err := i.Client.Mgmt.AddMachineUser(ctx, &management.AddMachineUserRequest{ UserName: username, Name: username, diff --git a/internal/integration/name.go b/internal/integration/name.go index 443ae7a3a4f..49f30ceebaf 100644 --- a/internal/integration/name.go +++ b/internal/integration/name.go @@ -11,6 +11,34 @@ func OrganizationName() string { return company() } +func Email() string { + return RandString(5) + gofakeit.Email() +} + +func Phone() string { + return "+41" + gofakeit.Phone() +} + +func FirstName() string { + return gofakeit.FirstName() +} + +func LastName() string { + return gofakeit.LastName() +} + +func Username() string { + return gofakeit.Username() + RandString(5) +} + +func Language() string { + return gofakeit.LanguageBCP() +} + +func UserSchemaName() string { + return gofakeit.Name() + RandString(5) +} + // appName private function to add a random string to the gofakeit.AppName function func appName() string { return gofakeit.AppName() + "-" + RandString(5) @@ -39,3 +67,27 @@ func RoleKey() string { func RoleDisplayName() string { return appName() } + +func DomainName() string { + return RandString(5) + gofakeit.DomainName() +} + +func URL() string { + return gofakeit.URL() +} + +func RelayState() string { + return ID() +} + +func ID() string { + return RandString(20) +} + +func Slogan() string { + return gofakeit.Slogan() +} + +func Number() int { + return gofakeit.Number(0, 1_000_000) +} diff --git a/internal/integration/oidc.go b/internal/integration/oidc.go index 3323be3f977..96af6c2be56 100644 --- a/internal/integration/oidc.go +++ b/internal/integration/oidc.go @@ -10,7 +10,6 @@ import ( "testing" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/zitadel/oidc/v3/pkg/client" "github.com/zitadel/oidc/v3/pkg/client/rp" "github.com/zitadel/oidc/v3/pkg/client/rs" @@ -135,7 +134,7 @@ func (i *Instance) CreateOIDCInactivateProjectClient(ctx context.Context, redire } func (i *Instance) CreateOIDCImplicitFlowClient(ctx context.Context, t *testing.T, redirectURI string, loginVersion *app.LoginVersion) (*management.AddOIDCAppResponse, error) { - project := i.CreateProject(ctx, t, "", gofakeit.AppName(), false, false) + project := i.CreateProject(ctx, t, "", ProjectName(), false, false) resp, err := i.Client.Mgmt.AddOIDCApp(ctx, &management.AddOIDCAppRequest{ ProjectId: project.GetId(), @@ -176,7 +175,7 @@ func (i *Instance) CreateOIDCImplicitFlowClient(ctx context.Context, t *testing. } func (i *Instance) CreateOIDCTokenExchangeClient(ctx context.Context, t *testing.T) (client *management.AddOIDCAppResponse, keyData []byte, err error) { - project := i.CreateProject(ctx, t, "", gofakeit.AppName(), false, false) + project := i.CreateProject(ctx, t, "", ProjectName(), false, false) return i.CreateOIDCWebClientJWT(ctx, "", "", project.GetId(), app.OIDCGrantType_OIDC_GRANT_TYPE_TOKEN_EXCHANGE, app.OIDCGrantType_OIDC_GRANT_TYPE_AUTHORIZATION_CODE, app.OIDCGrantType_OIDC_GRANT_TYPE_REFRESH_TOKEN) } @@ -373,7 +372,7 @@ func CheckRedirect(req *http.Request) (*url.URL, error) { } func (i *Instance) CreateOIDCCredentialsClient(ctx context.Context) (machine *management.AddMachineUserResponse, name, clientID, clientSecret string, err error) { - name = gofakeit.Username() + name = Username() machine, err = i.Client.Mgmt.AddMachineUser(ctx, &management.AddMachineUserRequest{ Name: name, UserName: name, @@ -392,7 +391,7 @@ func (i *Instance) CreateOIDCCredentialsClient(ctx context.Context) (machine *ma } func (i *Instance) CreateOIDCCredentialsClientInactive(ctx context.Context) (machine *management.AddMachineUserResponse, name, clientID, clientSecret string, err error) { - name = gofakeit.Username() + name = Username() machine, err = i.Client.Mgmt.AddMachineUser(ctx, &management.AddMachineUserRequest{ Name: name, UserName: name, @@ -417,7 +416,7 @@ func (i *Instance) CreateOIDCCredentialsClientInactive(ctx context.Context) (mac } func (i *Instance) CreateOIDCJWTProfileClient(ctx context.Context, keyLifetime time.Duration) (machine *management.AddMachineUserResponse, name string, keyData []byte, err error) { - name = gofakeit.Username() + name = Username() machine, err = i.Client.Mgmt.AddMachineUser(ctx, &management.AddMachineUserRequest{ Name: name, UserName: name, diff --git a/internal/integration/saml.go b/internal/integration/saml.go index 28934ac4216..a932c0d18da 100644 --- a/internal/integration/saml.go +++ b/internal/integration/saml.go @@ -13,7 +13,6 @@ import ( "strings" "time" - "github.com/brianvoe/gofakeit/v6" "github.com/crewjam/saml" "github.com/crewjam/saml/samlsp" "github.com/zitadel/logging" @@ -117,7 +116,7 @@ func (i *Instance) CreateSAMLClientLoginVersion(ctx context.Context, projectID s resp, err := i.Client.Mgmt.AddSAMLApp(ctx, &management.AddSAMLAppRequest{ ProjectId: projectID, - Name: fmt.Sprintf("app-%s", gofakeit.AppName()), + Name: ApplicationName(), Metadata: &management.AddSAMLAppRequest_MetadataXml{MetadataXml: spMetadata}, LoginVersion: loginVersion, })