TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 04:57:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix flakiness in gofakeit usage with additional random string (#10385)

Browse Source 
# Which Problems Are Solved

Flakiness in integration tests regarding gofakeit functions, which
provided the same names on 2 different occasions.

# How the Problems Are Solved

Attach a random string to the provided names, so that they are not
dependent on the gofakeit code.

# Additional Changes

None

# Additional Context

None

---------

Co-authored-by: Marco A. <marco@zitadel.com>
This commit is contained in:
Stefan Benz
2025-08-07 15:27:01 +02:00
committed by GitHub
parent a96f4708cb
commit 6e8aa9a7d1
31 changed files with 700 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

260
internal/api/grpc/project/v2beta/integration_test/project_grant_test.go
View File

@@ -15,8 +15,8 @@ import (
)
func TestServer_CreateProjectGrant(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type want struct {
creationDate bool
@@ -49,7 +49,7 @@ func TestServer_CreateProjectGrant(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.CreateProjectGrantRequest) {
request.ProjectId = "something"
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
},
req: &project.CreateProjectGrantRequest{},
@@ -59,7 +59,7 @@ func TestServer_CreateProjectGrant(t *testing.T) {
name: "org not existing",
ctx: iamOwnerCtx,
prepare: func(request *project.CreateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
request.GrantedOrganizationId = "something"
@@ -71,10 +71,10 @@ func TestServer_CreateProjectGrant(t *testing.T) {
name: "already existing, error",
ctx: iamOwnerCtx,
prepare: func(request *project.CreateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -86,7 +86,7 @@ func TestServer_CreateProjectGrant(t *testing.T) {
name: "same organization, error",
ctx: iamOwnerCtx,
prepare: func(request *project.CreateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
request.GrantedOrganizationId = orgResp.GetOrganizationId()
@@ -98,10 +98,10 @@ func TestServer_CreateProjectGrant(t *testing.T) {
name: "empty, ok",
ctx: iamOwnerCtx,
prepare: func(request *project.CreateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
},
req: &project.CreateProjectGrantRequest{},
@@ -113,12 +113,12 @@ func TestServer_CreateProjectGrant(t *testing.T) {
name: "with roles, not existing",
ctx: iamOwnerCtx,
prepare: func(request *project.CreateProjectGrantRequest) {
roles := []string{gofakeit.Name(), gofakeit.Name(), gofakeit.Name()}
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()}
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
request.RoleKeys = roles
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
},
req: &project.CreateProjectGrantRequest{},
@@ -128,8 +128,8 @@ func TestServer_CreateProjectGrant(t *testing.T) {
name: "with roles, ok",
ctx: iamOwnerCtx,
prepare: func(request *project.CreateProjectGrantRequest) {
roles := []string{gofakeit.Name(), gofakeit.Name(), gofakeit.Name()}
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()}
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
for _, role := range roles {
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "")
@@ -137,7 +137,7 @@ func TestServer_CreateProjectGrant(t *testing.T) {
request.RoleKeys = roles
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
},
req: &project.CreateProjectGrantRequest{},
@@ -166,8 +166,8 @@ func TestServer_CreateProjectGrant(t *testing.T) {
}
func TestServer_CreateProjectGrant_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
userResp := instance.CreateMachineUser(iamOwnerCtx)
patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId())
@@ -190,8 +190,8 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) {
name: "unauthenticated",
ctx: CTX,
prepare: func(request *project.CreateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.ProjectId = projectResp.GetId()
request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId()
@@ -201,10 +201,10 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) {
},
{
name: "no permission",
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
prepare: func(request *project.CreateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.ProjectId = projectResp.GetId()
request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId()
@@ -216,8 +216,8 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) {
name: "project owner, other project",
ctx: projectOwnerCtx,
prepare: func(request *project.CreateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.ProjectId = projectResp.GetId()
request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId()
@@ -231,7 +231,7 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) {
prepare: func(request *project.CreateProjectGrantRequest) {
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
},
req: &project.CreateProjectGrantRequest{},
@@ -241,10 +241,10 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) {
},
{
name: "organization owner, other org",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
prepare: func(request *project.CreateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.ProjectId = projectResp.GetId()
request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId()
@@ -254,12 +254,12 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) {
},
{
name: "organization owner, ok",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
prepare: func(request *project.CreateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
},
req: &project.CreateProjectGrantRequest{},
@@ -271,8 +271,8 @@ func TestServer_CreateProjectGrant_Permission(t *testing.T) {
name: "instance owner",
ctx: iamOwnerCtx,
prepare: func(request *project.CreateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
grantedOrgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.ProjectId = projectResp.GetId()
request.GrantedOrganizationId = grantedOrgResp.GetOrganizationId()
@@ -315,8 +315,8 @@ func assertCreateProjectGrantResponse(t *testing.T, creationDate, changeDate tim
}
func TestServer_UpdateProjectGrant(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -351,10 +351,10 @@ func TestServer_UpdateProjectGrant(t *testing.T) {
{
name: "no change, ok",
prepare: func(request *project.UpdateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -371,11 +371,11 @@ func TestServer_UpdateProjectGrant(t *testing.T) {
{
name: "change roles, ok",
prepare: func(request *project.UpdateProjectGrantRequest) {
roles := []string{gofakeit.Animal(), gofakeit.Animal(), gofakeit.Animal()}
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()}
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
for _, role := range roles {
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "")
@@ -396,14 +396,14 @@ func TestServer_UpdateProjectGrant(t *testing.T) {
{
name: "change roles, not existing",
prepare: func(request *project.UpdateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
request.RoleKeys = []string{gofakeit.Animal(), gofakeit.Animal(), gofakeit.Animal()}
request.RoleKeys = []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()}
},
args: args{
ctx: iamOwnerCtx,
@@ -435,12 +435,12 @@ func TestServer_UpdateProjectGrant(t *testing.T) {
}
func TestServer_UpdateProjectGrant_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
userResp := instance.CreateMachineUser(iamOwnerCtx)
patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId())
projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false).GetId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectID, orgResp.GetOrganizationId())
instance.CreateProjectGrantMembership(t, iamOwnerCtx, projectID, orgResp.GetOrganizationId(), userResp.GetUserId())
projectGrantOwnerCtx := integration.WithAuthorizationToken(CTX, patResp.Token)
@@ -463,10 +463,10 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) {
{
name: "unauthenticated",
prepare: func(request *project.UpdateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -482,16 +482,16 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) {
{
name: "no permission",
prepare: func(request *project.UpdateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.UpdateProjectGrantRequest{
RoleKeys: []string{"nopermission"},
},
@@ -501,7 +501,7 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) {
{
name: "project grant owner, no permission",
prepare: func(request *project.UpdateProjectGrantRequest) {
roles := []string{gofakeit.Animal(), gofakeit.Animal(), gofakeit.Animal()}
roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()}
request.ProjectId = projectID
request.GrantedOrganizationId = orgResp.GetOrganizationId()
@@ -520,16 +520,16 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) {
{
name: "organization owner, other org",
prepare: func(request *project.UpdateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.UpdateProjectGrantRequest{
RoleKeys: []string{"nopermission"},
},
@@ -539,11 +539,11 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) {
{
name: "organization owner, ok",
prepare: func(request *project.UpdateProjectGrantRequest) {
roles := []string{gofakeit.Animal(), gofakeit.Animal(), gofakeit.Animal()}
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()}
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
for _, role := range roles {
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "")
@@ -553,7 +553,7 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) {
request.RoleKeys = roles
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.UpdateProjectGrantRequest{},
},
want: want{
@@ -564,11 +564,11 @@ func TestServer_UpdateProjectGrant_Permission(t *testing.T) {
{
name: "instance owner, ok",
prepare: func(request *project.UpdateProjectGrantRequest) {
roles := []string{gofakeit.Animal(), gofakeit.Animal(), gofakeit.Animal()}
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roles := []string{integration.RoleKey(), integration.RoleKey(), integration.RoleKey()}
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
for _, role := range roles {
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), role, role, "")
@@ -622,8 +622,8 @@ func assertUpdateProjectGrantResponse(t *testing.T, creationDate, changeDate tim
}
func TestServer_DeleteProjectGrant(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
tests := []struct {
name string
@@ -664,10 +664,10 @@ func TestServer_DeleteProjectGrant(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -681,10 +681,10 @@ func TestServer_DeleteProjectGrant(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -699,10 +699,10 @@ func TestServer_DeleteProjectGrant(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -731,8 +731,8 @@ func TestServer_DeleteProjectGrant(t *testing.T) {
}
func TestServer_DeleteProjectGrant_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
tests := []struct {
name string
@@ -746,10 +746,10 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) {
name: "unauthenticated",
ctx: CTX,
prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -760,12 +760,12 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) {
},
{
name: "no permission",
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -776,13 +776,13 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) {
},
{
name: "organization owner, other org",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -793,13 +793,13 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) {
},
{
name: "organization owner, ok",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -813,10 +813,10 @@ func TestServer_DeleteProjectGrant_Permission(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.DeleteProjectGrantRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -856,8 +856,8 @@ func assertDeleteProjectGrantResponse(t *testing.T, creationDate, deletionDate t
}
func TestServer_DeactivateProjectGrant(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -877,16 +877,16 @@ func TestServer_DeactivateProjectGrant(t *testing.T) {
{
name: "missing permission",
prepare: func(request *project.DeactivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.DeactivateProjectGrantRequest{},
},
wantErr: true,
@@ -907,10 +907,10 @@ func TestServer_DeactivateProjectGrant(t *testing.T) {
{
name: "no change, ok",
prepare: func(request *project.DeactivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -928,10 +928,10 @@ func TestServer_DeactivateProjectGrant(t *testing.T) {
{
name: "change, ok",
prepare: func(request *project.DeactivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -967,8 +967,8 @@ func TestServer_DeactivateProjectGrant(t *testing.T) {
}
func TestServer_DeactivateProjectGrant_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -988,10 +988,10 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) {
{
name: "unauthenticated",
prepare: func(request *project.DeactivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -1005,16 +1005,16 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) {
{
name: "no permission",
prepare: func(request *project.DeactivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.DeactivateProjectGrantRequest{},
},
wantErr: true,
@@ -1022,16 +1022,16 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) {
{
name: "organization owner, other org",
prepare: func(request *project.DeactivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.DeactivateProjectGrantRequest{},
},
wantErr: true,
@@ -1039,16 +1039,16 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) {
{
name: "organization owner, ok",
prepare: func(request *project.DeactivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.DeactivateProjectGrantRequest{},
},
want: want{
@@ -1059,10 +1059,10 @@ func TestServer_DeactivateProjectGrant_Permission(t *testing.T) {
{
name: "instance owner, ok",
prepare: func(request *project.DeactivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -1110,8 +1110,8 @@ func assertDeactivateProjectGrantResponse(t *testing.T, creationDate, changeDate
}
func TestServer_ActivateProjectGrant(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -1144,10 +1144,10 @@ func TestServer_ActivateProjectGrant(t *testing.T) {
{
name: "no change, ok",
prepare: func(request *project.ActivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -1164,10 +1164,10 @@ func TestServer_ActivateProjectGrant(t *testing.T) {
{
name: "change, ok",
prepare: func(request *project.ActivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -1204,8 +1204,8 @@ func TestServer_ActivateProjectGrant(t *testing.T) {
}
func TestServer_ActivateProjectGrant_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -1225,10 +1225,10 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) {
{
name: "unauthenticated",
prepare: func(request *project.ActivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
@@ -1242,17 +1242,17 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) {
{
name: "no permission",
prepare: func(request *project.ActivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
instance.DeactivateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.ActivateProjectGrantRequest{},
},
wantErr: true,
@@ -1260,17 +1260,17 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) {
{
name: "organization owner, other org",
prepare: func(request *project.ActivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
instance.DeactivateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.ActivateProjectGrantRequest{},
},
wantErr: true,
@@ -1278,17 +1278,17 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) {
{
name: "organization owner, ok",
prepare: func(request *project.ActivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
instance.DeactivateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.ActivateProjectGrantRequest{},
},
want: want{
@@ -1299,10 +1299,10 @@ func TestServer_ActivateProjectGrant_Permission(t *testing.T) {
{
name: "instance owner, ok",
prepare: func(request *project.ActivateProjectGrantRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.GrantedOrganizationId = grantedOrg.GetOrganizationId()
instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), grantedOrg.GetOrganizationId())

170
internal/api/grpc/project/v2beta/integration_test/project_role_test.go
View File

@@ -16,11 +16,11 @@ import (
)
func TestServer_AddProjectRole(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
alreadyExistingProject := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
alreadyExistingProjectRoleName := gofakeit.AppName()
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email())
alreadyExistingProject := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
alreadyExistingProjectRoleName := integration.RoleDisplayName()
instance.AddProjectRole(iamOwnerCtx, t, alreadyExistingProject.GetId(), alreadyExistingProjectRoleName, alreadyExistingProjectRoleName, "")
type want struct {
@@ -38,12 +38,12 @@ func TestServer_AddProjectRole(t *testing.T) {
name: "empty key",
ctx: iamOwnerCtx,
prepare: func(request *project.AddProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
},
req: &project.AddProjectRoleRequest{
RoleKey: "",
DisplayName: gofakeit.AppName(),
DisplayName: integration.ProjectName(),
},
wantErr: true,
},
@@ -51,11 +51,11 @@ func TestServer_AddProjectRole(t *testing.T) {
name: "empty displayname",
ctx: iamOwnerCtx,
prepare: func(request *project.AddProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
},
req: &project.AddProjectRoleRequest{
RoleKey: gofakeit.AppName(),
RoleKey: integration.RoleKey(),
DisplayName: "",
},
wantErr: true,
@@ -76,12 +76,12 @@ func TestServer_AddProjectRole(t *testing.T) {
name: "empty, ok",
ctx: iamOwnerCtx,
prepare: func(request *project.AddProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
},
req: &project.AddProjectRoleRequest{
RoleKey: gofakeit.Name(),
DisplayName: gofakeit.Name(),
RoleKey: integration.RoleKey(),
DisplayName: integration.RoleDisplayName(),
},
want: want{
creationDate: true,
@@ -108,11 +108,11 @@ func TestServer_AddProjectRole(t *testing.T) {
}
func TestServer_AddProjectRole_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
alreadyExistingProject := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
alreadyExistingProjectRoleName := gofakeit.AppName()
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
alreadyExistingProject := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
alreadyExistingProjectRoleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, alreadyExistingProject.GetId(), alreadyExistingProjectRoleName, alreadyExistingProjectRoleName, "")
type want struct {
@@ -130,51 +130,51 @@ func TestServer_AddProjectRole_Permission(t *testing.T) {
name: "unauthenticated",
ctx: CTX,
prepare: func(request *project.AddProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
},
req: &project.AddProjectRoleRequest{
RoleKey: gofakeit.AppName(),
DisplayName: gofakeit.AppName(),
RoleKey: integration.RoleKey(),
DisplayName: integration.RoleDisplayName(),
},
wantErr: true,
},
{
name: "no permission",
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
prepare: func(request *project.AddProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
},
req: &project.AddProjectRoleRequest{
RoleKey: gofakeit.AppName(),
DisplayName: gofakeit.AppName(),
RoleKey: integration.RoleKey(),
DisplayName: integration.RoleDisplayName(),
},
wantErr: true,
},
{
name: "organization owner, other org",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
prepare: func(request *project.AddProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
},
req: &project.AddProjectRoleRequest{
RoleKey: gofakeit.AppName(),
DisplayName: gofakeit.AppName(),
RoleKey: integration.RoleKey(),
DisplayName: integration.RoleDisplayName(),
},
wantErr: true,
},
{
name: "organization owner, ok",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
prepare: func(request *project.AddProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
},
req: &project.AddProjectRoleRequest{
RoleKey: gofakeit.AppName(),
DisplayName: gofakeit.AppName(),
RoleKey: integration.RoleKey(),
DisplayName: integration.RoleDisplayName(),
},
want: want{
creationDate: true,
@@ -184,12 +184,12 @@ func TestServer_AddProjectRole_Permission(t *testing.T) {
name: "instance owner, ok",
ctx: iamOwnerCtx,
prepare: func(request *project.AddProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
},
req: &project.AddProjectRoleRequest{
RoleKey: gofakeit.AppName(),
DisplayName: gofakeit.AppName(),
RoleKey: integration.RoleKey(),
DisplayName: integration.RoleDisplayName(),
},
want: want{
creationDate: true,
@@ -228,8 +228,8 @@ func assertAddProjectRoleResponse(t *testing.T, creationDate, changeDate time.Ti
}
func TestServer_UpdateProjectRole(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -249,14 +249,14 @@ func TestServer_UpdateProjectRole(t *testing.T) {
{
name: "missing permission",
prepare: func(request *project.UpdateProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.UpdateProjectRoleRequest{
DisplayName: gu.Ptr("changed"),
},
@@ -280,8 +280,8 @@ func TestServer_UpdateProjectRole(t *testing.T) {
{
name: "no change, ok",
prepare: func(request *project.UpdateProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -299,8 +299,8 @@ func TestServer_UpdateProjectRole(t *testing.T) {
{
name: "change display name, ok",
prepare: func(request *project.UpdateProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -308,7 +308,7 @@ func TestServer_UpdateProjectRole(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
req: &project.UpdateProjectRoleRequest{
DisplayName: gu.Ptr(gofakeit.AppName()),
DisplayName: gu.Ptr(integration.RoleKey()),
},
},
want: want{
@@ -319,8 +319,8 @@ func TestServer_UpdateProjectRole(t *testing.T) {
{
name: "change full, ok",
prepare: func(request *project.UpdateProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -328,8 +328,8 @@ func TestServer_UpdateProjectRole(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
req: &project.UpdateProjectRoleRequest{
DisplayName: gu.Ptr(gofakeit.AppName()),
Group: gu.Ptr(gofakeit.AppName()),
DisplayName: gu.Ptr(integration.RoleKey()),
Group: gu.Ptr(integration.RoleKey()),
},
},
want: want{
@@ -359,8 +359,8 @@ func TestServer_UpdateProjectRole(t *testing.T) {
}
func TestServer_UpdateProjectRole_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -380,8 +380,8 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) {
{
name: "unauthenicated",
prepare: func(request *project.UpdateProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -397,14 +397,14 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) {
{
name: "no permission",
prepare: func(request *project.UpdateProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.UpdateProjectRoleRequest{
DisplayName: gu.Ptr("changed"),
},
@@ -414,14 +414,14 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) {
{
name: "organization owner, other org",
prepare: func(request *project.UpdateProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.UpdateProjectRoleRequest{
DisplayName: gu.Ptr("changed"),
},
@@ -431,16 +431,16 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) {
{
name: "organization owner, ok",
prepare: func(request *project.UpdateProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.UpdateProjectRoleRequest{
DisplayName: gu.Ptr(gofakeit.AppName()),
DisplayName: gu.Ptr(integration.RoleKey()),
},
},
want: want{
@@ -451,8 +451,8 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) {
{
name: "instance owner, ok",
prepare: func(request *project.UpdateProjectRoleRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -460,7 +460,7 @@ func TestServer_UpdateProjectRole_Permission(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
req: &project.UpdateProjectRoleRequest{
DisplayName: gu.Ptr(gofakeit.AppName()),
DisplayName: gu.Ptr(integration.RoleKey()),
},
},
want: want{
@@ -502,8 +502,8 @@ func assertUpdateProjectRoleResponse(t *testing.T, creationDate, changeDate time
}
func TestServer_DeleteProjectRole(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
tests := []struct {
name string
@@ -536,8 +536,8 @@ func TestServer_DeleteProjectRole(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -551,8 +551,8 @@ func TestServer_DeleteProjectRole(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -581,8 +581,8 @@ func TestServer_DeleteProjectRole(t *testing.T) {
}
func TestServer_DeleteProjectRole_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
tests := []struct {
name string
@@ -597,8 +597,8 @@ func TestServer_DeleteProjectRole_Permission(t *testing.T) {
ctx: CTX,
prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -609,11 +609,11 @@ func TestServer_DeleteProjectRole_Permission(t *testing.T) {
},
{
name: "no permission",
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -624,11 +624,11 @@ func TestServer_DeleteProjectRole_Permission(t *testing.T) {
},
{
name: "organization owner, other org",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -639,11 +639,11 @@ func TestServer_DeleteProjectRole_Permission(t *testing.T) {
},
{
name: "organization owner, ok",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName
@@ -657,8 +657,8 @@ func TestServer_DeleteProjectRole_Permission(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
roleName := gofakeit.AppName()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
roleName := integration.RoleKey()
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
request.ProjectId = projectResp.GetId()
request.RoleKey = roleName

172
internal/api/grpc/project/v2beta/integration_test/project_test.go
View File

@@ -16,10 +16,10 @@ import (
)
func TestServer_CreateProject(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
alreadyExistingProjectName := gofakeit.AppName()
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
alreadyExistingProjectName := integration.ProjectName()
instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), alreadyExistingProjectName, false, false)
type want struct {
@@ -45,7 +45,7 @@ func TestServer_CreateProject(t *testing.T) {
name: "empty organization",
ctx: iamOwnerCtx,
req: &project.CreateProjectRequest{
Name: gofakeit.Name(),
Name: integration.ProjectName(),
OrganizationId: "",
},
wantErr: true,
@@ -63,7 +63,7 @@ func TestServer_CreateProject(t *testing.T) {
name: "empty, ok",
ctx: iamOwnerCtx,
req: &project.CreateProjectRequest{
Name: gofakeit.Name(),
Name: integration.ProjectName(),
OrganizationId: orgResp.GetOrganizationId(),
},
want: want{
@@ -88,8 +88,8 @@ func TestServer_CreateProject(t *testing.T) {
}
func TestServer_CreateProject_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type want struct {
id bool
@@ -106,34 +106,34 @@ func TestServer_CreateProject_Permission(t *testing.T) {
name: "unauthenticated",
ctx: CTX,
req: &project.CreateProjectRequest{
Name: gofakeit.Name(),
Name: integration.ProjectName(),
OrganizationId: orgResp.GetOrganizationId(),
},
wantErr: true,
},
{
name: "missing permission",
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.CreateProjectRequest{
Name: gofakeit.Name(),
Name: integration.ProjectName(),
OrganizationId: orgResp.GetOrganizationId(),
},
wantErr: true,
},
{
name: "missing permission, other organization",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.CreateProjectRequest{
Name: gofakeit.Name(),
Name: integration.ProjectName(),
OrganizationId: orgResp.GetOrganizationId(),
},
wantErr: true,
},
{
name: "organization owner, ok",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.CreateProjectRequest{
Name: gofakeit.Name(),
Name: integration.ProjectName(),
OrganizationId: instance.DefaultOrg.GetId(),
},
want: want{
@@ -145,7 +145,7 @@ func TestServer_CreateProject_Permission(t *testing.T) {
name: "instance owner, ok",
ctx: iamOwnerCtx,
req: &project.CreateProjectRequest{
Name: gofakeit.Name(),
Name: integration.ProjectName(),
OrganizationId: orgResp.GetOrganizationId(),
},
want: want{
@@ -188,8 +188,8 @@ func assertCreateProjectResponse(t *testing.T, creationDate, changeDate time.Tim
}
func TestServer_UpdateProject(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -215,7 +215,7 @@ func TestServer_UpdateProject(t *testing.T) {
args: args{
ctx: iamOwnerCtx,
req: &project.UpdateProjectRequest{
Name: gu.Ptr(gofakeit.Name()),
Name: gu.Ptr(integration.ProjectName()),
},
},
wantErr: true,
@@ -223,7 +223,7 @@ func TestServer_UpdateProject(t *testing.T) {
{
name: "no change, ok",
prepare: func(request *project.UpdateProjectRequest) {
name := gofakeit.AppName()
name := integration.ProjectName()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false).GetId()
request.Id = projectID
request.Name = gu.Ptr(name)
@@ -240,13 +240,13 @@ func TestServer_UpdateProject(t *testing.T) {
{
name: "change name, ok",
prepare: func(request *project.UpdateProjectRequest) {
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
},
args: args{
ctx: iamOwnerCtx,
req: &project.UpdateProjectRequest{
Name: gu.Ptr(gofakeit.AppName()),
Name: gu.Ptr(integration.ProjectName()),
},
},
want: want{
@@ -257,13 +257,13 @@ func TestServer_UpdateProject(t *testing.T) {
{
name: "change full, ok",
prepare: func(request *project.UpdateProjectRequest) {
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
},
args: args{
ctx: iamOwnerCtx,
req: &project.UpdateProjectRequest{
Name: gu.Ptr(gofakeit.AppName()),
Name: gu.Ptr(integration.ProjectName()),
ProjectRoleAssertion: gu.Ptr(true),
ProjectRoleCheck: gu.Ptr(true),
HasProjectCheck: gu.Ptr(true),
@@ -297,12 +297,12 @@ func TestServer_UpdateProject(t *testing.T) {
}
func TestServer_UpdateProject_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
userResp := instance.CreateMachineUser(iamOwnerCtx)
patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId())
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
instance.CreateProjectMembership(t, iamOwnerCtx, projectID, userResp.GetUserId())
projectOwnerCtx := integration.WithAuthorizationToken(CTX, patResp.Token)
@@ -324,13 +324,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) {
{
name: "unauthenticated",
prepare: func(request *project.UpdateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
},
args: args{
ctx: CTX,
req: &project.UpdateProjectRequest{
Name: gu.Ptr(gofakeit.Name()),
Name: gu.Ptr(integration.ProjectName()),
},
},
wantErr: true,
@@ -338,13 +338,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) {
{
name: "missing permission",
prepare: func(request *project.UpdateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.UpdateProjectRequest{
Name: gu.Ptr(gofakeit.Name()),
Name: gu.Ptr(integration.ProjectName()),
},
},
wantErr: true,
@@ -352,13 +352,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) {
{
name: "project owner, no permission",
prepare: func(request *project.UpdateProjectRequest) {
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
},
args: args{
ctx: projectOwnerCtx,
req: &project.UpdateProjectRequest{
Name: gu.Ptr(gofakeit.AppName()),
Name: gu.Ptr(integration.ProjectName()),
},
},
wantErr: true,
@@ -371,7 +371,7 @@ func TestServer_UpdateProject_Permission(t *testing.T) {
args: args{
ctx: projectOwnerCtx,
req: &project.UpdateProjectRequest{
Name: gu.Ptr(gofakeit.AppName()),
Name: gu.Ptr(integration.ProjectName()),
},
},
want: want{
@@ -382,13 +382,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) {
{
name: "missing permission, other organization",
prepare: func(request *project.UpdateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.UpdateProjectRequest{
Name: gu.Ptr(gofakeit.Name()),
Name: gu.Ptr(integration.ProjectName()),
},
},
wantErr: true,
@@ -396,13 +396,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) {
{
name: "organization owner, ok",
prepare: func(request *project.UpdateProjectRequest) {
projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.UpdateProjectRequest{
Name: gu.Ptr(gofakeit.AppName()),
Name: gu.Ptr(integration.ProjectName()),
},
},
want: want{
@@ -413,13 +413,13 @@ func TestServer_UpdateProject_Permission(t *testing.T) {
{
name: "instance owner, ok",
prepare: func(request *project.UpdateProjectRequest) {
projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
},
args: args{
ctx: iamOwnerCtx,
req: &project.UpdateProjectRequest{
Name: gu.Ptr(gofakeit.AppName()),
Name: gu.Ptr(integration.ProjectName()),
},
},
want: want{
@@ -461,8 +461,8 @@ func assertUpdateProjectResponse(t *testing.T, creationDate, changeDate time.Tim
}
func TestServer_DeleteProject(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
tests := []struct {
name string
@@ -493,7 +493,7 @@ func TestServer_DeleteProject(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
return creationDate, time.Time{}
},
@@ -505,7 +505,7 @@ func TestServer_DeleteProject(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
instance.DeleteProject(iamOwnerCtx, t, projectID)
return creationDate, time.Now().UTC()
@@ -532,12 +532,12 @@ func TestServer_DeleteProject(t *testing.T) {
}
func TestServer_DeleteProject_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
userResp := instance.CreateMachineUser(iamOwnerCtx)
patResp := instance.CreatePersonalAccessToken(iamOwnerCtx, userResp.GetUserId())
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
instance.CreateProjectMembership(t, iamOwnerCtx, projectID, userResp.GetUserId())
projectOwnerCtx := integration.WithAuthorizationToken(CTX, patResp.Token)
@@ -554,7 +554,7 @@ func TestServer_DeleteProject_Permission(t *testing.T) {
ctx: CTX,
prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
return creationDate, time.Time{}
},
@@ -563,10 +563,10 @@ func TestServer_DeleteProject_Permission(t *testing.T) {
},
{
name: "missing permission",
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
return creationDate, time.Time{}
},
@@ -578,7 +578,7 @@ func TestServer_DeleteProject_Permission(t *testing.T) {
ctx: projectOwnerCtx,
prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
return creationDate, time.Time{}
},
@@ -598,10 +598,10 @@ func TestServer_DeleteProject_Permission(t *testing.T) {
},
{
name: "organization owner, other org",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
return creationDate, time.Time{}
},
@@ -610,10 +610,10 @@ func TestServer_DeleteProject_Permission(t *testing.T) {
},
{
name: "organization owner",
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
return creationDate, time.Time{}
},
@@ -625,7 +625,7 @@ func TestServer_DeleteProject_Permission(t *testing.T) {
ctx: iamOwnerCtx,
prepare: func(request *project.DeleteProjectRequest) (time.Time, time.Time) {
creationDate := time.Now().UTC()
projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
return creationDate, time.Time{}
},
@@ -663,8 +663,8 @@ func assertDeleteProjectResponse(t *testing.T, creationDate, deletionDate time.T
}
func TestServer_DeactivateProject(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -710,7 +710,7 @@ func TestServer_DeactivateProject(t *testing.T) {
{
name: "change, ok",
prepare: func(request *project.DeactivateProjectRequest) {
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
},
args: args{
@@ -744,8 +744,8 @@ func TestServer_DeactivateProject(t *testing.T) {
}
func TestServer_DeactivateProject_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -765,7 +765,7 @@ func TestServer_DeactivateProject_Permission(t *testing.T) {
{
name: "unauthenticated",
prepare: func(request *project.DeactivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
},
args: args{
@@ -777,11 +777,11 @@ func TestServer_DeactivateProject_Permission(t *testing.T) {
{
name: "missing permission",
prepare: func(request *project.DeactivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.DeactivateProjectRequest{},
},
wantErr: true,
@@ -789,11 +789,11 @@ func TestServer_DeactivateProject_Permission(t *testing.T) {
{
name: "organization owner, other org",
prepare: func(request *project.DeactivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.DeactivateProjectRequest{},
},
wantErr: true,
@@ -801,11 +801,11 @@ func TestServer_DeactivateProject_Permission(t *testing.T) {
{
name: "organization owner",
prepare: func(request *project.DeactivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.DeactivateProjectRequest{},
},
want: want{
@@ -816,7 +816,7 @@ func TestServer_DeactivateProject_Permission(t *testing.T) {
{
name: "instance owner",
prepare: func(request *project.DeactivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
},
args: args{
@@ -862,8 +862,8 @@ func assertDeactivateProjectResponse(t *testing.T, creationDate, changeDate time
}
func TestServer_ActivateProject(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -883,11 +883,11 @@ func TestServer_ActivateProject(t *testing.T) {
{
name: "missing permission",
prepare: func(request *project.ActivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.ActivateProjectRequest{},
},
wantErr: true,
@@ -920,7 +920,7 @@ func TestServer_ActivateProject(t *testing.T) {
{
name: "change, ok",
prepare: func(request *project.ActivateProjectRequest) {
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false).GetId()
projectID := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false).GetId()
request.Id = projectID
instance.DeactivateProject(iamOwnerCtx, t, projectID)
},
@@ -955,8 +955,8 @@ func TestServer_ActivateProject(t *testing.T) {
}
func TestServer_ActivateProject_Permission(t *testing.T) {
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
iamOwnerCtx := instance.WithAuthorizationToken(CTX, integration.UserTypeIAMOwner)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
type args struct {
ctx context.Context
@@ -976,7 +976,7 @@ func TestServer_ActivateProject_Permission(t *testing.T) {
{
name: "unauthenticated",
prepare: func(request *project.ActivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
instance.DeactivateProject(iamOwnerCtx, t, projectResp.GetId())
},
@@ -989,12 +989,12 @@ func TestServer_ActivateProject_Permission(t *testing.T) {
{
name: "missing permission",
prepare: func(request *project.ActivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
instance.DeactivateProject(iamOwnerCtx, t, projectResp.GetId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
req: &project.ActivateProjectRequest{},
},
wantErr: true,
@@ -1002,12 +1002,12 @@ func TestServer_ActivateProject_Permission(t *testing.T) {
{
name: "organization owner, other org",
prepare: func(request *project.ActivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
instance.DeactivateProject(iamOwnerCtx, t, projectResp.GetId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.ActivateProjectRequest{},
},
wantErr: true,
@@ -1015,12 +1015,12 @@ func TestServer_ActivateProject_Permission(t *testing.T) {
{
name: "organization owner",
prepare: func(request *project.ActivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
instance.DeactivateProject(iamOwnerCtx, t, projectResp.GetId())
},
args: args{
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
req: &project.ActivateProjectRequest{},
},
want: want{
@@ -1031,7 +1031,7 @@ func TestServer_ActivateProject_Permission(t *testing.T) {
{
name: "instance owner",
prepare: func(request *project.ActivateProjectRequest) {
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.Id = projectResp.GetId()
instance.DeactivateProject(iamOwnerCtx, t, projectResp.GetId())
},

68
internal/api/grpc/project/v2beta/integration_test/query_test.go
View File

@@ -51,7 +51,7 @@ func TestServer_GetProject(t *testing.T) {
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.GetProjectRequest, response *project.GetProjectResponse) {
name := gofakeit.AppName()
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false)
request.Id = resp.GetId()
@@ -213,7 +213,7 @@ func TestServer_ListProjects(t *testing.T) {
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) {
name := gofakeit.AppName()
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false)
request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{
InProjectIdsFilter: &filter.InIDsFilter{
@@ -352,7 +352,7 @@ func TestServer_ListProjects(t *testing.T) {
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) {
orgID := instance.DefaultOrg.GetId()
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
resp1 := createProject(iamOwnerCtx, instance, t, orgResp.GetOrganizationId(), false, false)
resp2 := createProject(iamOwnerCtx, instance, t, orgID, true, false)
resp3 := createProject(iamOwnerCtx, instance, t, orgResp.GetOrganizationId(), false, true)
@@ -384,7 +384,7 @@ func TestServer_ListProjects(t *testing.T) {
ctx: projectOwnerCtx,
dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) {
orgID := instance.DefaultOrg.GetId()
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
resp1 := createProject(iamOwnerCtx, instance, t, orgResp.GetOrganizationId(), false, false)
resp2 := createProject(iamOwnerCtx, instance, t, orgID, true, false)
resp3 := createProject(iamOwnerCtx, instance, t, orgResp.GetOrganizationId(), false, true)
@@ -633,7 +633,7 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) {
args: args{
ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) {
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email())
resp := createProject(iamOwnerCtx, instancePermissionV2, t, orgResp.GetOrganizationId(), false, false)
request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{
InProjectIdsFilter: &filter.InIDsFilter{
@@ -851,7 +851,7 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) {
args: args{
ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.ListProjectsRequest, response *project.ListProjectsResponse) {
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email())
resp1 := createProject(iamOwnerCtx, instancePermissionV2, t, orgResp.GetOrganizationId(), false, false)
resp2 := createProject(iamOwnerCtx, instancePermissionV2, t, orgID, true, false)
resp3 := createProject(iamOwnerCtx, instancePermissionV2, t, orgResp.GetOrganizationId(), false, true)
@@ -950,7 +950,7 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) {
}
func createProject(ctx context.Context, instance *integration.Instance, t *testing.T, orgID string, projectRoleCheck, hasProjectCheck bool) *project.Project {
name := gofakeit.AppName()
name := integration.ProjectName()
resp := instance.CreateProject(ctx, t, orgID, name, projectRoleCheck, hasProjectCheck)
return &project.Project{
Id: resp.GetId(),
@@ -967,7 +967,7 @@ func createProject(ctx context.Context, instance *integration.Instance, t *testi
}
func createGrantedProject(ctx context.Context, instance *integration.Instance, t *testing.T, projectToGrant *project.Project) *project.Project {
grantedOrgName := gofakeit.AppName()
grantedOrgName := integration.OrganizationName()
grantedOrg := instance.CreateOrganization(ctx, grantedOrgName, gofakeit.Email())
projectGrantResp := instance.CreateProjectGrant(ctx, t, projectToGrant.GetId(), grantedOrg.GetOrganizationId())
@@ -1018,13 +1018,13 @@ func TestServer_ListProjectGrants(t *testing.T) {
args: args{
ctx: CTX,
dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{
InProjectIdsFilter: &filter.InIDsFilter{
Ids: []string{projectResp.GetId()},
},
}
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{
ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()},
}
@@ -1042,13 +1042,13 @@ func TestServer_ListProjectGrants(t *testing.T) {
args: args{
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{
InProjectIdsFilter: &filter.InIDsFilter{
Ids: []string{projectResp.GetId()},
},
}
grantedOrg := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{
ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()},
}
@@ -1119,7 +1119,7 @@ func TestServer_ListProjectGrants(t *testing.T) {
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) {
name := gofakeit.AppName()
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false)
request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{
InProjectIdsFilter: &filter.InIDsFilter{
@@ -1182,7 +1182,7 @@ func TestServer_ListProjectGrants(t *testing.T) {
name2 := gofakeit.AppName()
name3 := gofakeit.AppName()
orgID := instance.DefaultOrg.GetId()
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
project1Resp := instance.CreateProject(iamOwnerCtx, t, orgID, name1, false, false)
project2Resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name2, false, false)
project3Resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name3, false, false)
@@ -1219,7 +1219,7 @@ func TestServer_ListProjectGrants(t *testing.T) {
name2 := gofakeit.AppName()
name3 := gofakeit.AppName()
orgID := instance.DefaultOrg.GetId()
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
project1Resp := instance.CreateProject(iamOwnerCtx, t, orgID, name1, false, false)
project2Resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name2, false, false)
project3Resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name3, false, false)
@@ -1360,13 +1360,13 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) {
args: args{
ctx: CTX,
dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) {
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{
InProjectIdsFilter: &filter.InIDsFilter{
Ids: []string{projectResp.GetId()},
},
}
grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email())
request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{
ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()},
}
@@ -1384,13 +1384,13 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) {
args: args{
ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) {
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{
InProjectIdsFilter: &filter.InIDsFilter{
Ids: []string{projectResp.GetId()},
},
}
grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
grantedOrg := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email())
request.Filters[1].Filter = &project.ProjectGrantSearchFilter_ProjectGrantResourceOwnerFilter{
ProjectGrantResourceOwnerFilter: &filter.IDFilter{Id: grantedOrg.GetOrganizationId()},
}
@@ -1439,7 +1439,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) {
ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.ListProjectGrantsRequest, response *project.ListProjectGrantsResponse) {
name := gofakeit.AppName()
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email())
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name, false, false)
request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{
InProjectIdsFilter: &filter.InIDsFilter{
@@ -1502,7 +1502,7 @@ func TestServer_ListProjectGrants_PermissionV2(t *testing.T) {
name2 := gofakeit.AppName()
name3 := gofakeit.AppName()
orgID := instancePermissionV2.DefaultOrg.GetId()
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email())
project1Resp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, name1, false, false)
project2Resp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name2, false, false)
project3Resp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name3, false, false)
@@ -1594,7 +1594,7 @@ func TestServer_ListProjectRoles(t *testing.T) {
args: args{
ctx: CTX,
dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
addProjectRole(iamOwnerCtx, instance, t, projectResp.GetId())
@@ -1610,7 +1610,7 @@ func TestServer_ListProjectRoles(t *testing.T) {
args: args{
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) {
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
addProjectRole(iamOwnerCtx, instance, t, projectResp.GetId())
@@ -1641,8 +1641,8 @@ func TestServer_ListProjectRoles(t *testing.T) {
args: args{
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) {
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
orgResp := instance.CreateOrganization(iamOwnerCtx, integration.OrganizationName(), gofakeit.Email())
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
addProjectRole(iamOwnerCtx, instance, t, projectResp.GetId())
@@ -1663,7 +1663,7 @@ func TestServer_ListProjectRoles(t *testing.T) {
ctx: instance.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) {
orgID := instance.DefaultOrg.GetId()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
response.ProjectRoles[0] = addProjectRole(iamOwnerCtx, instance, t, projectResp.GetId())
@@ -1686,7 +1686,7 @@ func TestServer_ListProjectRoles(t *testing.T) {
ctx: iamOwnerCtx,
dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) {
orgID := instance.DefaultOrg.GetId()
projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, gofakeit.AppName(), false, false)
projectResp := instance.CreateProject(iamOwnerCtx, t, orgID, integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
response.ProjectRoles[2] = addProjectRole(iamOwnerCtx, instance, t, projectResp.GetId())
@@ -1753,7 +1753,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) {
args: args{
ctx: CTX,
dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) {
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
addProjectRole(iamOwnerCtx, instancePermissionV2, t, projectResp.GetId())
@@ -1769,7 +1769,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) {
args: args{
ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeNoPermission),
dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) {
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, instancePermissionV2.DefaultOrg.GetId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
addProjectRole(iamOwnerCtx, instancePermissionV2, t, projectResp.GetId())
@@ -1800,8 +1800,8 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) {
args: args{
ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) {
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
orgResp := instancePermissionV2.CreateOrganization(iamOwnerCtx, integration.ProjectName(), gofakeit.Email())
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
addProjectRole(iamOwnerCtx, instancePermissionV2, t, projectResp.GetId())
@@ -1822,7 +1822,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) {
ctx: instancePermissionV2.WithAuthorizationToken(CTX, integration.UserTypeOrgOwner),
dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) {
orgID := instancePermissionV2.DefaultOrg.GetId()
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, gofakeit.AppName(), false, false)
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
response.ProjectRoles[0] = addProjectRole(iamOwnerCtx, instancePermissionV2, t, projectResp.GetId())
@@ -1845,7 +1845,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) {
ctx: iamOwnerCtx,
dep: func(request *project.ListProjectRolesRequest, response *project.ListProjectRolesResponse) {
orgID := instancePermissionV2.DefaultOrg.GetId()
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, gofakeit.AppName(), false, false)
projectResp := instancePermissionV2.CreateProject(iamOwnerCtx, t, orgID, integration.ProjectName(), false, false)
request.ProjectId = projectResp.GetId()
response.ProjectRoles[2] = addProjectRole(iamOwnerCtx, instancePermissionV2, t, projectResp.GetId())
@@ -1893,7 +1893,7 @@ func TestServer_ListProjectRoles_PermissionV2(t *testing.T) {
}
func addProjectRole(ctx context.Context, instance *integration.Instance, t *testing.T, projectID string) *project.ProjectRole {
name := gofakeit.Animal()
name := integration.RoleKey()
projectRoleResp := instance.AddProjectRole(ctx, t, projectID, name, name, name)
return &project.ProjectRole{