Skip to content

Adds space_guid, organization_guid as parameter to the list events #890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arghya88 wants to merge 1 commit into from
Closed

Adds space_guid, organization_guid as parameter to the list events #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/events/_ListEventsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,20 @@ abstract class _ListEventsRequest extends PaginatedRequest {
@Nullable
abstract List<String> getActees();

/**
* The organization id
*/
@FilterParameter("organization_guid")
@Nullable
abstract List<String> getOrganizationId();

/**
* The space id
*/
@FilterParameter("space_guid")
@Nullable
abstract List<String> getSpaceId();

/**
* The timestamps
*/
Expand Down
36 changes: 36 additions & 0 deletions integration-test/src/test/java/org/cloudfoundry/client/v2/EventsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,42 @@ public void listFilterByType() {
.verify(Duration.ofMinutes(5));
}

@Test
public void listFilterByOrganizationId(){
getFirstEvent(this.cloudFoundryClient)
.flatMap(resource -> Mono.zip(
Mono.just(resource),
this.cloudFoundryClient.events()
.list(ListEventsRequest.builder()
.spaceId(ResourceUtils.getEntity(resource).getOrganizationId())
.build())
.flatMapMany(ResourceUtils::getResources)
.next()
))
.as(StepVerifier::create)
.consumeNextWith(tupleEquality())
.expectComplete()
.verify(Duration.ofMinutes(5));
}

@Test
public void listFilterBySpaceId() {
getFirstEvent(this.cloudFoundryClient)
.flatMap(resource -> Mono.zip(
Mono.just(resource),
this.cloudFoundryClient.events()
.list(ListEventsRequest.builder()
.spaceId(ResourceUtils.getEntity(resource).getSpaceId())
.build())
.flatMapMany(ResourceUtils::getResources)
.next()
))
.as(StepVerifier::create)
.consumeNextWith(tupleEquality())
.expectComplete()
.verify(Duration.ofMinutes(5));
}

private static Mono<EventResource> getFirstEvent(CloudFoundryClient cloudFoundryClient) {
return listEvents(cloudFoundryClient)
.next();
Expand Down