mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-06 16:12:13 +00:00
chore: move gofakeit integration testing calls (#10684)
# 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
committed by
Livio Spring
Livio Spring
parent
78ded99017
commit
b892fc9b28
@@ -7,7 +7,6 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/brianvoe/gofakeit/v6"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/integration"
|
||||
@@ -69,7 +68,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "already existing, error",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -87,7 +86,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "instance, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -106,7 +105,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "instance, not existing roles",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -123,7 +122,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "org, not existing",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -140,7 +139,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "org, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -159,7 +158,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "org, no existing roles",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -176,7 +175,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "project, not existing",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -193,7 +192,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "project, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
@@ -214,7 +213,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "project, not existing roles",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
@@ -233,7 +232,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "project grant, not existing",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
request.UserId = userResp.GetId()
|
||||
request.Resource = &internal_permission.ResourceType{
|
||||
@@ -254,9 +253,9 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "project grant, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
@@ -280,9 +279,9 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
name: "project grant, not existing roles",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
@@ -321,7 +320,7 @@ func TestServer_CreateAdministrator(t *testing.T) {
|
||||
|
||||
func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
|
||||
userProjectResp := instance.CreateMachineUser(iamOwnerCtx)
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
@@ -350,7 +349,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "unauthenticated",
|
||||
ctx: CTX,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -367,7 +366,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -384,7 +383,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "instance, missing permission, org owner",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -401,7 +400,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "instance, instance owner, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -420,7 +419,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "org, instance owner, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -439,7 +438,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "org, org owner, ok",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -458,7 +457,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "org, missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.CreateAdministratorRequest{
|
||||
@@ -475,7 +474,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "project, project owner, ok",
|
||||
ctx: projectOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -495,7 +494,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "project, missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -513,7 +512,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "project grant, project grant owner, ok",
|
||||
ctx: projectGrantOwnerCtx,
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -536,7 +535,7 @@ func TestServer_CreateAdministrator_Permission(t *testing.T) {
|
||||
name: "project grant, missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.CreateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -640,7 +639,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "instance, no change",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -661,7 +660,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "instance, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -682,7 +681,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "instance, not existing roles",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -700,7 +699,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "org, not existing",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.UpdateAdministratorRequest{
|
||||
@@ -717,7 +716,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "org, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -738,7 +737,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "org, no change",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -759,7 +758,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "org, no existing roles",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -777,7 +776,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "project, not existing",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
req: &internal_permission.UpdateAdministratorRequest{
|
||||
@@ -794,7 +793,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "project, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId())
|
||||
|
||||
@@ -817,7 +816,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "project, no change",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId())
|
||||
|
||||
@@ -840,7 +839,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "project, not existing roles",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId())
|
||||
|
||||
@@ -860,9 +859,9 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "project grant, not existing",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
@@ -884,9 +883,9 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "project grant, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
|
||||
@@ -912,9 +911,9 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "project grant, no change",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
|
||||
@@ -940,9 +939,9 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
name: "project grant, not existing roles",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
@@ -985,7 +984,7 @@ func TestServer_UpdateAdministrator(t *testing.T) {
|
||||
|
||||
func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
|
||||
userProjectResp := instance.CreateMachineUser(iamOwnerCtx)
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
@@ -1014,7 +1013,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "unauthenticated",
|
||||
ctx: CTX,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1032,7 +1031,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1050,7 +1049,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "instance, missing permission, org owner",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1068,7 +1067,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "instance, instance owner, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1088,7 +1087,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "org, instance owner, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1108,7 +1107,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "org, org owner, ok",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1128,7 +1127,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "org, missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1146,7 +1145,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "project, project owner, ok",
|
||||
ctx: projectOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1166,7 +1165,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "project, missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1184,7 +1183,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "project grant, project grant owner, ok",
|
||||
ctx: projectGrantOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1207,7 +1206,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "project grant, missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1228,7 +1227,7 @@ func TestServer_UpdateAdministrator_Permission(t *testing.T) {
|
||||
name: "project grant, project owner, error",
|
||||
ctx: projectOwnerCtx,
|
||||
prepare: func(request *internal_permission.UpdateAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1305,7 +1304,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
return creationDate, time.Now().UTC()
|
||||
},
|
||||
@@ -1323,7 +1322,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
instance.DeleteInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
@@ -1343,7 +1342,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
return creationDate, time.Time{}
|
||||
@@ -1362,7 +1361,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
return creationDate, time.Now().UTC()
|
||||
},
|
||||
@@ -1380,7 +1379,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
return creationDate, time.Time{}
|
||||
@@ -1399,7 +1398,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
instance.DeleteOrgMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
@@ -1419,7 +1418,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
request.UserId = userResp.GetId()
|
||||
return creationDate, time.Now().UTC()
|
||||
},
|
||||
@@ -1437,7 +1436,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId())
|
||||
|
||||
@@ -1457,7 +1456,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId())
|
||||
instance.DeleteProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId())
|
||||
@@ -1478,9 +1477,9 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
|
||||
request.UserId = userResp.GetId()
|
||||
@@ -1502,9 +1501,9 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
|
||||
@@ -1527,9 +1526,9 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) (time.Time, time.Time) {
|
||||
creationDate := time.Now().UTC()
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
instance.DeleteProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
@@ -1568,7 +1567,7 @@ func TestServer_DeleteAdministrator(t *testing.T) {
|
||||
|
||||
func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
|
||||
userProjectResp := instance.CreateMachineUser(iamOwnerCtx)
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
|
||||
@@ -1597,7 +1596,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "unauthenticated",
|
||||
ctx: CTX,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1614,7 +1613,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1631,7 +1630,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "instance, missing permission, org owner",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1648,7 +1647,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "instance, instance owner, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateInstanceMembership(t, iamOwnerCtx, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1667,7 +1666,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "org, instance owner, ok",
|
||||
ctx: iamOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1686,7 +1685,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "org, org owner, ok",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1705,7 +1704,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "org, missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateOrgMembership(t, iamOwnerCtx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1722,7 +1721,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "project, project owner, ok",
|
||||
ctx: projectOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1741,7 +1740,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "project, missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateProjectMembership(t, iamOwnerCtx, projectResp.GetId(), userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1758,7 +1757,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "project grant, project grant owner, ok",
|
||||
ctx: projectGrantOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1780,7 +1779,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "project grant, missing permission",
|
||||
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
@@ -1800,7 +1799,7 @@ func TestServer_DeleteAdministrator_Permission(t *testing.T) {
|
||||
name: "project grant, project owner, error",
|
||||
ctx: projectOwnerCtx,
|
||||
prepare: func(request *internal_permission.DeleteAdministratorRequest) {
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, gofakeit.Email())
|
||||
userResp := instance.CreateUserTypeHuman(iamOwnerCtx, integration.Email())
|
||||
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectResp.GetId(), orgResp.GetOrganizationId(), userResp.GetId())
|
||||
request.UserId = userResp.GetId()
|
||||
},
|
||||
|
||||
@@ -7,7 +7,6 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/brianvoe/gofakeit/v6"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
@@ -19,9 +18,9 @@ import (
|
||||
func TestServer_ListAdministrators(t *testing.T) {
|
||||
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
|
||||
|
||||
projectName := gofakeit.AppName()
|
||||
projectName := integration.ProjectName()
|
||||
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), projectName, false, false)
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
|
||||
userProjectResp := instance.CreateMachineUser(iamOwnerCtx)
|
||||
@@ -551,7 +550,7 @@ func assertPaginationResponse(t *assert.CollectT, expected *filter.PaginationRes
|
||||
}
|
||||
|
||||
func createInstanceAdministrator(ctx context.Context, instance *integration.Instance, t *testing.T) *internal_permission.Administrator {
|
||||
email := gofakeit.Email()
|
||||
email := integration.Email()
|
||||
userResp := instance.CreateUserTypeHuman(ctx, email)
|
||||
memberResp := instance.CreateInstanceMembership(t, ctx, userResp.GetId())
|
||||
return &internal_permission.Administrator{
|
||||
@@ -571,7 +570,7 @@ func createInstanceAdministrator(ctx context.Context, instance *integration.Inst
|
||||
}
|
||||
|
||||
func createOrganizationAdministrator(ctx context.Context, instance *integration.Instance, t *testing.T) *internal_permission.Administrator {
|
||||
email := gofakeit.Email()
|
||||
email := integration.Email()
|
||||
userResp := instance.CreateUserTypeHuman(ctx, email)
|
||||
memberResp := instance.CreateOrgMembership(t, ctx, instance.DefaultOrg.Id, userResp.GetId())
|
||||
return &internal_permission.Administrator{
|
||||
@@ -594,7 +593,7 @@ func createOrganizationAdministrator(ctx context.Context, instance *integration.
|
||||
}
|
||||
|
||||
func createProjectAdministrator(ctx context.Context, instance *integration.Instance, t *testing.T, orgID, projectID, projectName string) *internal_permission.Administrator {
|
||||
email := gofakeit.Email()
|
||||
email := integration.Email()
|
||||
userResp := instance.CreateUserTypeHuman(ctx, email)
|
||||
memberResp := instance.CreateProjectMembership(t, ctx, projectID, userResp.GetId())
|
||||
return &internal_permission.Administrator{
|
||||
@@ -618,7 +617,7 @@ func createProjectAdministrator(ctx context.Context, instance *integration.Insta
|
||||
}
|
||||
|
||||
func createProjectGrantAdministrator(ctx context.Context, instance *integration.Instance, t *testing.T, orgID, projectID, projectName, grantedOrgID string) *internal_permission.Administrator {
|
||||
email := gofakeit.Email()
|
||||
email := integration.Email()
|
||||
userResp := instance.CreateUserTypeHuman(ctx, email)
|
||||
memberResp := instance.CreateProjectGrantMembership(t, ctx, projectID, grantedOrgID, userResp.GetId())
|
||||
return &internal_permission.Administrator{
|
||||
@@ -650,7 +649,7 @@ func TestServer_ListAdministrators_PermissionV2(t *testing.T) {
|
||||
|
||||
projectName := integration.ProjectName()
|
||||
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), projectName, false, false)
|
||||
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
|
||||
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), integration.Email())
|
||||
instancePermissionV2.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgResp.GetOrganizationId())
|
||||
|
||||
userProjectResp := instancePermissionV2.CreateMachineUser(iamOwnerCtx)
|
||||
|
||||
Reference in New Issue
Block a user