TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-06 15:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: move gofakeit integration testing calls (#10684)

Browse Source 
# Which Problems Are Solved

Flakiness and conflicts in value from gofakeit.

# How the Problems Are Solved

Move Gofakeit calls to the integration package, to guarantee proper
usage and values for integration testing.

# Additional Changes

None

# Additional Context

None

(cherry picked from commit 492f1826ee)
This commit is contained in:
Stefan Benz
2025-09-10 08:00:31 +02:00
committed by Livio Spring
parent 78ded99017
commit b892fc9b28
70 changed files with 1404 additions and 1293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
internal/api/grpc/authorization/v2beta/integration_test/authorization_test.go
View File

@@ -7,7 +7,6 @@ import (
"testing"
"time"
"github.com/brianvoe/gofakeit/v6"
"github.com/muhlemmer/gu"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -33,9 +32,9 @@ func TestServer_CreateAuthorization(t *testing.T) {
name: "add authorization, project owned, PROJECT_OWNER, ok",
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.OrganizationId = &selfOrgId
request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id
request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
request.RoleKeys = []string{integration.RoleKey()}
Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "")
request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID
@@ -51,7 +50,7 @@ func TestServer_CreateAuthorization(t *testing.T) {
name: "add authorization, project owned, PROJECT_OWNER, no org id, ok",
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
request.RoleKeys = []string{integration.RoleKey()}
Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "")
@@ -68,7 +67,7 @@ func TestServer_CreateAuthorization(t *testing.T) {
name: "add authorization, project owned, ORG_OWNER, ok",
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.OrganizationId = &selfOrgId
request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
request.RoleKeys = []string{integration.RoleKey()}
@@ -87,7 +86,7 @@ func TestServer_CreateAuthorization(t *testing.T) {
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.OrganizationId = &selfOrgId
request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
request.RoleKeys = []string{integration.RoleKey()}
@@ -105,7 +104,7 @@ func TestServer_CreateAuthorization(t *testing.T) {
name: "add authorization, role does not exist, error",
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.OrganizationId = &selfOrgId
request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
request.RoleKeys = []string{integration.RoleKey()}
@@ -123,7 +122,7 @@ func TestServer_CreateAuthorization(t *testing.T) {
name: "add authorization, project does not exist, error",
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.OrganizationId = &selfOrgId
request.ProjectId = "notexists"
request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID
@@ -139,7 +138,7 @@ func TestServer_CreateAuthorization(t *testing.T) {
name: "add authorization, org does not exist, error",
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.OrganizationId = gu.Ptr("notexists")
request.ProjectId = Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID
@@ -157,9 +156,9 @@ func TestServer_CreateAuthorization(t *testing.T) {
name: "add authorization, project owner, project granted, no permission",
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.OrganizationId = &selfOrgId
foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email())
foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email())
request.ProjectId = Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, integration.ProjectName(), false, false).Id
request.RoleKeys = []string{integration.RoleKey()}
Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "")
@@ -178,12 +177,12 @@ func TestServer_CreateAuthorization(t *testing.T) {
name: "add authorization, role key not granted, error",
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.OrganizationId = &selfOrgId
foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email())
foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email())
request.ProjectId = Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, integration.ProjectName(), false, false).Id
request.RoleKeys = []string{integration.RoleKey()}
Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], gofakeit.AppName(), "")
Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "")
Instance.CreateProjectGrant(IAMCTX, t, request.ProjectId, selfOrgId)
request.UserId = Instance.Users.Get(integration.UserTypeIAMOwner).ID
callingUser := Instance.CreateUserTypeMachine(IAMCTX, selfOrgId)
@@ -199,9 +198,9 @@ func TestServer_CreateAuthorization(t *testing.T) {
name: "add authorization, grant does not exist, error",
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.OrganizationId = &selfOrgId
foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email())
foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email())
projectID := Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, integration.ProjectName(), false, false).Id
request.ProjectId = projectID
request.RoleKeys = []string{integration.RoleKey()}
@@ -221,9 +220,9 @@ func TestServer_CreateAuthorization(t *testing.T) {
name: "add authorization, PROJECT_OWNER on wrong org, error",
args: args{
func(t *testing.T, request *authorization.CreateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
request.OrganizationId = &selfOrgId
foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email())
foreignOrg := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email())
request.ProjectId = Instance.CreateProject(IAMCTX, t, foreignOrg.OrganizationId, integration.ProjectName(), false, false).Id
request.RoleKeys = []string{integration.RoleKey()}
Instance.AddProjectRole(IAMCTX, t, request.ProjectId, request.RoleKeys[0], integration.RoleDisplayName(), "")
@@ -272,7 +271,7 @@ func TestServer_UpdateAuthorization(t *testing.T) {
name: "update authorization, owned project, ok",
args: args{
func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -298,7 +297,7 @@ func TestServer_UpdateAuthorization(t *testing.T) {
name: "update authorization, owned project, role not found, error",
args: args{
func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -325,7 +324,7 @@ func TestServer_UpdateAuthorization(t *testing.T) {
name: "update authorization, owned project, unchanged, ok, changed date is creation date",
args: args{
func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -352,8 +351,8 @@ func TestServer_UpdateAuthorization(t *testing.T) {
name: "update authorization, granted project, ok",
args: args{
func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -382,8 +381,8 @@ func TestServer_UpdateAuthorization(t *testing.T) {
name: "update authorization, granted project, role not granted, error",
args: args{
func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -414,8 +413,8 @@ func TestServer_UpdateAuthorization(t *testing.T) {
name: "update authorization, granted project, grant removed, error",
args: args{
func(t *testing.T, request *authorization.UpdateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -486,7 +485,7 @@ func TestServer_DeleteAuthorization(t *testing.T) {
name: "delete authorization, project owned by calling users org, ok",
args: args{
func(t *testing.T, request *authorization.DeleteAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -510,11 +509,11 @@ func TestServer_DeleteAuthorization(t *testing.T) {
name: "delete authorization, owned project, user membership on project owning org, ok",
args: args{
func(t *testing.T, request *authorization.DeleteAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, gofakeit.AppName(), false, false).Id
projectRole1 := gofakeit.AppName()
projectRole2 := gofakeit.AppName()
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "")
Instance.AddProjectRole(IAMCTX, t, projectId, projectRole2, projectRole2, "")
preparedAuthorization, err := Instance.Client.AuthorizationV2Beta.CreateAuthorization(IAMCTX, &authorization.CreateAuthorizationRequest{
@@ -536,8 +535,8 @@ func TestServer_DeleteAuthorization(t *testing.T) {
name: "delete authorization, granted project, user membership on project owning org, error",
args: args{
func(t *testing.T, request *authorization.DeleteAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -567,8 +566,8 @@ func TestServer_DeleteAuthorization(t *testing.T) {
name: "delete authorization, granted project, user membership on project granted org, ok",
args: args{
func(t *testing.T, request *authorization.DeleteAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -595,8 +594,8 @@ func TestServer_DeleteAuthorization(t *testing.T) {
name: "delete authorization, already deleted, ok, deletion date is creation date",
args: args{
func(t *testing.T, request *authorization.DeleteAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, gofakeit.AppName(), false, false).Id
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
Instance.AddProjectRole(IAMCTX, t, projectId, projectRole1, projectRole1, "")
@@ -660,7 +659,7 @@ func TestServer_DeactivateAuthorization(t *testing.T) {
name: "deactivate authorization, project owned by calling users org, ok",
args: args{
func(t *testing.T, request *authorization.DeactivateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -684,8 +683,8 @@ func TestServer_DeactivateAuthorization(t *testing.T) {
name: "deactivate authorization, owned project, user membership on project owning org, ok",
args: args{
func(t *testing.T, request *authorization.DeactivateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -710,8 +709,8 @@ func TestServer_DeactivateAuthorization(t *testing.T) {
name: "deactivate authorization, granted project, user membership on project owning org, error",
args: args{
func(t *testing.T, request *authorization.DeactivateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -741,8 +740,8 @@ func TestServer_DeactivateAuthorization(t *testing.T) {
name: "deactivate authorization, granted project, user membership on project granted org, ok",
args: args{
func(t *testing.T, request *authorization.DeactivateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -768,7 +767,7 @@ func TestServer_DeactivateAuthorization(t *testing.T) {
name: "deactivate authorization, already inactive, ok, change date is creation date",
args: args{
func(t *testing.T, request *authorization.DeactivateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -833,7 +832,7 @@ func TestServer_ActivateAuthorization(t *testing.T) {
name: "activate authorization, project owned by calling users org, ok",
args: args{
func(t *testing.T, request *authorization.ActivateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -861,8 +860,8 @@ func TestServer_ActivateAuthorization(t *testing.T) {
name: "activate authorization, owned project, user membership on project owning org, ok",
args: args{
func(t *testing.T, request *authorization.ActivateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -891,8 +890,8 @@ func TestServer_ActivateAuthorization(t *testing.T) {
name: "activate authorization, granted project, user membership on project owning org, error",
args: args{
func(t *testing.T, request *authorization.ActivateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -926,8 +925,8 @@ func TestServer_ActivateAuthorization(t *testing.T) {
name: "activate authorization, granted project, user membership on project granted org, ok",
args: args{
func(t *testing.T, request *authorization.ActivateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
foreignOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, foreignOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -956,7 +955,7 @@ func TestServer_ActivateAuthorization(t *testing.T) {
name: "activate authorization, already active, ok, change date is creation date",
args: args{
func(t *testing.T, request *authorization.ActivateAuthorizationRequest) context.Context {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
projectId := Instance.CreateProject(IAMCTX, t, selfOrgId, integration.ProjectName(), false, false).Id
projectRole1 := integration.RoleKey()
projectRole2 := integration.RoleKey()
@@ -1004,7 +1003,7 @@ func TestServer_ActivateAuthorization(t *testing.T) {
}
func createUserWithProjectGrantMembership(ctx context.Context, t *testing.T, instance *integration.Instance, projectID, grantID string) string {
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), gofakeit.Email()).OrganizationId
selfOrgId := Instance.CreateOrganization(IAMCTX, integration.OrganizationName(), integration.Email()).OrganizationId
callingUser := instance.CreateUserTypeMachine(ctx, selfOrgId)
instance.CreateProjectGrantMembership(t, ctx, projectID, grantID, callingUser.Id)
token, err := instance.Client.UserV2.AddPersonalAccessToken(IAMCTX, &user.AddPersonalAccessTokenRequest{UserId: callingUser.Id, ExpirationDate: timestamppb.New(time.Now().Add(24 * time.Hour))})

55
internal/api/grpc/authorization/v2beta/integration_test/query_test.go
View File

@@ -7,7 +7,6 @@ import (
"testing"
"time"
"github.com/brianvoe/gofakeit/v6"
"github.com/muhlemmer/gu"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -49,7 +48,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: EmptyCTX,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -69,7 +68,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: Instance.WithAuthorizationToken(EmptyCTX, integration.UserTypeNoPermission),
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -117,7 +116,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -145,7 +144,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
resp := createAuthorization(iamOwnerCtx, Instance, t, Instance.DefaultOrg.GetId(), userResp.GetId(), false)
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_AuthorizationIds{
@@ -174,7 +173,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
resp := createAuthorization(iamOwnerCtx, Instance, t, Instance.DefaultOrg.GetId(), userResp.GetId(), false)
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectId{
@@ -203,7 +202,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
resp := createAuthorization(iamOwnerCtx, Instance, t, Instance.DefaultOrg.GetId(), userResp.GetId(), false)
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectName{
@@ -233,7 +232,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -261,7 +260,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
resp := createAuthorization(iamOwnerCtx, Instance, t, Instance.DefaultOrg.GetId(), userResp.GetId(), true)
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectGrantId{
@@ -290,7 +289,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -323,7 +322,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: Instance.WithAuthorizationToken(EmptyCTX, integration.UserTypeOrgOwner),
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -353,7 +352,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: projectOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -383,7 +382,7 @@ func TestServer_ListAuthorizations(t *testing.T) {
args: args{
ctx: projectGrantOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := Instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -455,7 +454,7 @@ func createAuthorizationForProject(ctx context.Context, instance *integration.In
userResp, err := instance.Client.UserV2.GetUserByID(ctx, &user.GetUserByIDRequest{UserId: userID})
require.NoError(t, err)
userGrantResp := instance.CreateProjectUserGrant(t, ctx, projectID, userID)
userGrantResp := instance.CreateProjectUserGrant(t, ctx, orgID, projectID, userID)
return &authorization.Authorization{
Id: userGrantResp.GetUserGrantId(),
ProjectId: projectID,
@@ -477,7 +476,7 @@ func createAuthorizationForProject(ctx context.Context, instance *integration.In
func createAuthorizationWithProjectGrant(ctx context.Context, instance *integration.Instance, t *testing.T, orgID, userID, projectName, projectID string) *authorization.Authorization {
grantedOrgName := integration.OrganizationName()
grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, gofakeit.Email())
grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, integration.Email())
instance.CreateProjectGrant(ctx, t, projectID, grantedOrg.GetOrganizationId())
return createAuthorizationForProjectGrant(ctx, instance, t, orgID, userID, projectName, projectID, grantedOrg.GetOrganizationId())
@@ -528,7 +527,7 @@ func createProject(ctx context.Context, instance *integration.Instance, t *testi
func createGrantedProject(ctx context.Context, instance *integration.Instance, t *testing.T, projectToGrant *project.Project) *project.Project {
grantedOrgName := integration.OrganizationName()
grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, gofakeit.Email())
grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, integration.Email())
projectGrantResp := instance.CreateProjectGrant(ctx, t, projectToGrant.GetId(), grantedOrg.GetOrganizationId())
return &project.Project{
@@ -581,7 +580,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: EmptyCTX,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -601,7 +600,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: InstancePermissionV2.WithAuthorizationToken(EmptyCTX, integration.UserTypeNoPermission),
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -649,7 +648,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -677,7 +676,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
resp := createAuthorization(iamOwnerCtx, InstancePermissionV2, t, InstancePermissionV2.DefaultOrg.GetId(), userResp.GetId(), false)
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_AuthorizationIds{
@@ -706,7 +705,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
resp := createAuthorization(iamOwnerCtx, InstancePermissionV2, t, InstancePermissionV2.DefaultOrg.GetId(), userResp.GetId(), false)
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectId{
@@ -735,7 +734,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
resp := createAuthorization(iamOwnerCtx, InstancePermissionV2, t, InstancePermissionV2.DefaultOrg.GetId(), userResp.GetId(), false)
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectName{
@@ -765,7 +764,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -793,7 +792,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
resp := createAuthorization(iamOwnerCtx, InstancePermissionV2, t, InstancePermissionV2.DefaultOrg.GetId(), userResp.GetId(), true)
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_ProjectGrantId{
@@ -822,7 +821,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -855,7 +854,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: InstancePermissionV2.WithAuthorizationToken(EmptyCTX, integration.UserTypeOrgOwner),
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -885,7 +884,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: projectOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{
@@ -915,7 +914,7 @@ func TestServer_ListAuthorizations_PermissionsV2(t *testing.T) {
args: args{
ctx: projectGrantOwnerCtx,
dep: func(request *authorization.ListAuthorizationsRequest, response *authorization.ListAuthorizationsResponse) {
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
userResp := InstancePermissionV2.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
request.Filters[0].Filter = &authorization.AuthorizationsSearchFilter_UserId{
UserId: &filter.IDFilter{