Skip to content

Commit 647b3b5

Browse files
authored
fix: correct id filter for project service (zitadel#10035)
# Which Problems Are Solved IDs filter definition was changed in another PR and not changed in the Project service. # How the Problems Are Solved Correctly use the IDs filter. # Additional Changes Add timeout to the integration tests. # Additional Context None
1 parent 6c309d6 commit 647b3b5

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

internal/api/grpc/project/v2beta/integration/query_test.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,7 @@ func TestServer_ListProjects(t *testing.T) {
389389
resp2 := createProject(iamOwnerCtx, instance, t, orgID, true, false)
390390
resp3 := createProject(iamOwnerCtx, instance, t, orgResp.GetOrganizationId(), false, true)
391391
request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{
392-
InProjectIdsFilter: &project.InProjectIDsFilter{
393-
ProjectIds: []string{resp1.GetId(), resp2.GetId(), resp3.GetId(), projectResp.GetId()},
394-
},
392+
InProjectIdsFilter: &filter.InIDsFilter{Ids: []string{resp1.GetId(), resp2.GetId(), resp3.GetId(), projectResp.GetId()}},
395393
}
396394
response.Projects[0] = grantedProjectResp
397395
response.Projects[1] = projectResp
@@ -516,7 +514,7 @@ func TestServer_ListProjects(t *testing.T) {
516514
projectResp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), projectName, true, true)
517515
projectGrantResp := instance.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgID)
518516
request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{
519-
InProjectIdsFilter: &project.InProjectIDsFilter{ProjectIds: []string{projectResp.GetId()}},
517+
InProjectIdsFilter: &filter.InIDsFilter{Ids: []string{projectResp.GetId()}},
520518
}
521519
response.Projects[0] = &project.Project{
522520
Id: projectResp.GetId(),
@@ -892,7 +890,7 @@ func TestServer_ListProjects_PermissionV2(t *testing.T) {
892890
// projectGrantResp :=
893891
instancePermissionV2.CreateProjectGrant(iamOwnerCtx, t, projectResp.GetId(), orgID)
894892
request.Filters[0].Filter = &project.ProjectSearchFilter_InProjectIdsFilter{
895-
InProjectIdsFilter: &project.InProjectIDsFilter{ProjectIds: []string{projectResp.GetId()}},
893+
InProjectIdsFilter: &filter.InIDsFilter{Ids: []string{projectResp.GetId()}},
896894
}
897895
/*
898896
response.Projects[0] = &project.Project{
@@ -1227,9 +1225,7 @@ func TestServer_ListProjectGrants(t *testing.T) {
12271225
project2Resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name2, false, false)
12281226
project3Resp := instance.CreateProject(iamOwnerCtx, t, orgResp.GetOrganizationId(), name3, false, false)
12291227
request.Filters[0].Filter = &project.ProjectGrantSearchFilter_InProjectIdsFilter{
1230-
InProjectIdsFilter: &project.InProjectIDsFilter{
1231-
ProjectIds: []string{project1Resp.GetId(), project2Resp.GetId(), project3Resp.GetId(), projectResp.GetId()},
1232-
},
1228+
InProjectIdsFilter: &filter.InIDsFilter{Ids: []string{project1Resp.GetId(), project2Resp.GetId(), project3Resp.GetId(), projectResp.GetId()}},
12331229
}
12341230

12351231
createProjectGrant(iamOwnerCtx, instance, t, orgID, project1Resp.GetId(), name1)

internal/integration/client.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"google.golang.org/grpc/metadata"
1717
"google.golang.org/protobuf/types/known/durationpb"
1818
"google.golang.org/protobuf/types/known/structpb"
19+
"google.golang.org/protobuf/types/known/timestamppb"
1920

2021
"github.com/zitadel/zitadel/internal/domain"
2122
"github.com/zitadel/zitadel/internal/integration/scim"
@@ -271,7 +272,8 @@ func (i *Instance) CreateUserTypeMachine(ctx context.Context) *user_v2.CreateUse
271272

272273
func (i *Instance) CreatePersonalAccessToken(ctx context.Context, userID string) *user_v2.AddPersonalAccessTokenResponse {
273274
resp, err := i.Client.UserV2.AddPersonalAccessToken(ctx, &user_v2.AddPersonalAccessTokenRequest{
274-
UserId: userID,
275+
UserId: userID,
276+
ExpirationDate: timestamppb.New(time.Now().Add(30 * time.Minute)),
275277
})
276278
logging.OnError(err).Panic("create pat")
277279
return resp

0 commit comments

Comments
 (0)