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 f5bd7c50ec..15c9e338e9 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 @@ -1257,7 +1257,7 @@ func createSAMLSP(t *testing.T, idpMetadata *saml.EntityDescriptor, binding stri } 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/v2/integration_test/query_test.go b/internal/api/grpc/action/v2/integration_test/query_test.go index 2a93a4ad4b..be241092c2 100644 --- a/internal/api/grpc/action/v2/integration_test/query_test.go +++ b/internal/api/grpc/action/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" @@ -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", 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", 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", 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", 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", 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", 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", 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", domain.TargetTypeWebhook, false) resp2 := instance.CreateTarget(ctx, t, name2, "https://example.com", domain.TargetTypeCall, true) resp3 := instance.CreateTarget(ctx, t, name3, "https://example.com", domain.TargetTypeAsync, false) 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 5908a9d56e..69447be519 100644 --- a/internal/api/grpc/action/v2/integration_test/target_test.go +++ b/internal/api/grpc/action/v2/integration_test/target_test.go @@ -25,7 +25,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", domain.TargetTypeAsync, false) tests := []struct { name string diff --git a/internal/api/grpc/admin/integration_test/import_test.go b/internal/api/grpc/admin/integration_test/import_test.go index 3f0d364aec..9db81d0f17 100644 --- a/internal/api/grpc/admin/integration_test/import_test.go +++ b/internal/api/grpc/admin/integration_test/import_test.go @@ -37,20 +37,20 @@ func TestServer_ImportData(t *testing.T) { { OrgId: orgIDs[0], Org: &management.AddOrgRequest{ - Name: gofakeit.ProductName(), + Name: integration.OrganizationName(), }, Projects: []*v1.DataProject{ { ProjectId: projectIDs[0], Project: &management.AddProjectRequest{ - Name: gofakeit.AppName(), + Name: integration.ProjectName(), ProjectRoleAssertion: true, }, }, { ProjectId: projectIDs[1], Project: &management.AddProjectRequest{ - Name: gofakeit.AppName(), + Name: integration.ProjectName(), ProjectRoleAssertion: false, }, }, @@ -149,7 +149,7 @@ func TestServer_ImportData(t *testing.T) { { OrgId: orgIDs[1], Org: &management.AddOrgRequest{ - Name: gofakeit.ProductName(), + Name: integration.OrganizationName(), }, UserGrants: []*management.AddUserGrantRequest{ { @@ -167,7 +167,7 @@ func TestServer_ImportData(t *testing.T) { { OrgId: orgIDs[2], Org: &management.AddOrgRequest{ - Name: gofakeit.ProductName(), + Name: integration.OrganizationName(), }, UserGrants: []*management.AddUserGrantRequest{ { @@ -262,26 +262,26 @@ func TestServer_ImportData(t *testing.T) { { OrgId: orgIDs[4], Org: &management.AddOrgRequest{ - Name: gofakeit.ProductName(), + Name: integration.OrganizationName(), }, }, { OrgId: orgIDs[3], Org: &management.AddOrgRequest{ - Name: gofakeit.ProductName(), + Name: integration.OrganizationName(), }, Projects: []*v1.DataProject{ { ProjectId: projectIDs[2], Project: &management.AddProjectRequest{ - Name: gofakeit.AppName(), + Name: integration.ProjectName(), ProjectRoleAssertion: true, }, }, { ProjectId: projectIDs[3], Project: &management.AddProjectRequest{ - Name: gofakeit.AppName(), + Name: integration.ProjectName(), ProjectRoleAssertion: false, }, }, @@ -375,19 +375,19 @@ func TestServer_ImportData(t *testing.T) { { OrgId: orgIDs[6], Org: &management.AddOrgRequest{ - Name: gofakeit.ProductName(), + Name: integration.OrganizationName(), }, }, { OrgId: orgIDs[5], Org: &management.AddOrgRequest{ - Name: gofakeit.ProductName(), + Name: integration.OrganizationName(), }, Projects: []*v1.DataProject{ { ProjectId: projectIDs[4], Project: &management.AddProjectRequest{ - Name: gofakeit.AppName(), + Name: integration.ProjectName(), ProjectRoleAssertion: true, }, }, 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 67e59aa91d..c78b8613c4 100644 --- a/internal/api/grpc/app/v2beta/integration_test/app_test.go +++ b/internal/api/grpc/app/v2beta/integration_test/app_test.go @@ -13,12 +13,13 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "github.com/zitadel/zitadel/internal/integration" app "github.com/zitadel/zitadel/pkg/grpc/app/v2beta" org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta" ) func TestCreateApplication(t *testing.T) { - p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.Name(), false, false) + p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) t.Parallel() @@ -202,7 +203,7 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { inputCtx: LoginUserCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.Name(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{ AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT, @@ -271,7 +272,7 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { inputCtx: OrgOwnerCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.Name(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{ AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT, @@ -340,7 +341,7 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { inputCtx: projectOwnerCtx, creationRequest: &app.CreateApplicationRequest{ ProjectId: p.GetId(), - Name: gofakeit.Name(), + Name: integration.ApplicationName(), CreationRequestType: &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{ AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT, @@ -421,10 +422,10 @@ func TestCreateApplication_WithDifferentPermissions(t *testing.T) { } func TestUpdateApplication(t *testing.T) { - orgNotInCtx := instance.CreateOrganization(IAMOwnerCtx, gofakeit.Name(), gofakeit.Email()) + orgNotInCtx := instance.CreateOrganization(IAMOwnerCtx, integration.ProjectName(), gofakeit.Email()) pNotInCtx := instance.CreateProject(IAMOwnerCtx, t, orgNotInCtx.GetOrganizationId(), gofakeit.AppName(), false, false) - p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.Name(), false, false) + p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) baseURI := "http://example.com" @@ -855,7 +856,7 @@ func TestUpdateApplication_WithDifferentPermissions(t *testing.T) { } func TestDeleteApplication(t *testing.T) { - p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.Name(), false, false) + p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) reqForAppNameCreation := &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT}, @@ -975,7 +976,7 @@ func TestDeleteApplication_WithDifferentPermissions(t *testing.T) { } func TestDeactivateApplication(t *testing.T) { - p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.Name(), false, false) + p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) reqForAppNameCreation := &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT}, @@ -1096,7 +1097,7 @@ func TestDeactivateApplication_WithDifferentPermissions(t *testing.T) { } func TestReactivateApplication(t *testing.T) { - p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.Name(), false, false) + p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) reqForAppNameCreation := &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT}, @@ -1229,7 +1230,7 @@ func TestReactivateApplication_WithDifferentPermissions(t *testing.T) { } func TestRegenerateClientSecret(t *testing.T) { - p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.Name(), false, false) + p := instance.CreateProject(IAMOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) reqForApiAppCreation := &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT}, 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 4f6679da7f..14b55cb1d7 100644 --- a/internal/api/grpc/app/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/app/v2beta/integration_test/query_test.go @@ -23,7 +23,7 @@ import ( func TestGetApplication(t *testing.T) { p, projectOwnerCtx := getProjectAndProjectContext(t, instance, IAMOwnerCtx) - apiAppName := gofakeit.AppName() + apiAppName := integration.ApplicationName() createdApiApp, errAPIAppCreation := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), Name: apiAppName, @@ -35,7 +35,7 @@ func TestGetApplication(t *testing.T) { }) require.Nil(t, errAPIAppCreation) - samlAppName := gofakeit.AppName() + samlAppName := integration.ApplicationName() createdSAMLApp, errSAMLAppCreation := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), Name: samlAppName, @@ -48,7 +48,7 @@ func TestGetApplication(t *testing.T) { }) require.Nil(t, errSAMLAppCreation) - oidcAppName := gofakeit.AppName() + oidcAppName := integration.ApplicationName() createdOIDCApp, errOIDCAppCreation := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: p.GetId(), Name: oidcAppName, @@ -464,7 +464,7 @@ func TestListApplications_WithPermissionV2(t *testing.T) { p, projectOwnerCtx := getProjectAndProjectContext(t, instancePermissionV2, iamOwnerCtx) _, otherProjectOwnerCtx := getProjectAndProjectContext(t, instancePermissionV2, iamOwnerCtx) - appName1, appName2, appName3 := gofakeit.AppName(), gofakeit.AppName(), gofakeit.AppName() + appName1, appName2, appName3 := integration.ApplicationName(), integration.ApplicationName(), integration.ApplicationName() reqForAPIAppCreation := &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT}, } 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 8ba012c18b..b9c342005d 100644 --- a/internal/api/grpc/app/v2beta/integration_test/server_test.go +++ b/internal/api/grpc/app/v2beta/integration_test/server_test.go @@ -52,7 +52,7 @@ func TestMain(m *testing.M) { } func getProjectAndProjectContext(t *testing.T, inst *integration.Instance, ctx context.Context) (*project_v2beta.CreateProjectResponse, context.Context) { - project := inst.CreateProject(ctx, t, inst.DefaultOrg.GetId(), gofakeit.Name(), false, false) + project := inst.CreateProject(ctx, t, inst.DefaultOrg.GetId(), integration.ProjectName(), false, false) userResp := inst.CreateMachineUser(ctx) patResp := inst.CreatePersonalAccessToken(ctx, userResp.GetUserId()) inst.CreateProjectMembership(t, ctx, project.GetId(), userResp.GetUserId()) @@ -83,7 +83,7 @@ func samlMetadataGen(entityID string) []byte { func createSAMLAppWithName(t *testing.T, baseURI, projectID string) ([]byte, *app.CreateApplicationResponse, string) { samlMetas := samlMetadataGen(gofakeit.URL()) - appName := gofakeit.AppName() + appName := integration.ApplicationName() appForSAMLConfigChange, appSAMLConfigChangeErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: projectID, @@ -114,7 +114,7 @@ func createSAMLApp(t *testing.T, baseURI, projectID string) ([]byte, *app.Create } func createOIDCAppWithName(t *testing.T, baseURI, projectID string) (*app.CreateApplicationResponse, string) { - appName := gofakeit.AppName() + appName := integration.ApplicationName() appForOIDCConfigChange, appOIDCConfigChangeErr := instance.Client.AppV2Beta.CreateApplication(IAMOwnerCtx, &app.CreateApplicationRequest{ ProjectId: projectID, @@ -152,7 +152,7 @@ func createOIDCApp(t *testing.T, baseURI, projctID string) *app.CreateApplicatio } func createAPIAppWithName(t *testing.T, ctx context.Context, inst *integration.Instance, projectID string) (*app.CreateApplicationResponse, string) { - appName := gofakeit.AppName() + appName := integration.ApplicationName() reqForAPIAppCreation := &app.CreateApplicationRequest_ApiRequest{ ApiRequest: &app.CreateAPIApplicationRequest{AuthMethodType: app.APIAuthMethodType_API_AUTH_METHOD_TYPE_PRIVATE_KEY_JWT}, 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 d24844f2a2..6bbbbdae29 100644 --- a/internal/api/grpc/authorization/v2beta/integration_test/authorization_test.go +++ b/internal/api/grpc/authorization/v2beta/integration_test/authorization_test.go @@ -33,11 +33,11 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId request.OrganizationId = &selfOrgId request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - request.RoleKeys = []string{gofakeit.AppName()} - Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], gofakeit.AppName(), "") + request.RoleKeys = []string{integration.RoleKey()} + Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "") request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) Instance.CreateProjectMembership(t, IAMCTX, request.ProjectId, callingUser.Id) @@ -51,10 +51,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - request.RoleKeys = []string{gofakeit.AppName()} - Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], gofakeit.AppName(), "") + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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(), "") request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) Instance.CreateProjectMembership(t, IAMCTX, request.ProjectId, callingUser.Id) @@ -68,11 +68,11 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId request.OrganizationId = &selfOrgId - request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - request.RoleKeys = []string{gofakeit.AppName()} - Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], gofakeit.AppName(), "") + 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 callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) Instance.CreateOrgMembership(t, IAMCTX, selfOrgId, callingUser.Id) @@ -87,11 +87,11 @@ func TestServer_CreateAuthorization(t *testing.T) { args: args{ func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context { - selfOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId request.OrganizationId = &selfOrgId - request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - request.RoleKeys = []string{gofakeit.AppName()} - Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], gofakeit.AppName(), "") + 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 callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) token, err := Instance.Client.UserV2.AddPersonalAccessToken(IAMCTX, &user.AddPersonalAccessTokenRequest{UserId: callingUser.Id, ExpirationDate: timestamppb.New(time.Now().Add(24 * time.Hour))}) @@ -105,10 +105,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId request.OrganizationId = &selfOrgId - request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - request.RoleKeys = []string{gofakeit.AppName()} + request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id + request.RoleKeys = []string{integration.RoleKey()} request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) Instance.CreateProjectMembership(t, IAMCTX, request.ProjectId, callingUser.Id) @@ -123,9 +123,9 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId request.OrganizationId = &selfOrgId - request.ProjectId = gofakeit.AppName() + request.ProjectId = "notexists" request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) token, err := Instance.Client.UserV2.AddPersonalAccessToken(IAMCTX, &user.AddPersonalAccessTokenRequest{UserId: callingUser.Id, ExpirationDate: timestamppb.New(time.Now().Add(24 * time.Hour))}) @@ -139,9 +139,9 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - request.OrganizationId = gu.Ptr(gofakeit.AppName()) - request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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 callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) Instance.CreateProjectMembership(t, IAMCTX, request.ProjectId, callingUser.Id) @@ -157,12 +157,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId request.OrganizationId = &selfOrgId - foreignOrg := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()) - request.ProjectId = Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, gofakeit.AppName(), false, false).Id - request.RoleKeys = []string{gofakeit.AppName()} - Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], gofakeit.AppName(), "") + foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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(), "") Instance.CreateProjectGrant(IAMCTX, t, request.ProjectId, selfOrgId, request.RoleKeys...) request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) @@ -178,11 +178,11 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId request.OrganizationId = &selfOrgId - foreignOrg := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()) - request.ProjectId = Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, gofakeit.AppName(), false, false).Id - request.RoleKeys = []string{gofakeit.AppName()} + foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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.CreateProjectGrant(IAMCTX, t, request.ProjectId, selfOrgId) request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID @@ -199,13 +199,13 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId request.OrganizationId = &selfOrgId - foreignOrg := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()) - projectID := Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, gofakeit.AppName(), false, false).Id + foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()) + projectID := Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, integration.ProjectName(), false, false).Id request.ProjectId = projectID - request.RoleKeys = []string{gofakeit.AppName()} - Instance.AddProjectRole(IAMCTX, t, projectID, request.RoleKeys[0], gofakeit.AppName(), "") + request.RoleKeys = []string{integration.RoleKey()} + Instance.AddProjectRole(IAMCTX, t, projectID, request.RoleKeys[0], integration.RoleDisplayName(), "") request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) Instance.CreateProjectMembership(t, IAMCTX, projectID, callingUser.Id) @@ -221,12 +221,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId request.OrganizationId = &selfOrgId - foreignOrg := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()) - request.ProjectId = Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, gofakeit.AppName(), false, false).Id - request.RoleKeys = []string{gofakeit.AppName()} - Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], gofakeit.AppName(), "") + foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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(), "") request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) Instance.CreateProjectMembership(t, authz.SetCtxData(IAMCTX, authz.CtxData{OrgID: foreignOrg.OrganizationId}), request.ProjectId, callingUser.Id) @@ -272,10 +272,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") preparedAuthorization, err := Instance.Client.AuthorizationV2Beta.CreateAuthorization(IAMCTX, &authorization.CreateAuthorizationRequest{ @@ -298,10 +298,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") preparedAuthorization, err := Instance.Client.AuthorizationV2Beta.CreateAuthorization(IAMCTX, &authorization.CreateAuthorizationRequest{ @@ -311,7 +311,7 @@ func TestServer_UpdateAuthorization(t *testing.T) { }) require.NoError(t, err) request.Id = preparedAuthorization.Id - request.RoleKeys = []string{projectRole1, projectRole2, gofakeit.AppName()} + request.RoleKeys = []string{projectRole1, projectRole2, "rolenotfound"} callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId) Instance.CreateProjectMembership(t, IAMCTX, projectId, callingUser.Id) token, err := Instance.Client.UserV2.AddPersonalAccessToken(IAMCTX, &user.AddPersonalAccessTokenRequest{UserId: callingUser.Id, ExpirationDate: timestamppb.New(time.Now().Add(24 * time.Hour))}) @@ -325,10 +325,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") preparedAuthorization, err := Instance.Client.AuthorizationV2Beta.CreateAuthorization(IAMCTX, &authorization.CreateAuthorizationRequest{ @@ -352,12 +352,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() - projectRole3 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id + projectRole1 := integration.RoleKey() + projectRole2 := integration.RoleKey() + projectRole3 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole3, projectRole3, "") @@ -382,12 +382,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() - projectRole3 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id + projectRole1 := integration.RoleKey() + projectRole2 := integration.RoleKey() + projectRole3 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole3, projectRole3, "") @@ -414,12 +414,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() - projectRole3 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id + projectRole1 := integration.RoleKey() + projectRole2 := integration.RoleKey() + projectRole3 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole3, projectRole3, "") @@ -486,10 +486,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") preparedAuthorization, err := Instance.Client.AuthorizationV2Beta.CreateAuthorization(IAMCTX, &authorization.CreateAuthorizationRequest{ @@ -510,8 +510,8 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId + 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() @@ -536,12 +536,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() - projectRole3 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id + projectRole1 := integration.RoleKey() + projectRole2 := integration.RoleKey() + projectRole3 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole3, projectRole3, "") @@ -567,12 +567,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() - projectRole3 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id + projectRole1 := integration.RoleKey() + projectRole2 := integration.RoleKey() + projectRole3 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole3, projectRole3, "") @@ -595,10 +595,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() + 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{ @@ -660,10 +660,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") preparedAuthorization, err := Instance.Client.AuthorizationV2Beta.CreateAuthorization(IAMCTX, &authorization.CreateAuthorizationRequest{ @@ -684,11 +684,11 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), 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(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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{ @@ -710,12 +710,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() - projectRole3 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id + projectRole1 := integration.RoleKey() + projectRole2 := integration.RoleKey() + projectRole3 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole3, projectRole3, "") @@ -741,12 +741,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() - projectRole3 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id + projectRole1 := integration.RoleKey() + projectRole2 := integration.RoleKey() + projectRole3 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole3, projectRole3, "") @@ -768,10 +768,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") preparedAuthorization, err := Instance.Client.AuthorizationV2Beta.CreateAuthorization(IAMCTX, &authorization.CreateAuthorizationRequest{ @@ -833,10 +833,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") preparedAuthorization, err := Instance.Client.AuthorizationV2Beta.CreateAuthorization(IAMCTX, &authorization.CreateAuthorizationRequest{ @@ -861,11 +861,11 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), 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(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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{ @@ -891,12 +891,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() - projectRole3 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id + projectRole1 := integration.RoleKey() + projectRole2 := integration.RoleKey() + projectRole3 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole3, projectRole3, "") @@ -926,12 +926,12 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - foreignOrgId := Instance.CreateOrganization(IAMCTX, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() - projectRole3 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId + projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id + projectRole1 := integration.RoleKey() + projectRole2 := integration.RoleKey() + projectRole3 := integration.RoleKey() Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole3, projectRole3, "") @@ -956,10 +956,10 @@ 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, gofakeit.AppName(), gofakeit.Email()).OrganizationId - projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id - projectRole1 := gofakeit.AppName() - projectRole2 := gofakeit.AppName() + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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, "") Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "") preparedAuthorization, err := Instance.Client.AuthorizationV2Beta.CreateAuthorization(IAMCTX, &authorization.CreateAuthorizationRequest{ @@ -1004,7 +1004,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, gofakeit.AppName(), gofakeit.Email()).OrganizationId + selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.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 c3579d9192..2b30cdbb1a 100644 --- a/internal/api/grpc/authorization/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/authorization/v2beta/integration_test/query_test.go @@ -442,7 +442,7 @@ func assertPaginationResponse(t *assert.CollectT, expected *filter.PaginationRes } func createAuthorization(ctx context.Context, instance *integration.Instance, t *testing.T, orgID, userID string, grant bool) *authorization.Authorization { - projectName := gofakeit.AppName() + projectName := integration.ProjectName() projectResp := instance.CreateProject(ctx, t, orgID, projectName, false, false) if grant { @@ -476,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 := gofakeit.Company() + integration.RandString(10) + grantedOrgName := integration.OrganizationName() grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, gofakeit.Email()) instance.CreateProjectGrant(ctx, t, projectID, grantedOrg.GetOrganizationId()) @@ -510,7 +510,7 @@ func createAuthorizationForProjectGrant(ctx context.Context, instance *integrati } func createProject(ctx context.Context, instance *integration.Instance, t *testing.T, orgID string, projectRoleCheck, hasProjectCheck bool) *project.Project { - name := gofakeit.AppName() + name := integration.ProjectName() resp := instance.CreateProject(ctx, t, orgID, name, projectRoleCheck, hasProjectCheck) return &project.Project{ Id: resp.GetId(), @@ -527,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 := gofakeit.AppName() + grantedOrgName := integration.OrganizationName() grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, gofakeit.Email()) projectGrantResp := instance.CreateProjectGrant(ctx, t, projectToGrant.GetId(), grantedOrg.GetOrganizationId()) 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 4d8e1c057c..24ab0114f7 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 @@ -15,7 +15,7 @@ import ( ) func TestServer_CreateAdministrator(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) type want struct { creationDate bool @@ -194,7 +194,7 @@ func TestServer_CreateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.UserId = userResp.GetId() request.Resource = &internal_permission.ResourceType{ @@ -215,7 +215,7 @@ func TestServer_CreateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.UserId = userResp.GetId() request.Resource = &internal_permission.ResourceType{ @@ -234,7 +234,7 @@ func TestServer_CreateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.UserId = userResp.GetId() request.Resource = &internal_permission.ResourceType{ Resource: &internal_permission.ResourceType_ProjectGrant_{ @@ -255,7 +255,7 @@ func TestServer_CreateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) @@ -281,7 +281,7 @@ func TestServer_CreateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) @@ -320,11 +320,11 @@ func TestServer_CreateAdministrator(t *testing.T) { } func TestServer_CreateAdministrator_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) userProjectResp := instance.CreateMachineUser(iamOwnerCtx) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userProjectResp.GetUserId()) patProjectResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userProjectResp.GetUserId()) projectOwnerCtx := integration.WithAuthorizationToken(CTX, patProjectResp.Token) @@ -365,7 +365,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { }, { name: "missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) request.UserId = userResp.GetId() @@ -382,7 +382,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { }, { name: "instance, missing permission, org owner", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) request.UserId = userResp.GetId() @@ -437,7 +437,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { }, { name: "org, org owner, ok", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) request.UserId = userResp.GetId() @@ -456,7 +456,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { }, { name: "org, missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) request.UserId = userResp.GetId() @@ -493,7 +493,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { }, { name: "project, missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) @@ -534,7 +534,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) { }, { name: "project grant, missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.CreateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) @@ -585,7 +585,7 @@ func assertCreateAdministratorResponse(t *testing.T, creationDate, changeDate ti } func TestServer_UpdateAdministrator(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) type want struct { change bool @@ -795,7 +795,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) request.UserId = userResp.GetId() @@ -818,7 +818,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) request.UserId = userResp.GetId() @@ -841,7 +841,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) request.UserId = userResp.GetId() @@ -861,7 +861,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) @@ -885,7 +885,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) @@ -913,7 +913,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) @@ -941,7 +941,7 @@ func TestServer_UpdateAdministrator(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) @@ -984,11 +984,11 @@ func TestServer_UpdateAdministrator(t *testing.T) { } func TestServer_UpdateAdministrator_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) userProjectResp := instance.CreateMachineUser(iamOwnerCtx) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userProjectResp.GetUserId()) patProjectResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userProjectResp.GetUserId()) projectOwnerCtx := integration.WithAuthorizationToken(CTX, patProjectResp.Token) @@ -1030,7 +1030,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { }, { name: "missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) @@ -1048,7 +1048,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { }, { name: "instance, missing permission, org owner", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) @@ -1106,7 +1106,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { }, { name: "org, org owner, ok", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) @@ -1126,7 +1126,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { }, { name: "org, missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) @@ -1164,7 +1164,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { }, { name: "project, missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) @@ -1205,7 +1205,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) { }, { name: "project grant, missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.UpdateAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) @@ -1277,7 +1277,7 @@ func assertUpdateAdministratorResponse(t *testing.T, creationDate, changeDate ti } func TestServer_DeleteAdministrator(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) tests := []struct { name string @@ -1438,7 +1438,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) request.UserId = userResp.GetId() @@ -1458,7 +1458,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + 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()) @@ -1479,7 +1479,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) @@ -1503,7 +1503,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) @@ -1528,7 +1528,7 @@ func TestServer_DeleteAdministrator(t *testing.T) { prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email()) instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId()) @@ -1567,11 +1567,11 @@ func TestServer_DeleteAdministrator(t *testing.T) { } func TestServer_DeleteAdministrator_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) userProjectResp := instance.CreateMachineUser(iamOwnerCtx) - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userProjectResp.GetUserId()) patProjectResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userProjectResp.GetUserId()) projectOwnerCtx := integration.WithAuthorizationToken(CTX, patProjectResp.Token) @@ -1612,7 +1612,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { }, { name: "missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.DeleteAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) @@ -1629,7 +1629,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { }, { name: "instance, missing permission, org owner", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.DeleteAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId()) @@ -1684,7 +1684,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { }, { name: "org, org owner, ok", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *internal_permission.DeleteAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) @@ -1703,7 +1703,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { }, { name: "org, missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.DeleteAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId()) @@ -1739,7 +1739,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { }, { name: "project, missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.DeleteAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId()) @@ -1778,7 +1778,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) { }, { name: "project grant, missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *internal_permission.DeleteAdministratorRequest) { userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), 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 84eea98992..a7ca752315 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 @@ -648,9 +648,9 @@ func TestServer_ListAdministrators_PermissionV2(t *testing.T) { // ensureFeaturePermissionV2Enabled(t, instancePermissionV2) iamOwnerCtx := instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - projectName := gofakeit.AppName() + projectName := integration.ProjectName() projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), projectName, false, false) - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.Company(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) instancePermissionV2.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId()) userProjectResp := instancePermissionV2.CreateMachineUser(iamOwnerCtx) 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 31d6177201..c725231e3a 100644 --- a/internal/api/grpc/oidc/v2/integration_test/oidc_test.go +++ b/internal/api/grpc/oidc/v2/integration_test/oidc_test.go @@ -24,7 +24,7 @@ import ( ) 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) @@ -97,7 +97,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) @@ -387,7 +387,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { projectID, clientID := createOIDCApplication(ctx, t, true, true) projectID2, _ := createOIDCApplication(ctx, t, true, true) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.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()) @@ -402,7 +402,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) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.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()) @@ -423,7 +423,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) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.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()) @@ -444,7 +444,7 @@ 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, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) @@ -468,7 +468,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) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + 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()) @@ -528,7 +528,7 @@ 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, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + 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()) @@ -547,7 +547,7 @@ 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, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) @@ -560,7 +560,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) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.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()) @@ -580,7 +580,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) - orgResp := Instance.CreateOrganization(ctx, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) @@ -609,7 +609,7 @@ 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, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndAuthRequestForCallback(ctx, t, clientID, Instance.Users.Get(integration.UserTypeLogin).ID, user.GetUserId()) @@ -622,7 +622,7 @@ 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, "oidc-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) @@ -656,7 +656,7 @@ func TestServer_CreateCallback_Permission(t *testing.T) { } func TestServer_GetDeviceAuthorizationRequest(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) @@ -713,7 +713,7 @@ func TestServer_GetDeviceAuthorizationRequest(t *testing.T) { } func TestServer_AuthorizeOrDenyDeviceAuthorization(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) sessionResp := createSession(t, CTXLoginClient, Instance.Users[integration.UserTypeLogin].ID) @@ -932,7 +932,7 @@ 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() 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 b28bbf5ef2..fa31d7c10c 100644 --- a/internal/api/grpc/org/v2/integration_test/org_test.go +++ b/internal/api/grpc/org/v2/integration_test/org_test.go @@ -74,7 +74,7 @@ func TestServer_AddOrganization(t *testing.T) { name: "invalid admin type", ctx: CTX, req: &org.AddOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), Admins: []*org.AddOrganizationRequest_Admin{ {}, }, @@ -85,7 +85,7 @@ func TestServer_AddOrganization(t *testing.T) { name: "no admin, custom org ID", ctx: CTX, req: &org.AddOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), OrgId: gu.Ptr("custom-org-ID"), }, want: &org.AddOrganizationResponse{ @@ -97,7 +97,7 @@ func TestServer_AddOrganization(t *testing.T) { name: "admin with init with userID passed for Human admin", ctx: CTX, req: &org.AddOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), Admins: []*org.AddOrganizationRequest_Admin{ { UserType: &org.AddOrganizationRequest_Admin_Human{ @@ -133,7 +133,7 @@ func TestServer_AddOrganization(t *testing.T) { name: "existing user and new human with idp", ctx: CTX, req: &org.AddOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), Admins: []*org.AddOrganizationRequest_Admin{ { UserType: &org.AddOrganizationRequest_Admin_UserId{UserId: User.GetUserId()}, 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 a8a507bab3..00941945f7 100644 --- a/internal/api/grpc/org/v2beta/integration_test/org_test.go +++ b/internal/api/grpc/org/v2beta/integration_test/org_test.go @@ -99,7 +99,7 @@ func TestServer_CreateOrganization(t *testing.T) { name: "invalid admin type", ctx: CTX, req: &v2beta_org.CreateOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), Admins: []*v2beta_org.CreateOrganizationRequest_Admin{ {}, }, @@ -110,7 +110,7 @@ func TestServer_CreateOrganization(t *testing.T) { name: "existing user as admin", ctx: CTX, req: &v2beta_org.CreateOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), Admins: []*v2beta_org.CreateOrganizationRequest_Admin{ { UserType: &v2beta_org.CreateOrganizationRequest_Admin_UserId{UserId: User.GetUserId()}, @@ -133,7 +133,7 @@ func TestServer_CreateOrganization(t *testing.T) { name: "admin with init", ctx: CTX, req: &v2beta_org.CreateOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), Admins: []*v2beta_org.CreateOrganizationRequest_Admin{ { UserType: &v2beta_org.CreateOrganizationRequest_Admin_Human{ @@ -172,7 +172,7 @@ func TestServer_CreateOrganization(t *testing.T) { name: "existing user and new human with idp", ctx: CTX, req: &v2beta_org.CreateOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), Admins: []*v2beta_org.CreateOrganizationRequest_Admin{ { UserType: &v2beta_org.CreateOrganizationRequest_Admin_UserId{UserId: User.GetUserId()}, @@ -227,7 +227,7 @@ func TestServer_CreateOrganization(t *testing.T) { ctx: CTX, id: "custom_id", req: &v2beta_org.CreateOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), Id: gu.Ptr("custom_id"), }, want: &v2beta_org.CreateOrganizationResponse{ @@ -1099,7 +1099,7 @@ func TestServer_AddOrganizationDomain_ClaimDomain(t *testing.T) { // create an organization, ensure it has globally unique usernames // and create a user with a loginname that matches the domain later on organization, err := Client.CreateOrganization(CTX, &v2beta_org.CreateOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), }) require.NoError(t, err) _, err = Instance.Client.Admin.AddCustomDomainPolicy(CTX, &admin.AddCustomDomainPolicyRequest{ @@ -1113,7 +1113,7 @@ func TestServer_AddOrganizationDomain_ClaimDomain(t *testing.T) { // create another organization, ensure it has globally unique usernames // and create a user with a loginname that matches the domain later on otherOrg, err := Client.CreateOrganization(CTX, &v2beta_org.CreateOrganizationRequest{ - Name: gofakeit.AppName(), + Name: integration.OrganizationName(), }) require.NoError(t, err) _, err = Instance.Client.Admin.AddCustomDomainPolicy(CTX, &admin.AddCustomDomainPolicyRequest{ 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 34fa10e3de..b6b4322927 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 @@ -15,8 +15,8 @@ import ( ) func TestServer_CreateProjectGrant(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type want struct { creationDate bool @@ -49,7 +49,7 @@ func TestServer_CreateProjectGrant(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { request.ProjectId = "something" - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -59,7 +59,7 @@ func TestServer_CreateProjectGrant(t *testing.T) { name: "org not existing", ctx: iamOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = "something" @@ -71,10 +71,10 @@ func TestServer_CreateProjectGrant(t *testing.T) { name: "already existing, error", ctx: iamOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -86,7 +86,7 @@ func TestServer_CreateProjectGrant(t *testing.T) { name: "same organization, error", ctx: iamOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = orgResp.GetOrganizationId() @@ -98,10 +98,10 @@ func TestServer_CreateProjectGrant(t *testing.T) { name: "empty, ok", ctx: iamOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -113,12 +113,12 @@ func TestServer_CreateProjectGrant(t *testing.T) { name: "with roles, not existing", ctx: iamOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { - roles := []string{gofakeit.Name(), gofakeit.Name(), gofakeit.Name()} - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()} + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() request.RoleKeys = roles - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -128,8 +128,8 @@ func TestServer_CreateProjectGrant(t *testing.T) { name: "with roles, ok", ctx: iamOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { - roles := []string{gofakeit.Name(), gofakeit.Name(), gofakeit.Name()} - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()} + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() for _, role := range roles { instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "") @@ -137,7 +137,7 @@ func TestServer_CreateProjectGrant(t *testing.T) { request.RoleKeys = roles - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -166,8 +166,8 @@ func TestServer_CreateProjectGrant(t *testing.T) { } func TestServer_CreateProjectGrant_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) userResp := instance.CreateMachineUser(iamOwnerCtx) patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId()) @@ -190,8 +190,8 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { name: "unauthenticated", ctx: CTX, prepare: func(request *project.CreateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId() @@ -201,10 +201,10 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { }, { name: "no permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *project.CreateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId() @@ -216,8 +216,8 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { name: "project owner, other project", ctx: projectOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId() @@ -231,7 +231,7 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { prepare: func(request *project.CreateProjectGrantRequest) { request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -241,10 +241,10 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { }, { name: "organization owner, other org", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.CreateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId() @@ -254,12 +254,12 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { }, { name: "organization owner, ok", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.CreateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() }, req: &project.CreateProjectGrantRequest{}, @@ -271,8 +271,8 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) { name: "instance owner", ctx: iamOwnerCtx, prepare: func(request *project.CreateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.ProjectId = projectResp.GetId() request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId() @@ -315,8 +315,8 @@ func assertCreateProjectGrantResponse(t *testing.T, creationDate, changeDate tim } func TestServer_UpdateProjectGrant(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -351,10 +351,10 @@ func TestServer_UpdateProjectGrant(t *testing.T) { { name: "no change, ok", prepare: func(request *project.UpdateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -371,11 +371,11 @@ func TestServer_UpdateProjectGrant(t *testing.T) { { name: "change roles, ok", prepare: func(request *project.UpdateProjectGrantRequest) { - roles := []string{gofakeit.Animal(), gofakeit.Animal(), gofakeit.Animal()} - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()} + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() for _, role := range roles { instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "") @@ -396,14 +396,14 @@ func TestServer_UpdateProjectGrant(t *testing.T) { { name: "change roles, not existing", prepare: func(request *project.UpdateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) - request.RoleKeys = []string{gofakeit.Animal(), gofakeit.Animal(), gofakeit.Animal()} + request.RoleKeys = []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()} }, args: args{ ctx: iamOwnerCtx, @@ -435,12 +435,12 @@ func TestServer_UpdateProjectGrant(t *testing.T) { } func TestServer_UpdateProjectGrant_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) userResp := instance.CreateMachineUser(iamOwnerCtx) patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId()) - projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false).GetId() instance.CreateProjectGrant(iamOwnerCtx, t, projectID, orgResp.GetOrganizationId()) instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectID, orgResp.GetOrganizationId(), userResp.GetUserId()) projectGrantOwnerCtx := integration.WithAuthorizationToken(CTX, patResp.Token) @@ -463,10 +463,10 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { { name: "unauthenticated", prepare: func(request *project.UpdateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -482,16 +482,16 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { { name: "no permission", prepare: func(request *project.UpdateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.UpdateProjectGrantRequest{ RoleKeys: []string{"nopermission"}, }, @@ -501,7 +501,7 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { { name: "project grant owner, no permission", prepare: func(request *project.UpdateProjectGrantRequest) { - roles := []string{gofakeit.Animal(), gofakeit.Animal(), gofakeit.Animal()} + roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()} request.ProjectId = projectID request.GrantedOrganizationId = orgResp.GetOrganizationId() @@ -520,16 +520,16 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { { name: "organization owner, other org", prepare: func(request *project.UpdateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.UpdateProjectGrantRequest{ RoleKeys: []string{"nopermission"}, }, @@ -539,11 +539,11 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { { name: "organization owner, ok", prepare: func(request *project.UpdateProjectGrantRequest) { - roles := []string{gofakeit.Animal(), gofakeit.Animal(), gofakeit.Animal()} - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()} + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() for _, role := range roles { instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "") @@ -553,7 +553,7 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { request.RoleKeys = roles }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.UpdateProjectGrantRequest{}, }, want: want{ @@ -564,11 +564,11 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) { { name: "instance owner, ok", prepare: func(request *project.UpdateProjectGrantRequest) { - roles := []string{gofakeit.Animal(), gofakeit.Animal(), gofakeit.Animal()} - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()} + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() for _, role := range roles { instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "") @@ -622,8 +622,8 @@ func assertUpdateProjectGrantResponse(t *testing.T, creationDate, changeDate tim } func TestServer_DeleteProjectGrant(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) tests := []struct { name string @@ -664,10 +664,10 @@ func TestServer_DeleteProjectGrant(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -681,10 +681,10 @@ func TestServer_DeleteProjectGrant(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -699,10 +699,10 @@ func TestServer_DeleteProjectGrant(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -731,8 +731,8 @@ func TestServer_DeleteProjectGrant(t *testing.T) { } func TestServer_DeleteProjectGrant_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) tests := []struct { name string @@ -746,10 +746,10 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) { name: "unauthenticated", ctx: CTX, prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -760,12 +760,12 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) { }, { name: "no permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -776,13 +776,13 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) { }, { name: "organization owner, other org", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -793,13 +793,13 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) { }, { name: "organization owner, ok", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -813,10 +813,10 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -856,8 +856,8 @@ func assertDeleteProjectGrantResponse(t *testing.T, creationDate, deletionDate t } func TestServer_DeactivateProjectGrant(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -877,16 +877,16 @@ func TestServer_DeactivateProjectGrant(t *testing.T) { { name: "missing permission", prepare: func(request *project.DeactivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.DeactivateProjectGrantRequest{}, }, wantErr: true, @@ -907,10 +907,10 @@ func TestServer_DeactivateProjectGrant(t *testing.T) { { name: "no change, ok", prepare: func(request *project.DeactivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -928,10 +928,10 @@ func TestServer_DeactivateProjectGrant(t *testing.T) { { name: "change, ok", prepare: func(request *project.DeactivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -967,8 +967,8 @@ func TestServer_DeactivateProjectGrant(t *testing.T) { } func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -988,10 +988,10 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { { name: "unauthenticated", prepare: func(request *project.DeactivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1005,16 +1005,16 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { { name: "no permission", prepare: func(request *project.DeactivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.DeactivateProjectGrantRequest{}, }, wantErr: true, @@ -1022,16 +1022,16 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { { name: "organization owner, other org", prepare: func(request *project.DeactivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.DeactivateProjectGrantRequest{}, }, wantErr: true, @@ -1039,16 +1039,16 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { { name: "organization owner, ok", prepare: func(request *project.DeactivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.DeactivateProjectGrantRequest{}, }, want: want{ @@ -1059,10 +1059,10 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) { { name: "instance owner, ok", prepare: func(request *project.DeactivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1110,8 +1110,8 @@ func assertDeactivateProjectGrantResponse(t *testing.T, creationDate, changeDate } func TestServer_ActivateProjectGrant(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -1144,10 +1144,10 @@ func TestServer_ActivateProjectGrant(t *testing.T) { { name: "no change, ok", prepare: func(request *project.ActivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1164,10 +1164,10 @@ func TestServer_ActivateProjectGrant(t *testing.T) { { name: "change, ok", prepare: func(request *project.ActivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1204,8 +1204,8 @@ func TestServer_ActivateProjectGrant(t *testing.T) { } func TestServer_ActivateProjectGrant_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -1225,10 +1225,10 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) { { name: "unauthenticated", prepare: func(request *project.ActivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) @@ -1242,17 +1242,17 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) { { name: "no permission", prepare: func(request *project.ActivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) instance.DeactivateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.ActivateProjectGrantRequest{}, }, wantErr: true, @@ -1260,17 +1260,17 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) { { name: "organization owner, other org", prepare: func(request *project.ActivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) instance.DeactivateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.ActivateProjectGrantRequest{}, }, wantErr: true, @@ -1278,17 +1278,17 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) { { name: "organization owner, ok", prepare: func(request *project.ActivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.GrantedOrganizationId = grantedOrg.GetOrganizationId() instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) instance.DeactivateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.ActivateProjectGrantRequest{}, }, want: want{ @@ -1299,10 +1299,10 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) { { name: "instance owner, ok", prepare: func(request *project.ActivateProjectGrantRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.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 5e2f0e447e..8ac44308b4 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 @@ -16,11 +16,11 @@ import ( ) func TestServer_AddProjectRole(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) - alreadyExistingProject := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - alreadyExistingProjectRoleName := gofakeit.AppName() + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) + alreadyExistingProject := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + alreadyExistingProjectRoleName := integration.RoleDisplayName() instance.AddProjectRole(iamOwnerCtx, t, alreadyExistingProject.GetId(), alreadyExistingProjectRoleName, alreadyExistingProjectRoleName, "") type want struct { @@ -38,12 +38,12 @@ func TestServer_AddProjectRole(t *testing.T) { name: "empty key", ctx: iamOwnerCtx, prepare: func(request *project.AddProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() }, req: &project.AddProjectRoleRequest{ RoleKey: "", - DisplayName: gofakeit.AppName(), + DisplayName: integration.ProjectName(), }, wantErr: true, }, @@ -51,11 +51,11 @@ func TestServer_AddProjectRole(t *testing.T) { name: "empty displayname", ctx: iamOwnerCtx, prepare: func(request *project.AddProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() }, req: &project.AddProjectRoleRequest{ - RoleKey: gofakeit.AppName(), + RoleKey: integration.RoleKey(), DisplayName: "", }, wantErr: true, @@ -76,12 +76,12 @@ func TestServer_AddProjectRole(t *testing.T) { name: "empty, ok", ctx: iamOwnerCtx, prepare: func(request *project.AddProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() }, req: &project.AddProjectRoleRequest{ - RoleKey: gofakeit.Name(), - DisplayName: gofakeit.Name(), + RoleKey: integration.RoleKey(), + DisplayName: integration.RoleDisplayName(), }, want: want{ creationDate: true, @@ -108,11 +108,11 @@ func TestServer_AddProjectRole(t *testing.T) { } func TestServer_AddProjectRole_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) - alreadyExistingProject := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - alreadyExistingProjectRoleName := gofakeit.AppName() + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + alreadyExistingProject := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + alreadyExistingProjectRoleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, alreadyExistingProject.GetId(), alreadyExistingProjectRoleName, alreadyExistingProjectRoleName, "") type want struct { @@ -130,51 +130,51 @@ func TestServer_AddProjectRole_Permission(t *testing.T) { name: "unauthenticated", ctx: CTX, prepare: func(request *project.AddProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() }, req: &project.AddProjectRoleRequest{ - RoleKey: gofakeit.AppName(), - DisplayName: gofakeit.AppName(), + RoleKey: integration.RoleKey(), + DisplayName: integration.RoleDisplayName(), }, wantErr: true, }, { name: "no permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *project.AddProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() }, req: &project.AddProjectRoleRequest{ - RoleKey: gofakeit.AppName(), - DisplayName: gofakeit.AppName(), + RoleKey: integration.RoleKey(), + DisplayName: integration.RoleDisplayName(), }, wantErr: true, }, { name: "organization owner, other org", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.AddProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() }, req: &project.AddProjectRoleRequest{ - RoleKey: gofakeit.AppName(), - DisplayName: gofakeit.AppName(), + RoleKey: integration.RoleKey(), + DisplayName: integration.RoleDisplayName(), }, wantErr: true, }, { name: "organization owner, ok", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.AddProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() }, req: &project.AddProjectRoleRequest{ - RoleKey: gofakeit.AppName(), - DisplayName: gofakeit.AppName(), + RoleKey: integration.RoleKey(), + DisplayName: integration.RoleDisplayName(), }, want: want{ creationDate: true, @@ -184,12 +184,12 @@ func TestServer_AddProjectRole_Permission(t *testing.T) { name: "instance owner, ok", ctx: iamOwnerCtx, prepare: func(request *project.AddProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() }, req: &project.AddProjectRoleRequest{ - RoleKey: gofakeit.AppName(), - DisplayName: gofakeit.AppName(), + RoleKey: integration.RoleKey(), + DisplayName: integration.RoleDisplayName(), }, want: want{ creationDate: true, @@ -228,8 +228,8 @@ func assertAddProjectRoleResponse(t *testing.T, creationDate, changeDate time.Ti } func TestServer_UpdateProjectRole(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -249,14 +249,14 @@ func TestServer_UpdateProjectRole(t *testing.T) { { name: "missing permission", prepare: func(request *project.UpdateProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.UpdateProjectRoleRequest{ DisplayName: gu.Ptr("changed"), }, @@ -280,8 +280,8 @@ func TestServer_UpdateProjectRole(t *testing.T) { { name: "no change, ok", prepare: func(request *project.UpdateProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -299,8 +299,8 @@ func TestServer_UpdateProjectRole(t *testing.T) { { name: "change display name, ok", prepare: func(request *project.UpdateProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -308,7 +308,7 @@ func TestServer_UpdateProjectRole(t *testing.T) { args: args{ ctx: iamOwnerCtx, req: &project.UpdateProjectRoleRequest{ - DisplayName: gu.Ptr(gofakeit.AppName()), + DisplayName: gu.Ptr(integration.RoleKey()), }, }, want: want{ @@ -319,8 +319,8 @@ func TestServer_UpdateProjectRole(t *testing.T) { { name: "change full, ok", prepare: func(request *project.UpdateProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -328,8 +328,8 @@ func TestServer_UpdateProjectRole(t *testing.T) { args: args{ ctx: iamOwnerCtx, req: &project.UpdateProjectRoleRequest{ - DisplayName: gu.Ptr(gofakeit.AppName()), - Group: gu.Ptr(gofakeit.AppName()), + DisplayName: gu.Ptr(integration.RoleKey()), + Group: gu.Ptr(integration.RoleKey()), }, }, want: want{ @@ -359,8 +359,8 @@ func TestServer_UpdateProjectRole(t *testing.T) { } func TestServer_UpdateProjectRole_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -380,8 +380,8 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) { { name: "unauthenicated", prepare: func(request *project.UpdateProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -397,14 +397,14 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) { { name: "no permission", prepare: func(request *project.UpdateProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.UpdateProjectRoleRequest{ DisplayName: gu.Ptr("changed"), }, @@ -414,14 +414,14 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) { { name: "organization owner, other org", prepare: func(request *project.UpdateProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.UpdateProjectRoleRequest{ DisplayName: gu.Ptr("changed"), }, @@ -431,16 +431,16 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) { { name: "organization owner, ok", prepare: func(request *project.UpdateProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.UpdateProjectRoleRequest{ - DisplayName: gu.Ptr(gofakeit.AppName()), + DisplayName: gu.Ptr(integration.RoleKey()), }, }, want: want{ @@ -451,8 +451,8 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) { { name: "instance owner, ok", prepare: func(request *project.UpdateProjectRoleRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -460,7 +460,7 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) { args: args{ ctx: iamOwnerCtx, req: &project.UpdateProjectRoleRequest{ - DisplayName: gu.Ptr(gofakeit.AppName()), + DisplayName: gu.Ptr(integration.RoleKey()), }, }, want: want{ @@ -502,8 +502,8 @@ func assertUpdateProjectRoleResponse(t *testing.T, creationDate, changeDate time } func TestServer_DeleteProjectRole(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) tests := []struct { name string @@ -536,8 +536,8 @@ func TestServer_DeleteProjectRole(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -551,8 +551,8 @@ func TestServer_DeleteProjectRole(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -581,8 +581,8 @@ func TestServer_DeleteProjectRole(t *testing.T) { } func TestServer_DeleteProjectRole_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) tests := []struct { name string @@ -597,8 +597,8 @@ func TestServer_DeleteProjectRole_Permission(t *testing.T) { ctx: CTX, prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -609,11 +609,11 @@ func TestServer_DeleteProjectRole_Permission(t *testing.T) { }, { name: "no permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -624,11 +624,11 @@ func TestServer_DeleteProjectRole_Permission(t *testing.T) { }, { name: "organization owner, other org", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -639,11 +639,11 @@ func TestServer_DeleteProjectRole_Permission(t *testing.T) { }, { name: "organization owner, ok", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName @@ -657,8 +657,8 @@ func TestServer_DeleteProjectRole_Permission(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) - roleName := gofakeit.AppName() + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) + roleName := integration.RoleKey() instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "") request.ProjectId = projectResp.GetId() request.RoleKey = roleName 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 5412f6eb58..d802fbc8bb 100644 --- a/internal/api/grpc/project/v2beta/integration_test/project_test.go +++ b/internal/api/grpc/project/v2beta/integration_test/project_test.go @@ -16,10 +16,10 @@ import ( ) func TestServer_CreateProject(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) - alreadyExistingProjectName := gofakeit.AppName() + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + alreadyExistingProjectName := integration.ProjectName() instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), alreadyExistingProjectName, false, false) type want struct { @@ -45,7 +45,7 @@ func TestServer_CreateProject(t *testing.T) { name: "empty organization", ctx: iamOwnerCtx, req: &project.CreateProjectRequest{ - Name: gofakeit.Name(), + Name: integration.ProjectName(), OrganizationId: "", }, wantErr: true, @@ -63,7 +63,7 @@ func TestServer_CreateProject(t *testing.T) { name: "empty, ok", ctx: iamOwnerCtx, req: &project.CreateProjectRequest{ - Name: gofakeit.Name(), + Name: integration.ProjectName(), OrganizationId: orgResp.GetOrganizationId(), }, want: want{ @@ -88,8 +88,8 @@ func TestServer_CreateProject(t *testing.T) { } func TestServer_CreateProject_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type want struct { id bool @@ -106,34 +106,34 @@ func TestServer_CreateProject_Permission(t *testing.T) { name: "unauthenticated", ctx: CTX, req: &project.CreateProjectRequest{ - Name: gofakeit.Name(), + Name: integration.ProjectName(), OrganizationId: orgResp.GetOrganizationId(), }, wantErr: true, }, { name: "missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.CreateProjectRequest{ - Name: gofakeit.Name(), + Name: integration.ProjectName(), OrganizationId: orgResp.GetOrganizationId(), }, wantErr: true, }, { name: "missing permission, other organization", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.CreateProjectRequest{ - Name: gofakeit.Name(), + Name: integration.ProjectName(), OrganizationId: orgResp.GetOrganizationId(), }, wantErr: true, }, { name: "organization owner, ok", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.CreateProjectRequest{ - Name: gofakeit.Name(), + Name: integration.ProjectName(), OrganizationId: instance.DefaultOrg.GetId(), }, want: want{ @@ -145,7 +145,7 @@ func TestServer_CreateProject_Permission(t *testing.T) { name: "instance owner, ok", ctx: iamOwnerCtx, req: &project.CreateProjectRequest{ - Name: gofakeit.Name(), + Name: integration.ProjectName(), OrganizationId: orgResp.GetOrganizationId(), }, want: want{ @@ -188,8 +188,8 @@ func assertCreateProjectResponse(t *testing.T, creationDate, changeDate time.Tim } func TestServer_UpdateProject(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -215,7 +215,7 @@ func TestServer_UpdateProject(t *testing.T) { args: args{ ctx: iamOwnerCtx, req: &project.UpdateProjectRequest{ - Name: gu.Ptr(gofakeit.Name()), + Name: gu.Ptr(integration.ProjectName()), }, }, wantErr: true, @@ -223,7 +223,7 @@ func TestServer_UpdateProject(t *testing.T) { { name: "no change, ok", prepare: func(request *project.UpdateProjectRequest) { - name := gofakeit.AppName() + name := integration.ProjectName() projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false).GetId() request.Id = projectID request.Name = gu.Ptr(name) @@ -240,13 +240,13 @@ func TestServer_UpdateProject(t *testing.T) { { name: "change name, ok", prepare: func(request *project.UpdateProjectRequest) { - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID }, args: args{ ctx: iamOwnerCtx, req: &project.UpdateProjectRequest{ - Name: gu.Ptr(gofakeit.AppName()), + Name: gu.Ptr(integration.ProjectName()), }, }, want: want{ @@ -257,13 +257,13 @@ func TestServer_UpdateProject(t *testing.T) { { name: "change full, ok", prepare: func(request *project.UpdateProjectRequest) { - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID }, args: args{ ctx: iamOwnerCtx, req: &project.UpdateProjectRequest{ - Name: gu.Ptr(gofakeit.AppName()), + Name: gu.Ptr(integration.ProjectName()), ProjectRoleAssertion: gu.Ptr(true), ProjectRoleCheck: gu.Ptr(true), HasProjectCheck: gu.Ptr(true), @@ -297,12 +297,12 @@ func TestServer_UpdateProject(t *testing.T) { } func TestServer_UpdateProject_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) userResp := instance.CreateMachineUser(iamOwnerCtx) patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId()) - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() instance.CreateProjectMembership(t, iamOwnerCtx, projectID, userResp.GetUserId()) projectOwnerCtx := integration.WithAuthorizationToken(CTX, patResp.Token) @@ -324,13 +324,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) { { name: "unauthenticated", prepare: func(request *project.UpdateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() }, args: args{ ctx: CTX, req: &project.UpdateProjectRequest{ - Name: gu.Ptr(gofakeit.Name()), + Name: gu.Ptr(integration.ProjectName()), }, }, wantErr: true, @@ -338,13 +338,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) { { name: "missing permission", prepare: func(request *project.UpdateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.UpdateProjectRequest{ - Name: gu.Ptr(gofakeit.Name()), + Name: gu.Ptr(integration.ProjectName()), }, }, wantErr: true, @@ -352,13 +352,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) { { name: "project owner, no permission", prepare: func(request *project.UpdateProjectRequest) { - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID }, args: args{ ctx: projectOwnerCtx, req: &project.UpdateProjectRequest{ - Name: gu.Ptr(gofakeit.AppName()), + Name: gu.Ptr(integration.ProjectName()), }, }, wantErr: true, @@ -371,7 +371,7 @@ func TestServer_UpdateProject_Permission(t *testing.T) { args: args{ ctx: projectOwnerCtx, req: &project.UpdateProjectRequest{ - Name: gu.Ptr(gofakeit.AppName()), + Name: gu.Ptr(integration.ProjectName()), }, }, want: want{ @@ -382,13 +382,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) { { name: "missing permission, other organization", prepare: func(request *project.UpdateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.UpdateProjectRequest{ - Name: gu.Ptr(gofakeit.Name()), + Name: gu.Ptr(integration.ProjectName()), }, }, wantErr: true, @@ -396,13 +396,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) { { name: "organization owner, ok", prepare: func(request *project.UpdateProjectRequest) { - projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false).GetId() request.Id = projectID }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.UpdateProjectRequest{ - Name: gu.Ptr(gofakeit.AppName()), + Name: gu.Ptr(integration.ProjectName()), }, }, want: want{ @@ -413,13 +413,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) { { name: "instance owner, ok", prepare: func(request *project.UpdateProjectRequest) { - projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false).GetId() request.Id = projectID }, args: args{ ctx: iamOwnerCtx, req: &project.UpdateProjectRequest{ - Name: gu.Ptr(gofakeit.AppName()), + Name: gu.Ptr(integration.ProjectName()), }, }, want: want{ @@ -461,8 +461,8 @@ func assertUpdateProjectResponse(t *testing.T, creationDate, changeDate time.Tim } func TestServer_DeleteProject(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) tests := []struct { name string @@ -493,7 +493,7 @@ func TestServer_DeleteProject(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID return creationDate, time.Time{} }, @@ -505,7 +505,7 @@ func TestServer_DeleteProject(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID instance.DeleteProject(iamOwnerCtx, t, projectID) return creationDate, time.Now().UTC() @@ -532,12 +532,12 @@ func TestServer_DeleteProject(t *testing.T) { } func TestServer_DeleteProject_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) userResp := instance.CreateMachineUser(iamOwnerCtx) patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId()) - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() instance.CreateProjectMembership(t, iamOwnerCtx, projectID, userResp.GetUserId()) projectOwnerCtx := integration.WithAuthorizationToken(CTX, patResp.Token) @@ -554,7 +554,7 @@ func TestServer_DeleteProject_Permission(t *testing.T) { ctx: CTX, prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID return creationDate, time.Time{} }, @@ -563,10 +563,10 @@ func TestServer_DeleteProject_Permission(t *testing.T) { }, { name: "missing permission", - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID return creationDate, time.Time{} }, @@ -578,7 +578,7 @@ func TestServer_DeleteProject_Permission(t *testing.T) { ctx: projectOwnerCtx, prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID return creationDate, time.Time{} }, @@ -598,10 +598,10 @@ func TestServer_DeleteProject_Permission(t *testing.T) { }, { name: "organization owner, other org", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID return creationDate, time.Time{} }, @@ -610,10 +610,10 @@ func TestServer_DeleteProject_Permission(t *testing.T) { }, { name: "organization owner", - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false).GetId() request.Id = projectID return creationDate, time.Time{} }, @@ -625,7 +625,7 @@ func TestServer_DeleteProject_Permission(t *testing.T) { ctx: iamOwnerCtx, prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) { creationDate := time.Now().UTC() - projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false).GetId() request.Id = projectID return creationDate, time.Time{} }, @@ -663,8 +663,8 @@ func assertDeleteProjectResponse(t *testing.T, creationDate, deletionDate time.T } func TestServer_DeactivateProject(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -710,7 +710,7 @@ func TestServer_DeactivateProject(t *testing.T) { { name: "change, ok", prepare: func(request *project.DeactivateProjectRequest) { - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID }, args: args{ @@ -744,8 +744,8 @@ func TestServer_DeactivateProject(t *testing.T) { } func TestServer_DeactivateProject_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -765,7 +765,7 @@ func TestServer_DeactivateProject_Permission(t *testing.T) { { name: "unauthenticated", prepare: func(request *project.DeactivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() }, args: args{ @@ -777,11 +777,11 @@ func TestServer_DeactivateProject_Permission(t *testing.T) { { name: "missing permission", prepare: func(request *project.DeactivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.DeactivateProjectRequest{}, }, wantErr: true, @@ -789,11 +789,11 @@ func TestServer_DeactivateProject_Permission(t *testing.T) { { name: "organization owner, other org", prepare: func(request *project.DeactivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.DeactivateProjectRequest{}, }, wantErr: true, @@ -801,11 +801,11 @@ func TestServer_DeactivateProject_Permission(t *testing.T) { { name: "organization owner", prepare: func(request *project.DeactivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.DeactivateProjectRequest{}, }, want: want{ @@ -816,7 +816,7 @@ func TestServer_DeactivateProject_Permission(t *testing.T) { { name: "instance owner", prepare: func(request *project.DeactivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() }, args: args{ @@ -862,8 +862,8 @@ func assertDeactivateProjectResponse(t *testing.T, creationDate, changeDate time } func TestServer_ActivateProject(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -883,11 +883,11 @@ func TestServer_ActivateProject(t *testing.T) { { name: "missing permission", prepare: func(request *project.ActivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.ActivateProjectRequest{}, }, wantErr: true, @@ -920,7 +920,7 @@ func TestServer_ActivateProject(t *testing.T) { { name: "change, ok", prepare: func(request *project.ActivateProjectRequest) { - projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId() + projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId() request.Id = projectID instance.DeactivateProject(iamOwnerCtx, t, projectID) }, @@ -955,8 +955,8 @@ func TestServer_ActivateProject(t *testing.T) { } func TestServer_ActivateProject_Permission(t *testing.T) { - iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context @@ -976,7 +976,7 @@ func TestServer_ActivateProject_Permission(t *testing.T) { { name: "unauthenticated", prepare: func(request *project.ActivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() instance.DeactivateProject(iamOwnerCtx, t, projectResp.GetId()) }, @@ -989,12 +989,12 @@ func TestServer_ActivateProject_Permission(t *testing.T) { { name: "missing permission", prepare: func(request *project.ActivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() instance.DeactivateProject(iamOwnerCtx, t, projectResp.GetId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &project.ActivateProjectRequest{}, }, wantErr: true, @@ -1002,12 +1002,12 @@ func TestServer_ActivateProject_Permission(t *testing.T) { { name: "organization owner, other org", prepare: func(request *project.ActivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() instance.DeactivateProject(iamOwnerCtx, t, projectResp.GetId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.ActivateProjectRequest{}, }, wantErr: true, @@ -1015,12 +1015,12 @@ func TestServer_ActivateProject_Permission(t *testing.T) { { name: "organization owner", prepare: func(request *project.ActivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() instance.DeactivateProject(iamOwnerCtx, t, projectResp.GetId()) }, args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &project.ActivateProjectRequest{}, }, want: want{ @@ -1031,7 +1031,7 @@ func TestServer_ActivateProject_Permission(t *testing.T) { { name: "instance owner", prepare: func(request *project.ActivateProjectRequest) { - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.Id = projectResp.GetId() instance.DeactivateProject(iamOwnerCtx, t, projectResp.GetId()) }, 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 29fa212976..de69fb6de3 100644 --- a/internal/api/grpc/project/v2beta/integration_test/query_test.go +++ b/internal/api/grpc/project/v2beta/integration_test/query_test.go @@ -51,7 +51,7 @@ func TestServer_GetProject(t *testing.T) { ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.GetProjectRequest, response *project.GetProjectResponse) { name := gofakeit.AppName() - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false) request.Id = resp.GetId() @@ -213,7 +213,7 @@ func TestServer_ListProjects(t *testing.T) { ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) { name := gofakeit.AppName() - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false) request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ @@ -352,7 +352,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, gofakeit.AppName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.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 +384,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, gofakeit.AppName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.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) @@ -633,7 +633,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, gofakeit.AppName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) resp := createProject(iamOwnerCtx, instancePermissionV2, t, orgResp.GetOrganizationId(), false, false) request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ @@ -851,7 +851,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, gofakeit.AppName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.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) @@ -950,7 +950,7 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) { } func createProject(ctx context.Context, instance *integration.Instance, t *testing.T, orgID string, projectRoleCheck, hasProjectCheck bool) *project.Project { - name := gofakeit.AppName() + name := integration.ProjectName() resp := instance.CreateProject(ctx, t, orgID, name, projectRoleCheck, hasProjectCheck) return &project.Project{ Id: resp.GetId(), @@ -967,7 +967,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 := gofakeit.AppName() + grantedOrgName := integration.OrganizationName() grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, gofakeit.Email()) projectGrantResp := instance.CreateProjectGrant(ctx, t, projectToGrant.GetId(), grantedOrg.GetOrganizationId()) @@ -1018,13 +1018,13 @@ func TestServer_ListProjectGrants(t *testing.T) { args: args{ ctx: CTX, dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ Ids: []string{projectResp.GetId()}, }, } - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{ ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, } @@ -1042,13 +1042,13 @@ func TestServer_ListProjectGrants(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ Ids: []string{projectResp.GetId()}, }, } - grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{ ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, } @@ -1119,7 +1119,7 @@ func TestServer_ListProjectGrants(t *testing.T) { ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { name := gofakeit.AppName() - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ @@ -1182,7 +1182,7 @@ func TestServer_ListProjectGrants(t *testing.T) { name2 := gofakeit.AppName() name3 := gofakeit.AppName() orgID := instance.DefaultOrg.GetId() - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.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) @@ -1219,7 +1219,7 @@ func TestServer_ListProjectGrants(t *testing.T) { name2 := gofakeit.AppName() name3 := gofakeit.AppName() orgID := instance.DefaultOrg.GetId() - orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.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) @@ -1360,13 +1360,13 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { args: args{ ctx: CTX, dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ Ids: []string{projectResp.GetId()}, }, } - grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{ ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, } @@ -1384,13 +1384,13 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { - projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ Ids: []string{projectResp.GetId()}, }, } - grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{ ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()}, } @@ -1439,7 +1439,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) { name := gofakeit.AppName() - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false) request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{ InProjectIdsFilter: &filter.InIDsFilter{ @@ -1502,7 +1502,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) { name2 := gofakeit.AppName() name3 := gofakeit.AppName() orgID := instancePermissionV2.DefaultOrg.GetId() - orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email()) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.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) @@ -1594,7 +1594,7 @@ func TestServer_ListProjectRoles(t *testing.T) { args: args{ ctx: CTX, dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() addProjectRole(iamOwnerCtx, instance, t, projectResp.GetId()) @@ -1610,7 +1610,7 @@ func TestServer_ListProjectRoles(t *testing.T) { args: args{ ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { - projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() addProjectRole(iamOwnerCtx, instance, t, projectResp.GetId()) @@ -1641,8 +1641,8 @@ 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, gofakeit.AppName(), gofakeit.Email()) - projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email()) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() addProjectRole(iamOwnerCtx, instance, t, projectResp.GetId()) @@ -1663,7 +1663,7 @@ func TestServer_ListProjectRoles(t *testing.T) { ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { orgID := instance.DefaultOrg.GetId() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() response.ProjectRoles[0] = addProjectRole(iamOwnerCtx, instance, t, projectResp.GetId()) @@ -1686,7 +1686,7 @@ func TestServer_ListProjectRoles(t *testing.T) { ctx: iamOwnerCtx, dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { orgID := instance.DefaultOrg.GetId() - projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, gofakeit.AppName(), false, false) + projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() response.ProjectRoles[2] = addProjectRole(iamOwnerCtx, instance, t, projectResp.GetId()) @@ -1753,7 +1753,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) { args: args{ ctx: CTX, dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { - projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() addProjectRole(iamOwnerCtx, instancePermissionV2, t, projectResp.GetId()) @@ -1769,7 +1769,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) { args: args{ ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { - projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), gofakeit.AppName(), false, false) + projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() addProjectRole(iamOwnerCtx, instancePermissionV2, t, projectResp.GetId()) @@ -1800,8 +1800,8 @@ 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, gofakeit.AppName(), gofakeit.Email()) - projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false) + orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email()) + projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() addProjectRole(iamOwnerCtx, instancePermissionV2, t, projectResp.GetId()) @@ -1822,7 +1822,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) { ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { orgID := instancePermissionV2.DefaultOrg.GetId() - projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, gofakeit.AppName(), false, false) + projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() response.ProjectRoles[0] = addProjectRole(iamOwnerCtx, instancePermissionV2, t, projectResp.GetId()) @@ -1845,7 +1845,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) { ctx: iamOwnerCtx, dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) { orgID := instancePermissionV2.DefaultOrg.GetId() - projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, gofakeit.AppName(), false, false) + projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, integration.ProjectName(), false, false) request.ProjectId = projectResp.GetId() response.ProjectRoles[2] = addProjectRole(iamOwnerCtx, instancePermissionV2, t, projectResp.GetId()) @@ -1893,7 +1893,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) { } func addProjectRole(ctx context.Context, instance *integration.Instance, t *testing.T, projectID string) *project.ProjectRole { - name := gofakeit.Animal() + name := integration.RoleKey() projectRoleResp := instance.AddProjectRole(ctx, t, projectID, name, name, name) return &project.ProjectRole{ 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 241c20715c..a44cd2dc87 100644 --- a/internal/api/grpc/saml/v2/integration_test/saml_test.go +++ b/internal/api/grpc/saml/v2/integration_test/saml_test.go @@ -377,7 +377,7 @@ 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, "saml-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.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()) @@ -391,7 +391,7 @@ 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, "saml-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.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()) @@ -413,7 +413,7 @@ 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, "saml-permission-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.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()) @@ -435,7 +435,7 @@ 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, "saml-permisison-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) }, @@ -456,7 +456,7 @@ 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, "saml-permisison-"+gofakeit.AppName(), gofakeit.Email()) + 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()) @@ -516,7 +516,7 @@ 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, "saml-permisison-"+gofakeit.AppName(), gofakeit.Email()) + 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()) @@ -535,7 +535,7 @@ 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, "saml-permisison-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) @@ -547,7 +547,7 @@ 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, "saml-permissison-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.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()) @@ -568,7 +568,7 @@ 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, "saml-permissison-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) @@ -597,7 +597,7 @@ 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, "saml-permisison-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) return createSessionAndSmlRequestForCallback(ctx, t, sp, Instance.Users[integration.UserTypeLogin].ID, acsRedirect, user.GetUserId(), saml.HTTPRedirectBinding) @@ -608,7 +608,7 @@ 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, "saml-permissison-"+gofakeit.AppName(), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) Instance.CreateProjectGrant(ctx, t, projectID, orgResp.GetOrganizationId()) user := Instance.CreateHumanUserVerified(ctx, orgResp.GetOrganizationId(), gofakeit.Email(), gofakeit.Phone()) @@ -686,7 +686,7 @@ func createSAMLSP(t *testing.T, idpMetadata *saml.EntityDescriptor, binding stri } func createSAMLApplication(ctx context.Context, t *testing.T, idpMetadata *saml.EntityDescriptor, binding string, projectRoleCheck, hasProjectCheck bool) (string, string, *samlsp.Middleware) { - project := Instance.CreateProject(ctx, t, "", gofakeit.AppName(), projectRoleCheck, hasProjectCheck) + project := Instance.CreateProject(ctx, t, "", 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/session/v2/integration_test/session_test.go b/internal/api/grpc/session/v2/integration_test/session_test.go index 9533c1ac82..b34df8c8c5 100644 --- a/internal/api/grpc/session/v2/integration_test/session_test.go +++ b/internal/api/grpc/session/v2/integration_test/session_test.go @@ -264,10 +264,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(), gofakeit.Email()) userID := org.CreatedAdmins[0].GetUserId() Instance.SetUserPassword(IAMOwnerCTX, userID, integration.UserPassword, false) @@ -341,7 +338,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 +367,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 +389,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" @@ -420,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{ @@ -448,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(LoginCTX, &session.CreateSessionRequest{ Checks: &session.Checks{ User: &session.CheckUser{ @@ -490,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(LoginCTX, &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 c3bf54e992..7d8f15c3d8 100644 --- a/internal/api/grpc/settings/v2/integration_test/query_test.go +++ b/internal/api/grpc/settings/v2/integration_test/query_test.go @@ -41,7 +41,7 @@ func TestServer_GetSecuritySettings(t *testing.T) { }{ { name: "permission error", - ctx: Instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: Instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), wantErr: true, }, { @@ -96,26 +96,26 @@ func idpResponse(id, name string, linking, creation, autoCreation, autoUpdate bo func TestServer_GetActiveIdentityProviders(t *testing.T) { instance := integration.NewInstance(CTX) - isolatedIAMOwnerCTX := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) + isolatedIAMOwnerCTX := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner) - instance.AddGenericOAuthProvider(isolatedIAMOwnerCTX, gofakeit.AppName()) // inactive - idpActiveName := gofakeit.AppName() + instance.AddGenericOAuthProvider(isolatedIAMOwnerCTX, integration.IDPName()) // inactive + idpActiveName := integration.IDPName() idpActiveResp := instance.AddGenericOAuthProvider(isolatedIAMOwnerCTX, idpActiveName) instance.AddProviderToDefaultLoginPolicy(isolatedIAMOwnerCTX, idpActiveResp.GetId()) idpActiveResponse := idpResponse(idpActiveResp.GetId(), idpActiveName, true, true, true, true, idp_pb.AutoLinkingOption_AUTO_LINKING_OPTION_USERNAME) - idpLinkingDisallowedName := gofakeit.AppName() + idpLinkingDisallowedName := integration.IDPName() idpLinkingDisallowedResp := instance.AddGenericOAuthProviderWithOptions(isolatedIAMOwnerCTX, idpLinkingDisallowedName, false, true, true, idp.AutoLinkingOption_AUTO_LINKING_OPTION_USERNAME) instance.AddProviderToDefaultLoginPolicy(isolatedIAMOwnerCTX, idpLinkingDisallowedResp.GetId()) idpLinkingDisallowedResponse := idpResponse(idpLinkingDisallowedResp.GetId(), idpLinkingDisallowedName, false, true, true, true, idp_pb.AutoLinkingOption_AUTO_LINKING_OPTION_USERNAME) - idpCreationDisallowedName := gofakeit.AppName() + idpCreationDisallowedName := integration.IDPName() idpCreationDisallowedResp := instance.AddGenericOAuthProviderWithOptions(isolatedIAMOwnerCTX, idpCreationDisallowedName, true, false, true, idp.AutoLinkingOption_AUTO_LINKING_OPTION_USERNAME) instance.AddProviderToDefaultLoginPolicy(isolatedIAMOwnerCTX, idpCreationDisallowedResp.GetId()) idpCreationDisallowedResponse := idpResponse(idpCreationDisallowedResp.GetId(), idpCreationDisallowedName, true, false, true, true, idp_pb.AutoLinkingOption_AUTO_LINKING_OPTION_USERNAME) - idpNoAutoCreationName := gofakeit.AppName() + idpNoAutoCreationName := integration.IDPName() idpNoAutoCreationResp := instance.AddGenericOAuthProviderWithOptions(isolatedIAMOwnerCTX, idpNoAutoCreationName, true, true, false, idp.AutoLinkingOption_AUTO_LINKING_OPTION_USERNAME) instance.AddProviderToDefaultLoginPolicy(isolatedIAMOwnerCTX, idpNoAutoCreationResp.GetId()) idpNoAutoCreationResponse := idpResponse(idpNoAutoCreationResp.GetId(), idpNoAutoCreationName, true, true, false, true, idp_pb.AutoLinkingOption_AUTO_LINKING_OPTION_USERNAME) - idpNoAutoLinkingName := gofakeit.AppName() + idpNoAutoLinkingName := integration.IDPName() idpNoAutoLinkingResp := instance.AddGenericOAuthProviderWithOptions(isolatedIAMOwnerCTX, idpNoAutoLinkingName, true, true, true, idp.AutoLinkingOption_AUTO_LINKING_OPTION_UNSPECIFIED) instance.AddProviderToDefaultLoginPolicy(isolatedIAMOwnerCTX, idpNoAutoLinkingResp.GetId()) idpNoAutoLinkingResponse := idpResponse(idpNoAutoLinkingResp.GetId(), idpNoAutoLinkingName, true, true, true, true, idp_pb.AutoLinkingOption_AUTO_LINKING_OPTION_UNSPECIFIED) @@ -133,7 +133,7 @@ func TestServer_GetActiveIdentityProviders(t *testing.T) { { name: "permission error", args: args{ - ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission), + ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission), req: &settings.GetActiveIdentityProvidersRequest{}, }, wantErr: true, diff --git a/internal/api/grpc/settings/v2/integration_test/server_test.go b/internal/api/grpc/settings/v2/integration_test/server_test.go index c5c851c310..3f8eee001e 100644 --- a/internal/api/grpc/settings/v2/integration_test/server_test.go +++ b/internal/api/grpc/settings/v2/integration_test/server_test.go @@ -26,9 +26,9 @@ func TestMain(m *testing.M) { Instance = integration.NewInstance(ctx) CTX = ctx - AdminCTX = Instance.WithAuthorization(ctx, integration.UserTypeIAMOwner) - UserTypeLoginCtx = Instance.WithAuthorization(ctx, integration.UserTypeLogin) - OrgOwnerCtx = Instance.WithAuthorization(ctx, integration.UserTypeOrgOwner) + AdminCTX = Instance.WithAuthorizationToken(ctx, integration.UserTypeIAMOwner) + UserTypeLoginCtx = Instance.WithAuthorizationToken(ctx, integration.UserTypeLogin) + OrgOwnerCtx = Instance.WithAuthorizationToken(ctx, integration.UserTypeOrgOwner) Client = Instance.Client.SettingsV2 return m.Run() diff --git a/internal/api/grpc/settings/v2/integration_test/settings_test.go b/internal/api/grpc/settings/v2/integration_test/settings_test.go index 7d1e4b0239..44e5a50852 100644 --- a/internal/api/grpc/settings/v2/integration_test/settings_test.go +++ b/internal/api/grpc/settings/v2/integration_test/settings_test.go @@ -35,7 +35,7 @@ func TestServer_SetSecuritySettings(t *testing.T) { { name: "permission error", args: args{ - ctx: Instance.WithAuthorization(CTX, integration.UserTypeOrgOwner), + ctx: Instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner), req: &settings.SetSecuritySettingsRequest{ EmbeddedIframe: &settings.EmbeddedIframeSettings{ Enabled: true, 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 9d8160ab74..0fbbc64a22 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 @@ -4,7 +4,6 @@ package user_test import ( "context" - "fmt" "testing" "time" @@ -99,7 +98,7 @@ func TestServer_AddIDPLink(t *testing.T) { } func TestServer_ListIDPLinks(t *testing.T) { - orgResp := Instance.CreateOrganization(IamCTX, fmt.Sprintf("ListIDPLinks-%s", gofakeit.AppName()), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) instanceIdpResp := Instance.AddGenericOAuthProvider(IamCTX, Instance.DefaultOrg.Id) userInstanceResp := Instance.CreateHumanUserVerified(IamCTX, orgResp.OrganizationId, gofakeit.Email(), gofakeit.Phone()) @@ -253,7 +252,7 @@ func TestServer_ListIDPLinks(t *testing.T) { } func TestServer_RemoveIDPLink(t *testing.T) { - orgResp := Instance.CreateOrganization(IamCTX, fmt.Sprintf("ListIDPLinks-%s", gofakeit.AppName()), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) instanceIdpResp := Instance.AddGenericOAuthProvider(IamCTX, Instance.DefaultOrg.Id) userInstanceResp := Instance.CreateHumanUserVerified(IamCTX, orgResp.OrganizationId, gofakeit.Email(), gofakeit.Phone()) 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 bb4f8657fa..0ff7087a16 100644 --- a/internal/api/grpc/user/v2/integration_test/key_test.go +++ b/internal/api/grpc/user/v2/integration_test/key_test.go @@ -158,7 +158,7 @@ abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 func TestServer_AddKey_Permission(t *testing.T) { OrgCTX := CTX - otherOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("AddKey-%s", gofakeit.AppName()), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) otherOrgUser, err := Client.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ @@ -298,7 +298,7 @@ func TestServer_RemoveKey(t *testing.T) { func TestServer_RemoveKey_Permission(t *testing.T) { OrgCTX := CTX - otherOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("RemoveKey-%s", gofakeit.AppName()), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) otherOrgUser, err := Client.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ 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 8ca6d80139..14f7492db2 100644 --- a/internal/api/grpc/user/v2/integration_test/pat_test.go +++ b/internal/api/grpc/user/v2/integration_test/pat_test.go @@ -4,7 +4,6 @@ package user_test import ( "context" - "fmt" "slices" "testing" "time" @@ -110,7 +109,7 @@ func TestServer_AddPersonalAccessToken(t *testing.T) { func TestServer_AddPersonalAccessToken_Permission(t *testing.T) { OrgCTX := CTX - otherOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("AddPersonalAccessToken-%s", gofakeit.AppName()), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) otherOrgUser, err := Client.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ @@ -249,7 +248,7 @@ func TestServer_RemovePersonalAccessToken(t *testing.T) { } func TestServer_RemovePersonalAccessToken_Permission(t *testing.T) { - otherOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("RemovePersonalAccessToken-%s", gofakeit.AppName()), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) otherOrgUser, err := Client.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ @@ -328,7 +327,7 @@ func TestServer_ListPersonalAccessTokens(t *testing.T) { want *user.ListPersonalAccessTokensResponse } OrgCTX := CTX - otherOrg := Instance.CreateOrganization(SystemCTX, fmt.Sprintf("ListPersonalAccessTokens-%s", gofakeit.AppName()), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(SystemCTX, integration.OrganizationName(), gofakeit.Email()) otherOrgUser, err := Client.CreateUser(SystemCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ 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 15dc959151..ccd662a71c 100644 --- a/internal/api/grpc/user/v2/integration_test/query_test.go +++ b/internal/api/grpc/user/v2/integration_test/query_test.go @@ -5,7 +5,6 @@ package user_test import ( "context" "errors" - "fmt" "slices" "testing" "time" @@ -73,7 +72,7 @@ func setPermissionCheckV2Flag(t *testing.T, setFlag bool) { } func TestServer_GetUserByID(t *testing.T) { - orgResp := Instance.CreateOrganization(IamCTX, fmt.Sprintf("GetUserByIDOrg-%s", gofakeit.AppName()), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context req *user.GetUserByIDRequest @@ -238,7 +237,7 @@ func TestServer_GetUserByID(t *testing.T) { func TestServer_GetUserByID_Permission(t *testing.T) { newOrgOwnerEmail := gofakeit.Email() - newOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("GetHuman-%s", gofakeit.AppName()), newOrgOwnerEmail) + newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) newUserID := newOrg.CreatedAdmins[0].GetUserId() type args struct { ctx context.Context @@ -438,7 +437,7 @@ func TestServer_ListUsers(t *testing.T) { require.NoError(t, err) }() - orgResp := Instance.CreateOrganization(IamCTX, fmt.Sprintf("ListUsersOrg-%s", gofakeit.AppName()), gofakeit.Email()) + orgResp := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) type args struct { ctx context.Context req *user.ListUsersRequest @@ -976,7 +975,7 @@ func TestServer_ListUsers(t *testing.T) { IamCTX, &user.ListUsersRequest{}, func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgResp := Instance.CreateOrganization(ctx, fmt.Sprintf("ListUsersResourceowner-%s", gofakeit.AppName()), gofakeit.Email()) + orgResp := Instance.CreateOrganization(ctx, integration.OrganizationName(), gofakeit.Email()) infos := createUsers(ctx, orgResp.OrganizationId, 3, false) request.Queries = []*user.SearchQuery{} @@ -1062,7 +1061,7 @@ func TestServer_ListUsers(t *testing.T) { IamCTX, &user.ListUsersRequest{}, func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgRespForOrgTests := Instance.CreateOrganization(IamCTX, fmt.Sprintf("GetUserByIDOrg-%s", gofakeit.AppName()), gofakeit.Email()) + orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) info := createUser(ctx, orgRespForOrgTests.OrganizationId, false) request.Queries = []*user.SearchQuery{} request.Queries = append(request.Queries, OrganizationIdQuery(orgRespForOrgTests.OrganizationId)) @@ -1108,8 +1107,8 @@ func TestServer_ListUsers(t *testing.T) { IamCTX, &user.ListUsersRequest{}, func(ctx context.Context, request *user.ListUsersRequest) userAttrs { - orgRespForOrgTests := Instance.CreateOrganization(IamCTX, fmt.Sprintf("GetUserByIDOrg-%s", gofakeit.AppName()), gofakeit.Email()) - orgRespForOrgTests2 := Instance.CreateOrganization(IamCTX, fmt.Sprintf("GetUserByIDOrg-%s", gofakeit.AppName()), gofakeit.Email()) + orgRespForOrgTests := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + orgRespForOrgTests2 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) // info := createUser(ctx, orgRespForOrgTests.OrganizationId, false) createUser(ctx, orgRespForOrgTests.OrganizationId, false) request.Queries = []*user.SearchQuery{} @@ -1189,9 +1188,9 @@ func TestServer_SystemUsers_ListUsers(t *testing.T) { require.NoError(t, err) }() - org1 := Instance.CreateOrganization(IamCTX, fmt.Sprintf("ListUsersOrg-%s", gofakeit.AppName()), gofakeit.Email()) - org2 := Instance.CreateOrganization(IamCTX, fmt.Sprintf("ListUsersOrg-%s", gofakeit.AppName()), "org2@zitadel.com") - org3 := Instance.CreateOrganization(IamCTX, fmt.Sprintf("ListUsersOrg-%s", gofakeit.AppName()), gofakeit.Email()) + org1 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) + org2 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), "org2@zitadel.com") + org3 := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.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 4296e8e599..f132b0955a 100644 --- a/internal/api/grpc/user/v2/integration_test/secret_test.go +++ b/internal/api/grpc/user/v2/integration_test/secret_test.go @@ -4,7 +4,6 @@ package user_test import ( "context" - "fmt" "testing" "time" @@ -12,6 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/zitadel/zitadel/internal/integration" "github.com/zitadel/zitadel/pkg/grpc/user/v2" ) @@ -97,7 +97,7 @@ func TestServer_AddSecret(t *testing.T) { } func TestServer_AddSecret_Permission(t *testing.T) { - otherOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("AddSecret-%s", gofakeit.AppName()), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) otherOrgUser, err := Instance.Client.UserV2.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ @@ -244,7 +244,7 @@ func TestServer_RemoveSecret(t *testing.T) { } func TestServer_RemoveSecret_Permission(t *testing.T) { - otherOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("RemoveSecret-%s", gofakeit.AppName()), gofakeit.Email()) + otherOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), gofakeit.Email()) otherOrgUser, err := Instance.Client.UserV2.CreateUser(IamCTX, &user.CreateUserRequest{ OrganizationId: otherOrg.OrganizationId, UserType: &user.CreateUserRequest_Machine_{ 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 959dbeddab..d87be02b7f 100644 --- a/internal/api/grpc/user/v2/integration_test/user_test.go +++ b/internal/api/grpc/user/v2/integration_test/user_test.go @@ -688,7 +688,7 @@ func TestServer_Deprecated_AddHumanUser(t *testing.T) { func TestServer_Deprecated_AddHumanUser_Permission(t *testing.T) { newOrgOwnerEmail := gofakeit.Email() - newOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("AddHuman-%s", gofakeit.AppName()), newOrgOwnerEmail) + newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) type args struct { ctx context.Context req *user.AddHumanUserRequest @@ -1242,7 +1242,7 @@ func TestServer_Deprecated_UpdateHumanUser(t *testing.T) { func TestServer_Deprecated_UpdateHumanUser_Permission(t *testing.T) { newOrgOwnerEmail := gofakeit.Email() - newOrg := Instance.CreateOrganization(IamCTX, fmt.Sprintf("UpdateHuman-%s", gofakeit.AppName()), newOrgOwnerEmail) + newOrg := Instance.CreateOrganization(IamCTX, integration.OrganizationName(), newOrgOwnerEmail) newUserID := newOrg.CreatedAdmins[0].GetUserId() type args struct { ctx context.Context @@ -1756,7 +1756,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, "", integration.ProjectName(), false, false) type args struct { req *user.DeleteUserRequest diff --git a/internal/integration/name.go b/internal/integration/name.go new file mode 100644 index 0000000000..443ae7a3a4 --- /dev/null +++ b/internal/integration/name.go @@ -0,0 +1,41 @@ +package integration + +import "github.com/brianvoe/gofakeit/v6" + +// company private function to add a random string to the gofakeit.Company function +func company() string { + return gofakeit.Company() + "-" + RandString(5) +} + +func OrganizationName() string { + return company() +} + +// appName private function to add a random string to the gofakeit.AppName function +func appName() string { + return gofakeit.AppName() + "-" + RandString(5) +} + +func TargetName() string { + return appName() +} + +func ApplicationName() string { + return appName() +} + +func ProjectName() string { + return appName() +} + +func IDPName() string { + return appName() +} + +func RoleKey() string { + return appName() +} + +func RoleDisplayName() string { + return appName() +} diff --git a/internal/integration/rand.go b/internal/integration/rand.go index d4f01b51c8..33a7eec15f 100644 --- a/internal/integration/rand.go +++ b/internal/integration/rand.go @@ -6,7 +6,7 @@ import ( ) func init() { - rand.Seed(time.Now().UnixNano()) + rand.NewSource(time.Now().UnixNano()) } var letterRunes = []rune("abcdefghijklmnopqrstuvwxyz")