From 3700dd0cf91db2b9b182e3e940831cf22dc61bca Mon Sep 17 00:00:00 2001 From: Yann Tavernier Date: Fri, 10 Feb 2023 07:19:35 +0100 Subject: [PATCH 01/19] fix(api): send head before writing response for /monitor --- .../node/monitoring/monitor/NodeMonitorManagementEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravitee-node-monitoring/src/main/java/io/gravitee/node/monitoring/monitor/NodeMonitorManagementEndpoint.java b/gravitee-node-monitoring/src/main/java/io/gravitee/node/monitoring/monitor/NodeMonitorManagementEndpoint.java index 1c144d7e4..ed7368239 100644 --- a/gravitee-node-monitoring/src/main/java/io/gravitee/node/monitoring/monitor/NodeMonitorManagementEndpoint.java +++ b/gravitee-node-monitoring/src/main/java/io/gravitee/node/monitoring/monitor/NodeMonitorManagementEndpoint.java @@ -70,8 +70,8 @@ public void handle(RoutingContext context) { response.putHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON); response.setChunked(true); - response.write(mapper.writeValueAsString(root)); response.setStatusCode(HttpStatusCode.OK_200); + response.write(mapper.writeValueAsString(root)); } catch (JsonProcessingException e) { LOGGER.error("Unexpected error while generating monitoring", e); response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR_500); From 2873ef00bc0d538c78805e0ec39faa98c922f464 Mon Sep 17 00:00:00 2001 From: "Gravitee.io Bot" Date: Fri, 10 Feb 2023 06:48:34 +0000 Subject: [PATCH 02/19] chore(release): 1.24.4 [skip ci] --- CHANGELOG.md | 7 +++++++ gravitee-node-api/pom.xml | 2 +- gravitee-node-cache/pom.xml | 2 +- gravitee-node-certificates/pom.xml | 2 +- gravitee-node-cluster/pom.xml | 2 +- gravitee-node-container/pom.xml | 2 +- gravitee-node-jetty/pom.xml | 2 +- gravitee-node-kubernetes/pom.xml | 2 +- gravitee-node-license/pom.xml | 2 +- gravitee-node-management/pom.xml | 2 +- gravitee-node-monitoring/pom.xml | 2 +- gravitee-node-notifier/pom.xml | 2 +- .../gravitee-node-plugins-service/pom.xml | 2 +- gravitee-node-plugins/pom.xml | 2 +- gravitee-node-reporter/pom.xml | 2 +- gravitee-node-tracing/pom.xml | 2 +- gravitee-node-vertx/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b221e254..f9106a12a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.24.4](https://github.com/gravitee-io/gravitee-node/compare/1.24.3...1.24.4) (2023-02-10) + + +### Bug Fixes + +* **api:** send head before writing response for /monitor ([3700dd0](https://github.com/gravitee-io/gravitee-node/commit/3700dd0cf91db2b9b182e3e940831cf22dc61bca)) + ## [1.24.3](https://github.com/gravitee-io/gravitee-node/compare/1.24.2...1.24.3) (2022-08-01) diff --git a/gravitee-node-api/pom.xml b/gravitee-node-api/pom.xml index 9fa1d52a0..b429d6a01 100644 --- a/gravitee-node-api/pom.xml +++ b/gravitee-node-api/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-api diff --git a/gravitee-node-cache/pom.xml b/gravitee-node-cache/pom.xml index 86c7db535..59aa0fa87 100644 --- a/gravitee-node-cache/pom.xml +++ b/gravitee-node-cache/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-cache diff --git a/gravitee-node-certificates/pom.xml b/gravitee-node-certificates/pom.xml index 0faf28a70..154c3e7de 100644 --- a/gravitee-node-certificates/pom.xml +++ b/gravitee-node-certificates/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-certificates diff --git a/gravitee-node-cluster/pom.xml b/gravitee-node-cluster/pom.xml index a2a0a9d84..49641b095 100644 --- a/gravitee-node-cluster/pom.xml +++ b/gravitee-node-cluster/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-cluster diff --git a/gravitee-node-container/pom.xml b/gravitee-node-container/pom.xml index f573c10a4..bb84d7997 100644 --- a/gravitee-node-container/pom.xml +++ b/gravitee-node-container/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-container diff --git a/gravitee-node-jetty/pom.xml b/gravitee-node-jetty/pom.xml index b3647eee2..dc1825d6b 100644 --- a/gravitee-node-jetty/pom.xml +++ b/gravitee-node-jetty/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-jetty diff --git a/gravitee-node-kubernetes/pom.xml b/gravitee-node-kubernetes/pom.xml index aa36dfc8f..7b5f3c717 100644 --- a/gravitee-node-kubernetes/pom.xml +++ b/gravitee-node-kubernetes/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-kubernetes diff --git a/gravitee-node-license/pom.xml b/gravitee-node-license/pom.xml index 7a923bbc4..f5aeeed35 100644 --- a/gravitee-node-license/pom.xml +++ b/gravitee-node-license/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-license diff --git a/gravitee-node-management/pom.xml b/gravitee-node-management/pom.xml index 2544f52bb..966d9d0ea 100644 --- a/gravitee-node-management/pom.xml +++ b/gravitee-node-management/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-management diff --git a/gravitee-node-monitoring/pom.xml b/gravitee-node-monitoring/pom.xml index 8ffbe3237..361dd8c7a 100644 --- a/gravitee-node-monitoring/pom.xml +++ b/gravitee-node-monitoring/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-monitoring diff --git a/gravitee-node-notifier/pom.xml b/gravitee-node-notifier/pom.xml index 93fbf0917..d5d7bcb66 100644 --- a/gravitee-node-notifier/pom.xml +++ b/gravitee-node-notifier/pom.xml @@ -22,7 +22,7 @@ gravitee-node io.gravitee.node - 1.24.3 + 1.24.4 4.0.0 diff --git a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml index 1f921eab8..19e879326 100644 --- a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml +++ b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node-plugins - 1.24.3 + 1.24.4 gravitee-node-plugins-service diff --git a/gravitee-node-plugins/pom.xml b/gravitee-node-plugins/pom.xml index 2648ea4e4..0508be80b 100644 --- a/gravitee-node-plugins/pom.xml +++ b/gravitee-node-plugins/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-plugins diff --git a/gravitee-node-reporter/pom.xml b/gravitee-node-reporter/pom.xml index 8520fdd32..92d827678 100644 --- a/gravitee-node-reporter/pom.xml +++ b/gravitee-node-reporter/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-reporter diff --git a/gravitee-node-tracing/pom.xml b/gravitee-node-tracing/pom.xml index 8ac3a593d..63f6d3f1b 100644 --- a/gravitee-node-tracing/pom.xml +++ b/gravitee-node-tracing/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-tracing diff --git a/gravitee-node-vertx/pom.xml b/gravitee-node-vertx/pom.xml index f9fee0ac3..657d6b1c2 100644 --- a/gravitee-node-vertx/pom.xml +++ b/gravitee-node-vertx/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 gravitee-node-vertx diff --git a/pom.xml b/pom.xml index 82c12df6d..44238d6da 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.gravitee.node gravitee-node - 1.24.3 + 1.24.4 Gravitee.io - Node From 08d02ead134ee9a318ccbd58d8465d40378dbf76 Mon Sep 17 00:00:00 2001 From: Yann Tavernier Date: Fri, 10 Feb 2023 07:54:21 +0100 Subject: [PATCH 03/19] fix(api): send head before writing response for /monitor --- .../node/monitoring/monitor/NodeMonitorManagementEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravitee-node-monitoring/src/main/java/io/gravitee/node/monitoring/monitor/NodeMonitorManagementEndpoint.java b/gravitee-node-monitoring/src/main/java/io/gravitee/node/monitoring/monitor/NodeMonitorManagementEndpoint.java index 1c144d7e4..ed7368239 100644 --- a/gravitee-node-monitoring/src/main/java/io/gravitee/node/monitoring/monitor/NodeMonitorManagementEndpoint.java +++ b/gravitee-node-monitoring/src/main/java/io/gravitee/node/monitoring/monitor/NodeMonitorManagementEndpoint.java @@ -70,8 +70,8 @@ public void handle(RoutingContext context) { response.putHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON); response.setChunked(true); - response.write(mapper.writeValueAsString(root)); response.setStatusCode(HttpStatusCode.OK_200); + response.write(mapper.writeValueAsString(root)); } catch (JsonProcessingException e) { LOGGER.error("Unexpected error while generating monitoring", e); response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR_500); From b58af580befbafdb5fd5c52c6f8fee0770aa8d1d Mon Sep 17 00:00:00 2001 From: "Gravitee.io Bot" Date: Fri, 10 Feb 2023 07:51:21 +0000 Subject: [PATCH 04/19] chore(release): 1.25.1 [skip ci] --- CHANGELOG.md | 7 +++++++ gravitee-node-api/pom.xml | 2 +- gravitee-node-cache/pom.xml | 2 +- gravitee-node-certificates/pom.xml | 2 +- gravitee-node-cluster/pom.xml | 2 +- gravitee-node-container/pom.xml | 2 +- gravitee-node-jetty/pom.xml | 2 +- gravitee-node-kubernetes/pom.xml | 2 +- gravitee-node-license/pom.xml | 2 +- gravitee-node-management/pom.xml | 2 +- gravitee-node-monitoring/pom.xml | 2 +- gravitee-node-notifier/pom.xml | 2 +- .../gravitee-node-plugins-service/pom.xml | 2 +- gravitee-node-plugins/pom.xml | 2 +- gravitee-node-reporter/pom.xml | 2 +- gravitee-node-tracing/pom.xml | 2 +- gravitee-node-vertx/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c32e6e50..0031af789 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.25.1](https://github.com/gravitee-io/gravitee-node/compare/1.25.0...1.25.1) (2023-02-10) + + +### Bug Fixes + +* **api:** send head before writing response for /monitor ([08d02ea](https://github.com/gravitee-io/gravitee-node/commit/08d02ead134ee9a318ccbd58d8465d40378dbf76)) + # [1.25.0](https://github.com/gravitee-io/gravitee-node/compare/1.24.3...1.25.0) (2022-08-03) diff --git a/gravitee-node-api/pom.xml b/gravitee-node-api/pom.xml index 5bb0084e7..993fe0dd4 100644 --- a/gravitee-node-api/pom.xml +++ b/gravitee-node-api/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-api diff --git a/gravitee-node-cache/pom.xml b/gravitee-node-cache/pom.xml index a98798230..a7960bd37 100644 --- a/gravitee-node-cache/pom.xml +++ b/gravitee-node-cache/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-cache diff --git a/gravitee-node-certificates/pom.xml b/gravitee-node-certificates/pom.xml index 8c8f622b4..fdc4ce0e1 100644 --- a/gravitee-node-certificates/pom.xml +++ b/gravitee-node-certificates/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-certificates diff --git a/gravitee-node-cluster/pom.xml b/gravitee-node-cluster/pom.xml index 025f3d49e..0bd64fa79 100644 --- a/gravitee-node-cluster/pom.xml +++ b/gravitee-node-cluster/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-cluster diff --git a/gravitee-node-container/pom.xml b/gravitee-node-container/pom.xml index 2f66a39de..95301df46 100644 --- a/gravitee-node-container/pom.xml +++ b/gravitee-node-container/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-container diff --git a/gravitee-node-jetty/pom.xml b/gravitee-node-jetty/pom.xml index 52d1add66..71baeb0ce 100644 --- a/gravitee-node-jetty/pom.xml +++ b/gravitee-node-jetty/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-jetty diff --git a/gravitee-node-kubernetes/pom.xml b/gravitee-node-kubernetes/pom.xml index 8e78c2cc6..38aea0bba 100644 --- a/gravitee-node-kubernetes/pom.xml +++ b/gravitee-node-kubernetes/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-kubernetes diff --git a/gravitee-node-license/pom.xml b/gravitee-node-license/pom.xml index 1b1e3ef0c..33554ddc1 100644 --- a/gravitee-node-license/pom.xml +++ b/gravitee-node-license/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-license diff --git a/gravitee-node-management/pom.xml b/gravitee-node-management/pom.xml index 1a6c3a0e4..0347413ab 100644 --- a/gravitee-node-management/pom.xml +++ b/gravitee-node-management/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-management diff --git a/gravitee-node-monitoring/pom.xml b/gravitee-node-monitoring/pom.xml index 843100765..672cb1b2a 100644 --- a/gravitee-node-monitoring/pom.xml +++ b/gravitee-node-monitoring/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-monitoring diff --git a/gravitee-node-notifier/pom.xml b/gravitee-node-notifier/pom.xml index f6311c04d..520858557 100644 --- a/gravitee-node-notifier/pom.xml +++ b/gravitee-node-notifier/pom.xml @@ -22,7 +22,7 @@ gravitee-node io.gravitee.node - 1.25.0 + 1.25.1 4.0.0 diff --git a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml index eb833e8be..615697a1e 100644 --- a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml +++ b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node-plugins - 1.25.0 + 1.25.1 gravitee-node-plugins-service diff --git a/gravitee-node-plugins/pom.xml b/gravitee-node-plugins/pom.xml index c496dbdb6..d47687a23 100644 --- a/gravitee-node-plugins/pom.xml +++ b/gravitee-node-plugins/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-plugins diff --git a/gravitee-node-reporter/pom.xml b/gravitee-node-reporter/pom.xml index c37b6c487..57f1a96f2 100644 --- a/gravitee-node-reporter/pom.xml +++ b/gravitee-node-reporter/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-reporter diff --git a/gravitee-node-tracing/pom.xml b/gravitee-node-tracing/pom.xml index 5d5ede1e4..abd468216 100644 --- a/gravitee-node-tracing/pom.xml +++ b/gravitee-node-tracing/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-tracing diff --git a/gravitee-node-vertx/pom.xml b/gravitee-node-vertx/pom.xml index b66f8c382..868add691 100644 --- a/gravitee-node-vertx/pom.xml +++ b/gravitee-node-vertx/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 gravitee-node-vertx diff --git a/pom.xml b/pom.xml index dfd2d7405..c932c2e44 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.gravitee.node gravitee-node - 1.25.0 + 1.25.1 Gravitee.io - Node From 563b0f8f62f278a52f9a355c9b7dd90b1e290465 Mon Sep 17 00:00:00 2001 From: Yann Tavernier Date: Thu, 16 Feb 2023 10:49:45 +0100 Subject: [PATCH 05/19] fix(api): load the right property source for /configuration --- .../http/configuration/ConfigurationEndpoint.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gravitee-node-management/src/main/java/io/gravitee/node/management/http/configuration/ConfigurationEndpoint.java b/gravitee-node-management/src/main/java/io/gravitee/node/management/http/configuration/ConfigurationEndpoint.java index ea42799dc..ca50b33a4 100644 --- a/gravitee-node-management/src/main/java/io/gravitee/node/management/http/configuration/ConfigurationEndpoint.java +++ b/gravitee-node-management/src/main/java/io/gravitee/node/management/http/configuration/ConfigurationEndpoint.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.AbstractEnvironment; -import org.springframework.core.env.PropertiesPropertySource; +import org.springframework.core.env.EnumerablePropertySource; /** * @author David BRASSELY (david.brassely at graviteesource.com) @@ -48,7 +48,7 @@ public class ConfigurationEndpoint implements ManagementEndpoint { private static final String ENDPOINT_PATH = "/configuration"; - private static final String PROPERTY_SOURCE_CONFIGURATION = "graviteeConfiguration"; + private static final String PROPERTY_SOURCE_CONFIGURATION = "graviteeYamlConfiguration"; @Autowired private AbstractEnvironment environment; @@ -71,7 +71,7 @@ public void handle(RoutingContext ctx) { response.setChunked(true); // Configuration is coming from gravitee.yml - PropertiesPropertySource nodeConfiguration = (PropertiesPropertySource) environment + EnumerablePropertySource nodeConfiguration = (EnumerablePropertySource) environment .getPropertySources() .get(PROPERTY_SOURCE_CONFIGURATION); From b9c98d245818458ae05c6f9645ad375368c092c4 Mon Sep 17 00:00:00 2001 From: "Gravitee.io Bot" Date: Thu, 16 Feb 2023 13:37:34 +0000 Subject: [PATCH 06/19] chore(release): 1.24.5 [skip ci] --- CHANGELOG.md | 7 +++++++ gravitee-node-api/pom.xml | 2 +- gravitee-node-cache/pom.xml | 2 +- gravitee-node-certificates/pom.xml | 2 +- gravitee-node-cluster/pom.xml | 2 +- gravitee-node-container/pom.xml | 2 +- gravitee-node-jetty/pom.xml | 2 +- gravitee-node-kubernetes/pom.xml | 2 +- gravitee-node-license/pom.xml | 2 +- gravitee-node-management/pom.xml | 2 +- gravitee-node-monitoring/pom.xml | 2 +- gravitee-node-notifier/pom.xml | 2 +- .../gravitee-node-plugins-service/pom.xml | 2 +- gravitee-node-plugins/pom.xml | 2 +- gravitee-node-reporter/pom.xml | 2 +- gravitee-node-tracing/pom.xml | 2 +- gravitee-node-vertx/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9106a12a..e0c961d34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.24.5](https://github.com/gravitee-io/gravitee-node/compare/1.24.4...1.24.5) (2023-02-16) + + +### Bug Fixes + +* **api:** load the right property source for /configuration ([563b0f8](https://github.com/gravitee-io/gravitee-node/commit/563b0f8f62f278a52f9a355c9b7dd90b1e290465)) + ## [1.24.4](https://github.com/gravitee-io/gravitee-node/compare/1.24.3...1.24.4) (2023-02-10) diff --git a/gravitee-node-api/pom.xml b/gravitee-node-api/pom.xml index b429d6a01..08666d965 100644 --- a/gravitee-node-api/pom.xml +++ b/gravitee-node-api/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-api diff --git a/gravitee-node-cache/pom.xml b/gravitee-node-cache/pom.xml index 59aa0fa87..4aa224cf3 100644 --- a/gravitee-node-cache/pom.xml +++ b/gravitee-node-cache/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-cache diff --git a/gravitee-node-certificates/pom.xml b/gravitee-node-certificates/pom.xml index 154c3e7de..9ee08021d 100644 --- a/gravitee-node-certificates/pom.xml +++ b/gravitee-node-certificates/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-certificates diff --git a/gravitee-node-cluster/pom.xml b/gravitee-node-cluster/pom.xml index 49641b095..a527b881a 100644 --- a/gravitee-node-cluster/pom.xml +++ b/gravitee-node-cluster/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-cluster diff --git a/gravitee-node-container/pom.xml b/gravitee-node-container/pom.xml index bb84d7997..ece911f6f 100644 --- a/gravitee-node-container/pom.xml +++ b/gravitee-node-container/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-container diff --git a/gravitee-node-jetty/pom.xml b/gravitee-node-jetty/pom.xml index dc1825d6b..0b02910ea 100644 --- a/gravitee-node-jetty/pom.xml +++ b/gravitee-node-jetty/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-jetty diff --git a/gravitee-node-kubernetes/pom.xml b/gravitee-node-kubernetes/pom.xml index 7b5f3c717..6c4e372d4 100644 --- a/gravitee-node-kubernetes/pom.xml +++ b/gravitee-node-kubernetes/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-kubernetes diff --git a/gravitee-node-license/pom.xml b/gravitee-node-license/pom.xml index f5aeeed35..ac48a0058 100644 --- a/gravitee-node-license/pom.xml +++ b/gravitee-node-license/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-license diff --git a/gravitee-node-management/pom.xml b/gravitee-node-management/pom.xml index 966d9d0ea..a371d349d 100644 --- a/gravitee-node-management/pom.xml +++ b/gravitee-node-management/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-management diff --git a/gravitee-node-monitoring/pom.xml b/gravitee-node-monitoring/pom.xml index 361dd8c7a..c4f5bf87b 100644 --- a/gravitee-node-monitoring/pom.xml +++ b/gravitee-node-monitoring/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-monitoring diff --git a/gravitee-node-notifier/pom.xml b/gravitee-node-notifier/pom.xml index d5d7bcb66..cfda6b19f 100644 --- a/gravitee-node-notifier/pom.xml +++ b/gravitee-node-notifier/pom.xml @@ -22,7 +22,7 @@ gravitee-node io.gravitee.node - 1.24.4 + 1.24.5 4.0.0 diff --git a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml index 19e879326..f81c86e28 100644 --- a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml +++ b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node-plugins - 1.24.4 + 1.24.5 gravitee-node-plugins-service diff --git a/gravitee-node-plugins/pom.xml b/gravitee-node-plugins/pom.xml index 0508be80b..88e9067a2 100644 --- a/gravitee-node-plugins/pom.xml +++ b/gravitee-node-plugins/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-plugins diff --git a/gravitee-node-reporter/pom.xml b/gravitee-node-reporter/pom.xml index 92d827678..8c6d0a9be 100644 --- a/gravitee-node-reporter/pom.xml +++ b/gravitee-node-reporter/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-reporter diff --git a/gravitee-node-tracing/pom.xml b/gravitee-node-tracing/pom.xml index 63f6d3f1b..adb479ac3 100644 --- a/gravitee-node-tracing/pom.xml +++ b/gravitee-node-tracing/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-tracing diff --git a/gravitee-node-vertx/pom.xml b/gravitee-node-vertx/pom.xml index 657d6b1c2..2e87b9d03 100644 --- a/gravitee-node-vertx/pom.xml +++ b/gravitee-node-vertx/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 gravitee-node-vertx diff --git a/pom.xml b/pom.xml index 44238d6da..09ad40ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.gravitee.node gravitee-node - 1.24.4 + 1.24.5 Gravitee.io - Node From f9580e26395fc4b92d72b81d7eb5c6f10e3fc784 Mon Sep 17 00:00:00 2001 From: Yann Tavernier Date: Thu, 16 Feb 2023 10:49:45 +0100 Subject: [PATCH 07/19] fix(api): load the right property source for /configuration --- .../http/configuration/ConfigurationEndpoint.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gravitee-node-management/src/main/java/io/gravitee/node/management/http/configuration/ConfigurationEndpoint.java b/gravitee-node-management/src/main/java/io/gravitee/node/management/http/configuration/ConfigurationEndpoint.java index ea42799dc..ca50b33a4 100644 --- a/gravitee-node-management/src/main/java/io/gravitee/node/management/http/configuration/ConfigurationEndpoint.java +++ b/gravitee-node-management/src/main/java/io/gravitee/node/management/http/configuration/ConfigurationEndpoint.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.AbstractEnvironment; -import org.springframework.core.env.PropertiesPropertySource; +import org.springframework.core.env.EnumerablePropertySource; /** * @author David BRASSELY (david.brassely at graviteesource.com) @@ -48,7 +48,7 @@ public class ConfigurationEndpoint implements ManagementEndpoint { private static final String ENDPOINT_PATH = "/configuration"; - private static final String PROPERTY_SOURCE_CONFIGURATION = "graviteeConfiguration"; + private static final String PROPERTY_SOURCE_CONFIGURATION = "graviteeYamlConfiguration"; @Autowired private AbstractEnvironment environment; @@ -71,7 +71,7 @@ public void handle(RoutingContext ctx) { response.setChunked(true); // Configuration is coming from gravitee.yml - PropertiesPropertySource nodeConfiguration = (PropertiesPropertySource) environment + EnumerablePropertySource nodeConfiguration = (EnumerablePropertySource) environment .getPropertySources() .get(PROPERTY_SOURCE_CONFIGURATION); From 9a1615db37bec993da4745f4b39e581f8980da57 Mon Sep 17 00:00:00 2001 From: "Gravitee.io Bot" Date: Thu, 16 Feb 2023 13:48:08 +0000 Subject: [PATCH 08/19] chore(release): 1.25.2 [skip ci] --- CHANGELOG.md | 7 +++++++ gravitee-node-api/pom.xml | 2 +- gravitee-node-cache/pom.xml | 2 +- gravitee-node-certificates/pom.xml | 2 +- gravitee-node-cluster/pom.xml | 2 +- gravitee-node-container/pom.xml | 2 +- gravitee-node-jetty/pom.xml | 2 +- gravitee-node-kubernetes/pom.xml | 2 +- gravitee-node-license/pom.xml | 2 +- gravitee-node-management/pom.xml | 2 +- gravitee-node-monitoring/pom.xml | 2 +- gravitee-node-notifier/pom.xml | 2 +- .../gravitee-node-plugins-service/pom.xml | 2 +- gravitee-node-plugins/pom.xml | 2 +- gravitee-node-reporter/pom.xml | 2 +- gravitee-node-tracing/pom.xml | 2 +- gravitee-node-vertx/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0031af789..fc3f6f534 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.25.2](https://github.com/gravitee-io/gravitee-node/compare/1.25.1...1.25.2) (2023-02-16) + + +### Bug Fixes + +* **api:** load the right property source for /configuration ([f9580e2](https://github.com/gravitee-io/gravitee-node/commit/f9580e26395fc4b92d72b81d7eb5c6f10e3fc784)) + ## [1.25.1](https://github.com/gravitee-io/gravitee-node/compare/1.25.0...1.25.1) (2023-02-10) diff --git a/gravitee-node-api/pom.xml b/gravitee-node-api/pom.xml index 993fe0dd4..ff9a68b84 100644 --- a/gravitee-node-api/pom.xml +++ b/gravitee-node-api/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-api diff --git a/gravitee-node-cache/pom.xml b/gravitee-node-cache/pom.xml index a7960bd37..74bc1e153 100644 --- a/gravitee-node-cache/pom.xml +++ b/gravitee-node-cache/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-cache diff --git a/gravitee-node-certificates/pom.xml b/gravitee-node-certificates/pom.xml index fdc4ce0e1..00bd51451 100644 --- a/gravitee-node-certificates/pom.xml +++ b/gravitee-node-certificates/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-certificates diff --git a/gravitee-node-cluster/pom.xml b/gravitee-node-cluster/pom.xml index 0bd64fa79..a17a3ac88 100644 --- a/gravitee-node-cluster/pom.xml +++ b/gravitee-node-cluster/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-cluster diff --git a/gravitee-node-container/pom.xml b/gravitee-node-container/pom.xml index 95301df46..6656c8442 100644 --- a/gravitee-node-container/pom.xml +++ b/gravitee-node-container/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-container diff --git a/gravitee-node-jetty/pom.xml b/gravitee-node-jetty/pom.xml index 71baeb0ce..ec52110b8 100644 --- a/gravitee-node-jetty/pom.xml +++ b/gravitee-node-jetty/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-jetty diff --git a/gravitee-node-kubernetes/pom.xml b/gravitee-node-kubernetes/pom.xml index 38aea0bba..705b93551 100644 --- a/gravitee-node-kubernetes/pom.xml +++ b/gravitee-node-kubernetes/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-kubernetes diff --git a/gravitee-node-license/pom.xml b/gravitee-node-license/pom.xml index 33554ddc1..d58f4a740 100644 --- a/gravitee-node-license/pom.xml +++ b/gravitee-node-license/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-license diff --git a/gravitee-node-management/pom.xml b/gravitee-node-management/pom.xml index 0347413ab..dff8560fb 100644 --- a/gravitee-node-management/pom.xml +++ b/gravitee-node-management/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-management diff --git a/gravitee-node-monitoring/pom.xml b/gravitee-node-monitoring/pom.xml index 672cb1b2a..cd9d79efa 100644 --- a/gravitee-node-monitoring/pom.xml +++ b/gravitee-node-monitoring/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-monitoring diff --git a/gravitee-node-notifier/pom.xml b/gravitee-node-notifier/pom.xml index 520858557..beec6840f 100644 --- a/gravitee-node-notifier/pom.xml +++ b/gravitee-node-notifier/pom.xml @@ -22,7 +22,7 @@ gravitee-node io.gravitee.node - 1.25.1 + 1.25.2 4.0.0 diff --git a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml index 615697a1e..c4512a814 100644 --- a/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml +++ b/gravitee-node-plugins/gravitee-node-plugins-service/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node-plugins - 1.25.1 + 1.25.2 gravitee-node-plugins-service diff --git a/gravitee-node-plugins/pom.xml b/gravitee-node-plugins/pom.xml index d47687a23..2554ca655 100644 --- a/gravitee-node-plugins/pom.xml +++ b/gravitee-node-plugins/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-plugins diff --git a/gravitee-node-reporter/pom.xml b/gravitee-node-reporter/pom.xml index 57f1a96f2..270a39928 100644 --- a/gravitee-node-reporter/pom.xml +++ b/gravitee-node-reporter/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-reporter diff --git a/gravitee-node-tracing/pom.xml b/gravitee-node-tracing/pom.xml index abd468216..159820b63 100644 --- a/gravitee-node-tracing/pom.xml +++ b/gravitee-node-tracing/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-tracing diff --git a/gravitee-node-vertx/pom.xml b/gravitee-node-vertx/pom.xml index 868add691..c80fab080 100644 --- a/gravitee-node-vertx/pom.xml +++ b/gravitee-node-vertx/pom.xml @@ -24,7 +24,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 gravitee-node-vertx diff --git a/pom.xml b/pom.xml index c932c2e44..1a2dde880 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ io.gravitee.node gravitee-node - 1.25.1 + 1.25.2 Gravitee.io - Node From fe829f9fcf9b80f2525925316553aa1db54737b7 Mon Sep 17 00:00:00 2001 From: Jeoffrey Haeyaert Date: Mon, 6 Mar 2023 19:00:27 +0100 Subject: [PATCH 09/19] fix: avoid spring loading issue with vertx and k8s client --- .../io/gravitee/node/vertx/VertxFactory.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/gravitee-node-vertx/src/main/java/io/gravitee/node/vertx/VertxFactory.java b/gravitee-node-vertx/src/main/java/io/gravitee/node/vertx/VertxFactory.java index 95b59e50f..ede1ab023 100644 --- a/gravitee-node-vertx/src/main/java/io/gravitee/node/vertx/VertxFactory.java +++ b/gravitee-node-vertx/src/main/java/io/gravitee/node/vertx/VertxFactory.java @@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.Environment; @@ -210,21 +211,22 @@ private void loadMetricLabels() { } private Map> readConfiguredLabelsByCategory(final String type) { - return Arrays - .stream(MetricsDomain.values()) - .map(MetricsDomain::toCategory) - .flatMap(category -> - EnvironmentUtils - .getPropertiesStartingWith((ConfigurableEnvironment) environment, "services.metrics." + type + "." + category) - .entrySet() - .stream() - ) - .collect( - Collectors.groupingBy( - e -> e.getKey().replaceAll("^services\\.metrics\\." + type + "\\." + "(.*)\\[\\d+]$", "$1"), - Collectors.mapping(e -> toLabel((String) e.getValue()), Collectors.>toCollection(HashSet::new)) - ) - ); + final Map> labelsByCategory = new HashMap<>(); + + for (MetricsDomain metricsDomain : MetricsDomain.values()) { + final String category = metricsDomain.toCategory(); + final Set