-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(2.3.x): Adding logging module using LogCacheClient (#1065)
* Adding logging module using LogCacheClient * Documenting logging starter
- Loading branch information
1 parent
a27a0fa
commit ca6f427
Showing
43 changed files
with
2,236 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...org/springframework/cloud/appbroker/acceptance/logging/BackingApplicationIdsProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Copyright 2016-2024 the original author or authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.appbroker.acceptance.logging; | ||
|
|
||
|
|
||
| import org.cloudfoundry.client.CloudFoundryClient; | ||
| import org.cloudfoundry.client.v3.applications.ApplicationResource; | ||
| import org.cloudfoundry.client.v3.applications.ListApplicationsRequest; | ||
| import org.cloudfoundry.operations.CloudFoundryOperations; | ||
| import org.cloudfoundry.operations.spaces.GetSpaceRequest; | ||
| import org.cloudfoundry.operations.spaces.SpaceDetail; | ||
| import reactor.core.publisher.Flux; | ||
|
|
||
| import org.springframework.cloud.appbroker.logging.ApplicationIdsProvider; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| class BackingApplicationIdsProvider implements ApplicationIdsProvider { | ||
|
|
||
| private final CloudFoundryClient cloudFoundryClient; | ||
|
|
||
| private final CloudFoundryOperations cloudFoundryOperations; | ||
|
|
||
| public BackingApplicationIdsProvider(CloudFoundryClient cloudFoundryClient, | ||
| CloudFoundryOperations cloudFoundryOperations) { | ||
| this.cloudFoundryClient = cloudFoundryClient; | ||
| this.cloudFoundryOperations = cloudFoundryOperations; | ||
| } | ||
|
|
||
| @Override | ||
| public Flux<String> getApplicationIds(String serviceInstanceId) { | ||
| return cloudFoundryOperations.spaces().get(GetSpaceRequest.builder().name(serviceInstanceId).build()) | ||
| .map(SpaceDetail::getId) | ||
| .flatMap(spaceId -> | ||
| cloudFoundryClient.applicationsV3() | ||
| .list(ListApplicationsRequest.builder().spaceIds(spaceId).build()) | ||
| ) | ||
| .flatMapMany( | ||
| listApplicationsResponse -> Flux.fromIterable(listApplicationsResponse.getResources()) | ||
| .map(ApplicationResource::getId)); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
...test/java/org/springframework/cloud/appbroker/acceptance/LoggingRecentAcceptanceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * Copyright 2002-2020 the original author or authors | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.appbroker.acceptance; | ||
|
|
||
| import java.time.Duration; | ||
| import java.util.List; | ||
|
|
||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| class LoggingRecentAcceptanceTest extends CloudFoundryAcceptanceTest { | ||
|
|
||
| private static final String APP_CREATE_1 = "app-logging-recent-1"; | ||
|
|
||
| private static final String SI_NAME = "si-logging-recent"; | ||
|
|
||
| private static final String SUFFIX = "logging-recent-instance"; | ||
|
|
||
| private static final String APP_SERVICE_NAME = "app-service-" + SUFFIX; | ||
|
|
||
| private static final String BACKING_SERVICE_NAME = "backing-service-" + SUFFIX; | ||
|
|
||
| @Override | ||
| protected String testSuffix() { | ||
| return SUFFIX; | ||
| } | ||
|
|
||
| @Override | ||
| protected String appServiceName() { | ||
| return APP_SERVICE_NAME; | ||
| } | ||
|
|
||
| @Override | ||
| protected String backingServiceName() { | ||
| return BACKING_SERVICE_NAME; | ||
| } | ||
|
|
||
| @Test | ||
| @AppBrokerTestProperties({ | ||
| "spring.cloud.appbroker.services[0].service-name=" + APP_SERVICE_NAME, | ||
| "spring.cloud.appbroker.services[0].plan-name=" + PLAN_NAME, | ||
| "spring.cloud.appbroker.services[0].apps[0].name=" + APP_CREATE_1, | ||
| "spring.cloud.appbroker.services[0].apps[0].path=" + BACKING_APP_PATH, | ||
| "spring.cloud.appbroker.services[0].target.name=SpacePerServiceInstance", | ||
| "spring.cloud.appbroker.deployer.cloudfoundry.properties.stack=cflinuxfs4" | ||
| }) | ||
| void shouldReturnBackingApplicationLogs() { | ||
| createServiceInstance(SI_NAME); | ||
|
|
||
| String lines = callCLICommand( | ||
| List.of("cf", "service-logs", SI_NAME, "--recent", "--skip-ssl-validation")) | ||
| .block(Duration.ofSeconds(35)); | ||
|
|
||
| assertThat(lines).isNotEmpty(); | ||
|
|
||
| assertThat(lines).contains("Created app with guid"); | ||
| assertThat(lines).contains("Updated app with guid"); | ||
| assertThat(lines).contains("APP/PROC/WEB"); | ||
| } | ||
|
|
||
| @AfterEach | ||
| void tearDown() { | ||
| deleteServiceInstance(SI_NAME); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.