mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-16 14:48:37 +00:00

# Which Problems Are Solved Resource management of projects and sub-resources was before limited by the context provided by the management API, which would mean you could only manage resources belonging to a specific organization. # How the Problems Are Solved With the addition of a resource-based API, it is now possible to manage projects and sub-resources on the basis of the resources themselves, which means that as long as you have the permission for the resource, you can create, read, update and delete it. - CreateProject to create a project under an organization - UpdateProject to update an existing project - DeleteProject to delete an existing project - DeactivateProject and ActivateProject to change the status of a project - GetProject to query for a specific project with an identifier - ListProject to query for projects and granted projects - CreateProjectGrant to create a project grant with project and granted organization - UpdateProjectGrant to update the roles of a project grant - DeactivateProjectGrant and ActivateProjectGrant to change the status of a project grant - DeleteProjectGrant to delete an existing project grant - ListProjectGrants to query for project grants - AddProjectRole to add a role to an existing project - UpdateProjectRole to change texts of an existing role - RemoveProjectRole to remove an existing role - ListProjectRoles to query for project roles # Additional Changes - Changes to ListProjects, which now contains granted projects as well - Changes to messages as defined in the [API_DESIGN](https://github.com/zitadel/zitadel/blob/main/API_DESIGN.md) - Permission checks for project functionality on query and command side - Added testing to unit tests on command side - Change update endpoints to no error returns if nothing changes in the resource - Changed all integration test utility to the new service - ListProjects now also correctly lists `granted projects` - Permission checks for project grant and project role functionality on query and command side - Change existing pre checks so that they also work resource specific without resourceowner - Added the resourceowner to the grant and role if no resourceowner is provided - Corrected import tests with project grants and roles - Added testing to unit tests on command side - Change update endpoints to no error returns if nothing changes in the resource - Changed all integration test utility to the new service - Corrected some naming in the proto files to adhere to the API_DESIGN # Additional Context Closes #9177 --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
699 lines
22 KiB
Go
699 lines
22 KiB
Go
//go:build integration
|
|
|
|
package project_test
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/brianvoe/gofakeit/v6"
|
|
"github.com/muhlemmer/gu"
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
"github.com/zitadel/zitadel/internal/integration"
|
|
project "github.com/zitadel/zitadel/pkg/grpc/project/v2beta"
|
|
)
|
|
|
|
func TestServer_AddProjectRole(t *testing.T) {
|
|
iamOwnerCtx := instance.WithAuthorization(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()
|
|
instance.AddProjectRole(iamOwnerCtx, t, alreadyExistingProject.GetId(), alreadyExistingProjectRoleName, alreadyExistingProjectRoleName, "")
|
|
|
|
type want struct {
|
|
creationDate bool
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
ctx context.Context
|
|
prepare func(request *project.AddProjectRoleRequest)
|
|
req *project.AddProjectRoleRequest
|
|
want
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "empty key",
|
|
ctx: iamOwnerCtx,
|
|
prepare: func(request *project.AddProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
request.ProjectId = projectResp.GetId()
|
|
},
|
|
req: &project.AddProjectRoleRequest{
|
|
RoleKey: "",
|
|
DisplayName: gofakeit.AppName(),
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "empty displayname",
|
|
ctx: iamOwnerCtx,
|
|
prepare: func(request *project.AddProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
request.ProjectId = projectResp.GetId()
|
|
},
|
|
req: &project.AddProjectRoleRequest{
|
|
RoleKey: gofakeit.AppName(),
|
|
DisplayName: "",
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "already existing, error",
|
|
ctx: iamOwnerCtx,
|
|
prepare: func(request *project.AddProjectRoleRequest) {
|
|
request.ProjectId = alreadyExistingProject.GetId()
|
|
},
|
|
req: &project.AddProjectRoleRequest{
|
|
RoleKey: alreadyExistingProjectRoleName,
|
|
DisplayName: alreadyExistingProjectRoleName,
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "empty, ok",
|
|
ctx: iamOwnerCtx,
|
|
prepare: func(request *project.AddProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
request.ProjectId = projectResp.GetId()
|
|
},
|
|
req: &project.AddProjectRoleRequest{
|
|
RoleKey: gofakeit.Name(),
|
|
DisplayName: gofakeit.Name(),
|
|
},
|
|
want: want{
|
|
creationDate: true,
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if tt.prepare != nil {
|
|
tt.prepare(tt.req)
|
|
}
|
|
|
|
creationDate := time.Now().UTC()
|
|
got, err := instance.Client.Projectv2Beta.AddProjectRole(tt.ctx, tt.req)
|
|
changeDate := time.Now().UTC()
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
return
|
|
}
|
|
assert.NoError(t, err)
|
|
assertAddProjectRoleResponse(t, creationDate, changeDate, tt.want.creationDate, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestServer_AddProjectRole_Permission(t *testing.T) {
|
|
iamOwnerCtx := instance.WithAuthorization(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()
|
|
instance.AddProjectRole(iamOwnerCtx, t, alreadyExistingProject.GetId(), alreadyExistingProjectRoleName, alreadyExistingProjectRoleName, "")
|
|
|
|
type want struct {
|
|
creationDate bool
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
ctx context.Context
|
|
prepare func(request *project.AddProjectRoleRequest)
|
|
req *project.AddProjectRoleRequest
|
|
want
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "unauthenticated",
|
|
ctx: CTX,
|
|
prepare: func(request *project.AddProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
request.ProjectId = projectResp.GetId()
|
|
},
|
|
req: &project.AddProjectRoleRequest{
|
|
RoleKey: gofakeit.AppName(),
|
|
DisplayName: gofakeit.AppName(),
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "no permission",
|
|
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
|
|
prepare: func(request *project.AddProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
request.ProjectId = projectResp.GetId()
|
|
},
|
|
req: &project.AddProjectRoleRequest{
|
|
RoleKey: gofakeit.AppName(),
|
|
DisplayName: gofakeit.AppName(),
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "organization owner, other org",
|
|
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
|
|
prepare: func(request *project.AddProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
request.ProjectId = projectResp.GetId()
|
|
},
|
|
req: &project.AddProjectRoleRequest{
|
|
RoleKey: gofakeit.AppName(),
|
|
DisplayName: gofakeit.AppName(),
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "organization owner, ok",
|
|
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
|
|
prepare: func(request *project.AddProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
|
|
request.ProjectId = projectResp.GetId()
|
|
},
|
|
req: &project.AddProjectRoleRequest{
|
|
RoleKey: gofakeit.AppName(),
|
|
DisplayName: gofakeit.AppName(),
|
|
},
|
|
want: want{
|
|
creationDate: true,
|
|
},
|
|
},
|
|
{
|
|
name: "instance owner, ok",
|
|
ctx: iamOwnerCtx,
|
|
prepare: func(request *project.AddProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
request.ProjectId = projectResp.GetId()
|
|
},
|
|
req: &project.AddProjectRoleRequest{
|
|
RoleKey: gofakeit.AppName(),
|
|
DisplayName: gofakeit.AppName(),
|
|
},
|
|
want: want{
|
|
creationDate: true,
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if tt.prepare != nil {
|
|
tt.prepare(tt.req)
|
|
}
|
|
|
|
creationDate := time.Now().UTC()
|
|
got, err := instance.Client.Projectv2Beta.AddProjectRole(tt.ctx, tt.req)
|
|
changeDate := time.Now().UTC()
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
return
|
|
}
|
|
assert.NoError(t, err)
|
|
assertAddProjectRoleResponse(t, creationDate, changeDate, tt.want.creationDate, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func assertAddProjectRoleResponse(t *testing.T, creationDate, changeDate time.Time, expectedCreationDate bool, actualResp *project.AddProjectRoleResponse) {
|
|
if expectedCreationDate {
|
|
if !changeDate.IsZero() {
|
|
assert.WithinRange(t, actualResp.GetCreationDate().AsTime(), creationDate, changeDate)
|
|
} else {
|
|
assert.WithinRange(t, actualResp.GetCreationDate().AsTime(), creationDate, time.Now().UTC())
|
|
}
|
|
} else {
|
|
assert.Nil(t, actualResp.CreationDate)
|
|
}
|
|
}
|
|
|
|
func TestServer_UpdateProjectRole(t *testing.T) {
|
|
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
|
|
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
|
|
|
|
type args struct {
|
|
ctx context.Context
|
|
req *project.UpdateProjectRoleRequest
|
|
}
|
|
type want struct {
|
|
change bool
|
|
changeDate bool
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
prepare func(request *project.UpdateProjectRoleRequest)
|
|
args args
|
|
want want
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "missing permission",
|
|
prepare: func(request *project.UpdateProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
roleName := gofakeit.AppName()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
},
|
|
args: args{
|
|
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
|
|
req: &project.UpdateProjectRoleRequest{
|
|
DisplayName: gu.Ptr("changed"),
|
|
},
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "not existing",
|
|
prepare: func(request *project.UpdateProjectRoleRequest) {
|
|
request.RoleKey = "notexisting"
|
|
return
|
|
},
|
|
args: args{
|
|
ctx: iamOwnerCtx,
|
|
req: &project.UpdateProjectRoleRequest{
|
|
DisplayName: gu.Ptr("changed"),
|
|
},
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "no change, ok",
|
|
prepare: func(request *project.UpdateProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
roleName := gofakeit.AppName()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
request.DisplayName = gu.Ptr(roleName)
|
|
},
|
|
args: args{
|
|
ctx: iamOwnerCtx,
|
|
req: &project.UpdateProjectRoleRequest{},
|
|
},
|
|
want: want{
|
|
change: false,
|
|
changeDate: true,
|
|
},
|
|
},
|
|
{
|
|
name: "change display name, ok",
|
|
prepare: func(request *project.UpdateProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
roleName := gofakeit.AppName()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
},
|
|
args: args{
|
|
ctx: iamOwnerCtx,
|
|
req: &project.UpdateProjectRoleRequest{
|
|
DisplayName: gu.Ptr(gofakeit.AppName()),
|
|
},
|
|
},
|
|
want: want{
|
|
change: true,
|
|
changeDate: true,
|
|
},
|
|
},
|
|
{
|
|
name: "change full, ok",
|
|
prepare: func(request *project.UpdateProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
roleName := gofakeit.AppName()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
},
|
|
args: args{
|
|
ctx: iamOwnerCtx,
|
|
req: &project.UpdateProjectRoleRequest{
|
|
DisplayName: gu.Ptr(gofakeit.AppName()),
|
|
Group: gu.Ptr(gofakeit.AppName()),
|
|
},
|
|
},
|
|
want: want{
|
|
change: true,
|
|
changeDate: true,
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
creationDate := time.Now().UTC()
|
|
tt.prepare(tt.args.req)
|
|
|
|
got, err := instance.Client.Projectv2Beta.UpdateProjectRole(tt.args.ctx, tt.args.req)
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
return
|
|
}
|
|
changeDate := time.Time{}
|
|
if tt.want.change {
|
|
changeDate = time.Now().UTC()
|
|
}
|
|
assert.NoError(t, err)
|
|
assertUpdateProjectRoleResponse(t, creationDate, changeDate, tt.want.changeDate, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestServer_UpdateProjectRole_Permission(t *testing.T) {
|
|
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
|
|
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
|
|
|
|
type args struct {
|
|
ctx context.Context
|
|
req *project.UpdateProjectRoleRequest
|
|
}
|
|
type want struct {
|
|
change bool
|
|
changeDate bool
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
prepare func(request *project.UpdateProjectRoleRequest)
|
|
args args
|
|
want want
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "unauthenicated",
|
|
prepare: func(request *project.UpdateProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
roleName := gofakeit.AppName()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
},
|
|
args: args{
|
|
ctx: CTX,
|
|
req: &project.UpdateProjectRoleRequest{
|
|
DisplayName: gu.Ptr("changed"),
|
|
},
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "no permission",
|
|
prepare: func(request *project.UpdateProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
roleName := gofakeit.AppName()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
},
|
|
args: args{
|
|
ctx: instance.WithAuthorization(CTX, integration.UserTypeNoPermission),
|
|
req: &project.UpdateProjectRoleRequest{
|
|
DisplayName: gu.Ptr("changed"),
|
|
},
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "organization owner, other org",
|
|
prepare: func(request *project.UpdateProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
roleName := gofakeit.AppName()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
},
|
|
args: args{
|
|
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
|
|
req: &project.UpdateProjectRoleRequest{
|
|
DisplayName: gu.Ptr("changed"),
|
|
},
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "organization owner, ok",
|
|
prepare: func(request *project.UpdateProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, instance.DefaultOrg.GetId(), gofakeit.AppName(), false, false)
|
|
roleName := gofakeit.AppName()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
},
|
|
args: args{
|
|
ctx: instance.WithAuthorization(CTX, integration.UserTypeOrgOwner),
|
|
req: &project.UpdateProjectRoleRequest{
|
|
DisplayName: gu.Ptr(gofakeit.AppName()),
|
|
},
|
|
},
|
|
want: want{
|
|
change: true,
|
|
changeDate: true,
|
|
},
|
|
},
|
|
{
|
|
name: "instance owner, ok",
|
|
prepare: func(request *project.UpdateProjectRoleRequest) {
|
|
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), gofakeit.AppName(), false, false)
|
|
roleName := gofakeit.AppName()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
},
|
|
args: args{
|
|
ctx: iamOwnerCtx,
|
|
req: &project.UpdateProjectRoleRequest{
|
|
DisplayName: gu.Ptr(gofakeit.AppName()),
|
|
},
|
|
},
|
|
want: want{
|
|
change: true,
|
|
changeDate: true,
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
creationDate := time.Now().UTC()
|
|
tt.prepare(tt.args.req)
|
|
|
|
got, err := instance.Client.Projectv2Beta.UpdateProjectRole(tt.args.ctx, tt.args.req)
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
return
|
|
}
|
|
changeDate := time.Time{}
|
|
if tt.want.change {
|
|
changeDate = time.Now().UTC()
|
|
}
|
|
assert.NoError(t, err)
|
|
assertUpdateProjectRoleResponse(t, creationDate, changeDate, tt.want.changeDate, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func assertUpdateProjectRoleResponse(t *testing.T, creationDate, changeDate time.Time, expectedChangeDate bool, actualResp *project.UpdateProjectRoleResponse) {
|
|
if expectedChangeDate {
|
|
if !changeDate.IsZero() {
|
|
assert.WithinRange(t, actualResp.GetChangeDate().AsTime(), creationDate, changeDate)
|
|
} else {
|
|
assert.WithinRange(t, actualResp.GetChangeDate().AsTime(), creationDate, time.Now().UTC())
|
|
}
|
|
} else {
|
|
assert.Nil(t, actualResp.ChangeDate)
|
|
}
|
|
}
|
|
|
|
func TestServer_DeleteProjectRole(t *testing.T) {
|
|
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
|
|
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
|
|
|
|
tests := []struct {
|
|
name string
|
|
ctx context.Context
|
|
prepare func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time)
|
|
req *project.RemoveProjectRoleRequest
|
|
wantDeletionDate bool
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "empty id",
|
|
ctx: iamOwnerCtx,
|
|
req: &project.RemoveProjectRoleRequest{
|
|
ProjectId: "",
|
|
RoleKey: "notexisting",
|
|
},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "delete, not existing",
|
|
ctx: iamOwnerCtx,
|
|
req: &project.RemoveProjectRoleRequest{
|
|
ProjectId: "notexisting",
|
|
RoleKey: "notexisting",
|
|
},
|
|
wantDeletionDate: false,
|
|
},
|
|
{
|
|
name: "delete",
|
|
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()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
return creationDate, time.Time{}
|
|
},
|
|
req: &project.RemoveProjectRoleRequest{},
|
|
wantDeletionDate: true,
|
|
},
|
|
{
|
|
name: "delete, already removed",
|
|
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()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
instance.RemoveProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName)
|
|
return creationDate, time.Now().UTC()
|
|
},
|
|
req: &project.RemoveProjectRoleRequest{},
|
|
wantDeletionDate: true,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
var creationDate, deletionDate time.Time
|
|
if tt.prepare != nil {
|
|
creationDate, deletionDate = tt.prepare(tt.req)
|
|
}
|
|
got, err := instance.Client.Projectv2Beta.RemoveProjectRole(tt.ctx, tt.req)
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
return
|
|
}
|
|
assert.NoError(t, err)
|
|
assertRemoveProjectRoleResponse(t, creationDate, deletionDate, tt.wantDeletionDate, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestServer_DeleteProjectRole_Permission(t *testing.T) {
|
|
iamOwnerCtx := instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
|
|
orgResp := instance.CreateOrganization(iamOwnerCtx, gofakeit.AppName(), gofakeit.Email())
|
|
|
|
tests := []struct {
|
|
name string
|
|
ctx context.Context
|
|
prepare func(request *project.RemoveProjectRoleRequest) (time.Time, time.Time)
|
|
req *project.RemoveProjectRoleRequest
|
|
wantDeletionDate bool
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "unauthenticated",
|
|
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()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
return creationDate, time.Time{}
|
|
},
|
|
req: &project.RemoveProjectRoleRequest{},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "no permission",
|
|
ctx: instance.WithAuthorization(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()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
return creationDate, time.Time{}
|
|
},
|
|
req: &project.RemoveProjectRoleRequest{},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "organization owner, other org",
|
|
ctx: instance.WithAuthorization(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()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
return creationDate, time.Time{}
|
|
},
|
|
req: &project.RemoveProjectRoleRequest{},
|
|
wantErr: true,
|
|
},
|
|
{
|
|
name: "organization owner, ok",
|
|
ctx: instance.WithAuthorization(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()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
return creationDate, time.Time{}
|
|
},
|
|
req: &project.RemoveProjectRoleRequest{},
|
|
wantDeletionDate: true,
|
|
},
|
|
{
|
|
name: "instance owner, ok",
|
|
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()
|
|
instance.AddProjectRole(iamOwnerCtx, t, projectResp.GetId(), roleName, roleName, "")
|
|
request.ProjectId = projectResp.GetId()
|
|
request.RoleKey = roleName
|
|
return creationDate, time.Time{}
|
|
},
|
|
req: &project.RemoveProjectRoleRequest{},
|
|
wantDeletionDate: true,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
var creationDate, deletionDate time.Time
|
|
if tt.prepare != nil {
|
|
creationDate, deletionDate = tt.prepare(tt.req)
|
|
}
|
|
got, err := instance.Client.Projectv2Beta.RemoveProjectRole(tt.ctx, tt.req)
|
|
if tt.wantErr {
|
|
assert.Error(t, err)
|
|
return
|
|
}
|
|
assert.NoError(t, err)
|
|
assertRemoveProjectRoleResponse(t, creationDate, deletionDate, tt.wantDeletionDate, got)
|
|
})
|
|
}
|
|
}
|
|
|
|
func assertRemoveProjectRoleResponse(t *testing.T, creationDate, deletionDate time.Time, expectedDeletionDate bool, actualResp *project.RemoveProjectRoleResponse) {
|
|
if expectedDeletionDate {
|
|
if !deletionDate.IsZero() {
|
|
assert.WithinRange(t, actualResp.GetRemovalDate().AsTime(), creationDate, deletionDate)
|
|
} else {
|
|
assert.WithinRange(t, actualResp.GetRemovalDate().AsTime(), creationDate, time.Now().UTC())
|
|
}
|
|
} else {
|
|
assert.Nil(t, actualResp.RemovalDate)
|
|
}
|
|
}
|