From fe74c457e981e47f7a88d8039306b55baa1c1522 Mon Sep 17 00:00:00 2001 From: Michal Banka Date: Tue, 23 Feb 2021 11:27:20 +0100 Subject: Add healthcheck controller Healthcheck is required by Helm chart liveness. Changes: - Healthcheck added - Minor updates in README - .gitreview formatting update - version update to 1.0.1 Change-Id: I4781ce0e896061ca8be52739f80ca02c294b8913 Signed-off-by: Michal Banka Issue-ID: DCAEGEN2-2574 --- .gitreview | 12 ++++---- Changelog.md | 3 ++ README.md | 3 +- pom.xml | 2 +- .../openapi/manager/controller/HealthCheck.java | 33 ++++++++++++++++++++++ version.properties | 2 +- 6 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 src/main/java/org/onap/ves/openapi/manager/controller/HealthCheck.java diff --git a/.gitreview b/.gitreview index 452f512..981bb94 100644 --- a/.gitreview +++ b/.gitreview @@ -1,7 +1,5 @@ - - [gerrit] - host=gerrit.onap.org - port=29418 - project=dcaegen2/platform/ves-openapi-manager - defaultbranch=master - \ No newline at end of file +[gerrit] +host=gerrit.onap.org +port=29418 +project=dcaegen2/platform/ves-openapi-manager +defaultbranch=master \ No newline at end of file diff --git a/Changelog.md b/Changelog.md index 1ca94ce..2dbb287 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,3 +10,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - [DCAEGEN2-2573](https://jira.onap.org/browse/DCAEGEN2-2573) - Update image building - [DCAEGEN2-2573](https://jira.onap.org/browse/DCAEGEN2-2573) - Add the suffix -SNAPSHOT to fix CI - [DCAEGEN2-2573](https://jira.onap.org/browse/DCAEGEN2-2573) - Fix groupId + +## [1.0.1] - 23/02/2021 + - [DCAEGEN2-2574](https://jira.onap.org/browse/DCAEGEN2-2574) - Add healthcheck controller diff --git a/README.md b/README.md index 07c64a2..52b60ad 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ matching the schemas which VES Collector contains. ``` make port-forwarding ``` + ## How to locally start ves-openapi-manager Currently, there are two common ways to run application, both described below. @@ -37,7 +38,7 @@ Currently, there are two common ways to run application, both described below. Right click on Main class, then Run or Debug button. ### Start as Docker container -Run: +Run (from other terminal than used for port-forwarding): ``` make all ``` diff --git a/pom.xml b/pom.xml index dc04068..1d36b2b 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.onap.dcaegen2.platform.ves-openapi-manager ves-openapi-manager - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT jar diff --git a/src/main/java/org/onap/ves/openapi/manager/controller/HealthCheck.java b/src/main/java/org/onap/ves/openapi/manager/controller/HealthCheck.java new file mode 100644 index 0000000..b8642d3 --- /dev/null +++ b/src/main/java/org/onap/ves/openapi/manager/controller/HealthCheck.java @@ -0,0 +1,33 @@ +/* + * ============LICENSE_START======================================================= + * VES-OPENAPI-MANAGER + * ================================================================================ + * Copyright (C) 2021 Nokia. All rights reserved. + * ================================================================================ + * 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 + * + * http://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. + * ============LICENSE_END========================================================= + */ + +package org.onap.ves.openapi.manager.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController("/") +public class HealthCheck { + + @GetMapping("/health") + public String isApplicationHealthy() { + return "Healthy!"; + } +} diff --git a/version.properties b/version.properties index 32acbf9..fdf525c 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=0 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT \ No newline at end of file -- cgit 1.2.3-korg