-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
5b36816
commit 5be5cf0
Showing
5 changed files
with
222 additions
and
18 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright The Cryostat Authors | ||
| * | ||
| * The Universal Permissive License (UPL), Version 1.0 | ||
| * | ||
| * Subject to the condition set forth below, permission is hereby granted to any | ||
| * person obtaining a copy of this software, associated documentation and/or data | ||
| * (collectively the "Software"), free of charge and under any and all copyright | ||
| * rights in the Software, and any and all patent rights owned or freely | ||
| * licensable by each licensor hereunder covering either (i) the unmodified | ||
| * Software as contributed to or provided by such licensor, or (ii) the Larger | ||
| * Works (as defined below), to deal in both | ||
| * | ||
| * (a) the Software, and | ||
| * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if | ||
| * one is included with the Software (each a "Larger Work" to which the Software | ||
| * is contributed by such licensors), | ||
| * | ||
| * without restriction, including without limitation the rights to copy, create | ||
| * derivative works of, display, perform, and distribute the Software and make, | ||
| * use, sell, offer for sale, import, export, have made, and have sold the | ||
| * Software and the Larger Work(s), and to sublicense the foregoing rights on | ||
| * either these or other terms. | ||
| * | ||
| * This license is subject to the following condition: | ||
| * The above copyright notice and either this complete permission notice or at | ||
| * a minimum a reference to the UPL must be included in all copies or | ||
| * substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
| package io.cryostat; | ||
|
|
||
| import java.io.BufferedReader; | ||
| import java.io.InputStreamReader; | ||
| import java.nio.charset.StandardCharsets; | ||
|
|
||
| import io.cryostat.core.log.Logger; | ||
|
|
||
| public class ApplicationVersion { | ||
|
|
||
| private volatile String version; | ||
| private final Logger logger; | ||
|
|
||
| ApplicationVersion(Logger logger) { | ||
| this.logger = logger; | ||
| } | ||
|
|
||
| public synchronized String getVersionString() { | ||
| if (version == null) { | ||
| try (BufferedReader br = | ||
| new BufferedReader( | ||
| new InputStreamReader( | ||
| getClass().getResourceAsStream("/io/cryostat/version"), | ||
| StandardCharsets.UTF_8))) { | ||
| version = | ||
| br.lines() | ||
| .findFirst() | ||
| .orElseThrow( | ||
| () -> | ||
| new IllegalStateException( | ||
| "Resource file /io/cryostat/version is empty")) | ||
| .trim(); | ||
| } catch (Exception e) { | ||
| logger.error(e); | ||
| version = "unknown"; | ||
| } | ||
| } | ||
| return version; | ||
| } | ||
| } |
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
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,81 @@ | ||
| /* | ||
| * Copyright The Cryostat Authors | ||
| * | ||
| * The Universal Permissive License (UPL), Version 1.0 | ||
| * | ||
| * Subject to the condition set forth below, permission is hereby granted to any | ||
| * person obtaining a copy of this software, associated documentation and/or data | ||
| * (collectively the "Software"), free of charge and under any and all copyright | ||
| * rights in the Software, and any and all patent rights owned or freely | ||
| * licensable by each licensor hereunder covering either (i) the unmodified | ||
| * Software as contributed to or provided by such licensor, or (ii) the Larger | ||
| * Works (as defined below), to deal in both | ||
| * | ||
| * (a) the Software, and | ||
| * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if | ||
| * one is included with the Software (each a "Larger Work" to which the Software | ||
| * is contributed by such licensors), | ||
| * | ||
| * without restriction, including without limitation the rights to copy, create | ||
| * derivative works of, display, perform, and distribute the Software and make, | ||
| * use, sell, offer for sale, import, export, have made, and have sold the | ||
| * Software and the Larger Work(s), and to sublicense the foregoing rights on | ||
| * either these or other terms. | ||
| * | ||
| * This license is subject to the following condition: | ||
| * The above copyright notice and either this complete permission notice or at | ||
| * a minimum a reference to the UPL must be included in all copies or | ||
| * substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
| package itest; | ||
|
|
||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import io.vertx.core.buffer.Buffer; | ||
| import io.vertx.core.json.JsonObject; | ||
| import io.vertx.ext.web.client.HttpRequest; | ||
| import itest.bases.StandardSelfTest; | ||
| import org.hamcrest.MatcherAssert; | ||
| import org.hamcrest.Matchers; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class HealthIT extends StandardSelfTest { | ||
|
|
||
| HttpRequest<Buffer> req; | ||
|
|
||
| @BeforeEach | ||
| void createRequest() { | ||
| req = webClient.get("/health"); | ||
| } | ||
|
|
||
| @Test | ||
| void shouldIncludeApplicationVersion() throws Exception { | ||
| CompletableFuture<JsonObject> future = new CompletableFuture<>(); | ||
| req.send( | ||
| ar -> { | ||
| if (ar.failed()) { | ||
| future.completeExceptionally(ar.cause()); | ||
| return; | ||
| } | ||
| future.complete(ar.result().bodyAsJsonObject()); | ||
| }); | ||
| JsonObject response = future.get(REQUEST_TIMEOUT_SECONDS, TimeUnit.SECONDS); | ||
|
|
||
| Assertions.assertTrue(response.containsKey("cryostatVersion")); | ||
| MatcherAssert.assertThat( | ||
| response.getString("cryostatVersion"), Matchers.not(Matchers.emptyOrNullString())); | ||
| MatcherAssert.assertThat( | ||
| response.getString("cryostatVersion"), Matchers.not(Matchers.equalTo("unknown"))); | ||
| } | ||
| } |