diff --git a/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml b/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml index 01ad62e03..63f30d4f9 100644 --- a/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml +++ b/core-blue-green-state-monitor-quarkus/aggregator-for-jacoco/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-SNAPSHOT + 4.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-blue-green-state-monitor-quarkus/deployment/pom.xml b/core-blue-green-state-monitor-quarkus/deployment/pom.xml index f32370da7..3cfa57b3a 100644 --- a/core-blue-green-state-monitor-quarkus/deployment/pom.xml +++ b/core-blue-green-state-monitor-quarkus/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-SNAPSHOT + 4.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-blue-green-state-monitor-quarkus/pom.xml b/core-blue-green-state-monitor-quarkus/pom.xml index 79d443828..8ccdd4731 100644 --- a/core-blue-green-state-monitor-quarkus/pom.xml +++ b/core-blue-green-state-monitor-quarkus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-SNAPSHOT + 4.0.0-rest-client-SNAPSHOT pom @@ -21,8 +21,8 @@ 21 UTF-8 3.33.1 - 10.0.0-SNAPSHOT - 2.1.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT ${project.basedir}/../aggregator-for-jacoco/target/jacoco-ut/jacoco.xml 3.5.5 diff --git a/core-blue-green-state-monitor-quarkus/runtime/pom.xml b/core-blue-green-state-monitor-quarkus/runtime/pom.xml index 5faf6a125..5b0c73480 100644 --- a/core-blue-green-state-monitor-quarkus/runtime/pom.xml +++ b/core-blue-green-state-monitor-quarkus/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus blue-green-state-monitor-java-quarkus-parent - 4.0.0-SNAPSHOT + 4.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml b/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml index ab12f2003..9d02414bf 100644 --- a/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml +++ b/core-blue-green-state-monitor/blue-green-state-monitor-java/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml b/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml index 57c00f8a0..418fb7c51 100644 --- a/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml +++ b/core-blue-green-state-monitor/blue-green-state-monitor-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT pom diff --git a/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml b/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml index 80ed945ab..e77263ca7 100644 --- a/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml +++ b/core-blue-green-state-monitor/blue-green-state-monitor-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT ../pom.xml @@ -15,7 +15,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-blue-green-state-monitor/pom.xml b/core-blue-green-state-monitor/pom.xml index fdbe0d62a..6ec37189b 100644 --- a/core-blue-green-state-monitor/pom.xml +++ b/core-blue-green-state-monitor/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud blue-green-state-monitor-java - 2.1.0-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT pom @@ -19,7 +19,7 @@ 21 21 UTF-8 - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ${project.basedir}/../blue-green-state-monitor-report-aggregate/target/site/jacoco-aggregate/jacoco.xml diff --git a/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml b/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml index b189b8ec4..1acc01e67 100644 --- a/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml +++ b/core-context-propagation-quarkus/bom/context-propagation-bom-internal/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-bom-aggregator - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml cloud-core-context-propagation-bom-internal @@ -15,7 +15,7 @@ pom - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT 3.5.3 @@ -25,7 +25,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml b/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml index 0e09c24ae..aa442f3f4 100644 --- a/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml +++ b/core-context-propagation-quarkus/bom/context-propagation-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-bom - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT Cloud-Core Context Propagation BOM pom diff --git a/core-context-propagation-quarkus/bom/pom.xml b/core-context-propagation-quarkus/bom/pom.xml index ba34f0fc2..b602022c6 100644 --- a/core-context-propagation-quarkus/bom/pom.xml +++ b/core-context-propagation-quarkus/bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/build-parent/pom.xml b/core-context-propagation-quarkus/build-parent/pom.xml index 92d45d688..5ec5aade1 100644 --- a/core-context-propagation-quarkus/build-parent/pom.xml +++ b/core-context-propagation-quarkus/build-parent/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/context-propagation/deployment/pom.xml b/core-context-propagation-quarkus/context-propagation/deployment/pom.xml index 0ca22b70a..8f2ee6565 100644 --- a/core-context-propagation-quarkus/context-propagation/deployment/pom.xml +++ b/core-context-propagation-quarkus/context-propagation/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus context-propagation-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/context-propagation/pom.xml b/core-context-propagation-quarkus/context-propagation/pom.xml index 9c7dd6913..bba2d9e5b 100644 --- a/core-context-propagation-quarkus/context-propagation/pom.xml +++ b/core-context-propagation-quarkus/context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-context-propagation-quarkus/context-propagation/runtime/pom.xml b/core-context-propagation-quarkus/context-propagation/runtime/pom.xml index 038f3d7ea..ba88d649e 100644 --- a/core-context-propagation-quarkus/context-propagation/runtime/pom.xml +++ b/core-context-propagation-quarkus/context-propagation/runtime/pom.xml @@ -5,7 +5,7 @@ context-propagation-parent com.netcracker.cloud.quarkus - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml b/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml index be432c7ea..ee866aab6 100644 --- a/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml +++ b/core-context-propagation-quarkus/framework-contexts/deployment/pom.xml @@ -4,7 +4,7 @@ framework-contexts-parent com.netcracker.cloud.quarkus - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/framework-contexts/pom.xml b/core-context-propagation-quarkus/framework-contexts/pom.xml index 929235c33..60ab756d0 100644 --- a/core-context-propagation-quarkus/framework-contexts/pom.xml +++ b/core-context-propagation-quarkus/framework-contexts/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml b/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml index 868b29e46..fc2b1e63d 100644 --- a/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml +++ b/core-context-propagation-quarkus/framework-contexts/runtime/pom.xml @@ -4,7 +4,7 @@ framework-contexts-parent com.netcracker.cloud.quarkus - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml b/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml index 15caa016e..21f5b5ab7 100644 --- a/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml +++ b/core-context-propagation-quarkus/integration-tests/context-propagation-reactive-test/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus integration-tests - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT context-propagation-reactive-test diff --git a/core-context-propagation-quarkus/integration-tests/pom.xml b/core-context-propagation-quarkus/integration-tests/pom.xml index 42bd7156a..7d2aa4d25 100644 --- a/core-context-propagation-quarkus/integration-tests/pom.xml +++ b/core-context-propagation-quarkus/integration-tests/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../build-parent/pom.xml integration-tests diff --git a/core-context-propagation-quarkus/pom.xml b/core-context-propagation-quarkus/pom.xml index 7972156b8..e046c2ba8 100644 --- a/core-context-propagation-quarkus/pom.xml +++ b/core-context-propagation-quarkus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.netcracker.cloud.quarkus - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT cloud-core-context-propagation Cloud-Core Context Propagation diff --git a/core-context-propagation-quarkus/report-aggregate/pom.xml b/core-context-propagation-quarkus/report-aggregate/pom.xml index 6f474eab9..cc617c5eb 100644 --- a/core-context-propagation-quarkus/report-aggregate/pom.xml +++ b/core-context-propagation-quarkus/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus cloud-core-context-propagation-build-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../build-parent/pom.xml pom diff --git a/core-context-propagation/api-tests/pom.xml b/core-context-propagation/api-tests/pom.xml index 27c33b289..53851f9ad 100644 --- a/core-context-propagation/api-tests/pom.xml +++ b/core-context-propagation/api-tests/pom.xml @@ -4,7 +4,7 @@ context-propagation com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml @@ -17,7 +17,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation/context-propagation-bom/pom.xml b/core-context-propagation/context-propagation-bom/pom.xml index 421ebc3ba..1c965f663 100644 --- a/core-context-propagation/context-propagation-bom/pom.xml +++ b/core-context-propagation/context-propagation-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud context-propagation-bom - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT pom diff --git a/core-context-propagation/context-propagation-core/pom.xml b/core-context-propagation/context-propagation-core/pom.xml index f0331b791..6ae9bde78 100644 --- a/core-context-propagation/context-propagation-core/pom.xml +++ b/core-context-propagation/context-propagation-core/pom.xml @@ -5,7 +5,7 @@ context-propagation com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml @@ -20,7 +20,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation/context-propagation-report-aggregate/pom.xml b/core-context-propagation/context-propagation-report-aggregate/pom.xml index ebd44dcc9..ee8df2ade 100644 --- a/core-context-propagation/context-propagation-report-aggregate/pom.xml +++ b/core-context-propagation/context-propagation-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud context-propagation - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT pom diff --git a/core-context-propagation/context-propagation-test-extensions/pom.xml b/core-context-propagation/context-propagation-test-extensions/pom.xml index 49868d3c0..43f7f587a 100644 --- a/core-context-propagation/context-propagation-test-extensions/pom.xml +++ b/core-context-propagation/context-propagation-test-extensions/pom.xml @@ -5,7 +5,7 @@ context-propagation com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation/framework-contexts/pom.xml b/core-context-propagation/framework-contexts/pom.xml index 23f609278..7cc7fa2ac 100644 --- a/core-context-propagation/framework-contexts/pom.xml +++ b/core-context-propagation/framework-contexts/pom.xml @@ -4,7 +4,7 @@ context-propagation com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml @@ -20,7 +20,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation/pom.xml b/core-context-propagation/pom.xml index 2de7d1905..3a29c2902 100644 --- a/core-context-propagation/pom.xml +++ b/core-context-propagation/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud context-propagation - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT pom diff --git a/core-context-propagation/sample-context-tests/pom.xml b/core-context-propagation/sample-context-tests/pom.xml index dab7415f7..8f3774abf 100644 --- a/core-context-propagation/sample-context-tests/pom.xml +++ b/core-context-propagation/sample-context-tests/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud sample-context-tests - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT @@ -19,7 +19,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml index 3694ec174..cfd7d7a1f 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-common/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml index 8d32f3923..1005ef9e3 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-kafka/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml index 1ad895b92..9e604ff3b 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-rabbit/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml index 4a77740b3..741e19dd6 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-resttemplate/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml b/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml index e8c0c61fa..713ab91a2 100644 --- a/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml +++ b/core-context-propagation/spring-context-aggregator/context-propagation-spring-webclient/pom.xml @@ -3,7 +3,7 @@ spring-context-aggregator com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-context-propagation/spring-context-aggregator/pom.xml b/core-context-propagation/spring-context-aggregator/pom.xml index 1aa6fe02b..a08753985 100644 --- a/core-context-propagation/spring-context-aggregator/pom.xml +++ b/core-context-propagation/spring-context-aggregator/pom.xml @@ -3,7 +3,7 @@ context-propagation com.netcracker.cloud - 8.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 @@ -22,7 +22,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-error-handling/core-error-handling-report-aggregate/pom.xml b/core-error-handling/core-error-handling-report-aggregate/pom.xml index 9254447e2..8872da6cd 100644 --- a/core-error-handling/core-error-handling-report-aggregate/pom.xml +++ b/core-error-handling/core-error-handling-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud core-error-handling - 4.2.0-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT pom diff --git a/core-error-handling/core-error-handling-rest/pom.xml b/core-error-handling/core-error-handling-rest/pom.xml index 0fb8a88c5..50c799d2b 100644 --- a/core-error-handling/core-error-handling-rest/pom.xml +++ b/core-error-handling/core-error-handling-rest/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud core-error-handling - 4.2.0-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-error-handling/core-error-handling-runtime/pom.xml b/core-error-handling/core-error-handling-runtime/pom.xml index ef9af5412..34642f89a 100644 --- a/core-error-handling/core-error-handling-runtime/pom.xml +++ b/core-error-handling/core-error-handling-runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-error-handling - 4.2.0-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-error-handling/pom.xml b/core-error-handling/pom.xml index 8962dd1a6..c542e723c 100644 --- a/core-error-handling/pom.xml +++ b/core-error-handling/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-error-handling pom - 4.2.0-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT @@ -42,7 +42,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-internal-boms/core-internal-bom/pom.xml b/core-internal-boms/core-internal-bom/pom.xml index e4cc3ffd3..7b45f3267 100644 --- a/core-internal-boms/core-internal-bom/pom.xml +++ b/core-internal-boms/core-internal-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom Internal BOM for pure-Java modules: common 3rd-party dependency versions for use inside the monorepo diff --git a/core-internal-boms/core-quarkus-internal-bom/pom.xml b/core-internal-boms/core-quarkus-internal-bom/pom.xml index 24369f24d..75e4a69b2 100644 --- a/core-internal-boms/core-quarkus-internal-bom/pom.xml +++ b/core-internal-boms/core-quarkus-internal-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom @@ -18,7 +18,7 @@ 3.33.1 - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT diff --git a/core-internal-boms/core-spring-internal-bom/pom.xml b/core-internal-boms/core-spring-internal-bom/pom.xml index b2a7be05b..74afaba12 100644 --- a/core-internal-boms/core-spring-internal-bom/pom.xml +++ b/core-internal-boms/core-spring-internal-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom @@ -20,7 +20,7 @@ 4.0.5 2025.1.1 3.0.3 - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT diff --git a/core-internal-boms/pom.xml b/core-internal-boms/pom.xml index 8b71201b4..5b5479322 100644 --- a/core-internal-boms/pom.xml +++ b/core-internal-boms/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud core-internal-boms - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom diff --git a/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml b/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml index e1f7459c4..52d9b354b 100644 --- a/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml +++ b/core-junit-k8s-extension/cloud-core-extension-bom/pom.xml @@ -3,7 +3,7 @@ cloud-core-parent com.netcracker.cloud.junit.cloudcore - 8.9.0-SNAPSHOT + 8.9.0-rest-client-SNAPSHOT 4.0.0 pom diff --git a/core-junit-k8s-extension/cloud-core-extension/pom.xml b/core-junit-k8s-extension/cloud-core-extension/pom.xml index 292449026..8fe5ffa05 100644 --- a/core-junit-k8s-extension/cloud-core-extension/pom.xml +++ b/core-junit-k8s-extension/cloud-core-extension/pom.xml @@ -5,7 +5,7 @@ cloud-core-parent com.netcracker.cloud.junit.cloudcore - 8.9.0-SNAPSHOT + 8.9.0-rest-client-SNAPSHOT cloud-core-extension diff --git a/core-junit-k8s-extension/pom.xml b/core-junit-k8s-extension/pom.xml index 53bb02377..63faba122 100644 --- a/core-junit-k8s-extension/pom.xml +++ b/core-junit-k8s-extension/pom.xml @@ -3,7 +3,7 @@ pom com.netcracker.cloud.junit.cloudcore cloud-core-parent - 8.9.0-SNAPSHOT + 8.9.0-rest-client-SNAPSHOT @@ -38,7 +38,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-microservice-dependencies/cloud-core-java-bom/pom.xml b/core-microservice-dependencies/cloud-core-java-bom/pom.xml index 83561ccaa..6f98b4611 100644 --- a/core-microservice-dependencies/cloud-core-java-bom/pom.xml +++ b/core-microservice-dependencies/cloud-core-java-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud cloud-core-java-bom - 12.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT pom cloud-core-java-bom @@ -21,13 +21,13 @@ 1.16.4 21 - 8.1.0-SNAPSHOT - 7.2.0-SNAPSHOT - 9.1.0-SNAPSHOT - 7.1.0-SNAPSHOT - 8.2.0-SNAPSHOT - 12.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT diff --git a/core-microservice-dependencies/pom.xml b/core-microservice-dependencies/pom.xml index 04b500daa..88feaa322 100644 --- a/core-microservice-dependencies/pom.xml +++ b/core-microservice-dependencies/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud cloud-core-java-bom-parent - 12.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT pom diff --git a/core-microservice-framework-extensions/framework-extension-bom/pom.xml b/core-microservice-framework-extensions/framework-extension-bom/pom.xml index 50f30c663..c351d0c0a 100644 --- a/core-microservice-framework-extensions/framework-extension-bom/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-bom/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml b/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml index fc0f3966d..aec2aeaaf 100644 --- a/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-health-indicators/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extension-metrics/pom.xml b/core-microservice-framework-extensions/framework-extension-metrics/pom.xml index b32b4c9b7..e584152aa 100644 --- a/core-microservice-framework-extensions/framework-extension-metrics/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-metrics/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml b/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml index 334f9669d..fcba2fd0a 100644 --- a/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml +++ b/core-microservice-framework-extensions/framework-extension-springdoc-swagger/pom.xml @@ -3,7 +3,7 @@ framework-extensions-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../framework-extensions-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework-extensions/framework-extensions-parent/pom.xml b/core-microservice-framework-extensions/framework-extensions-parent/pom.xml index 2171c5677..01bf3fdf8 100644 --- a/core-microservice-framework-extensions/framework-extensions-parent/pom.xml +++ b/core-microservice-framework-extensions/framework-extensions-parent/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT framework-extensions-parent pom @@ -33,7 +33,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml b/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml index 5d9c35f3c..e4baf1317 100644 --- a/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml +++ b/core-microservice-framework-extensions/framework-extensions-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud framework-extensions-parent - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../framework-extensions-parent/pom.xml pom diff --git a/core-microservice-framework-extensions/pom.xml b/core-microservice-framework-extensions/pom.xml index 1aa8e5cc2..b448cc429 100644 --- a/core-microservice-framework-extensions/pom.xml +++ b/core-microservice-framework-extensions/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud framework-extensions-root - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT pom framework-extensions Common framework extensions library diff --git a/core-microservice-framework/microservice-framework-common/pom.xml b/core-microservice-framework/microservice-framework-common/pom.xml index 407a6a1c9..546206229 100644 --- a/core-microservice-framework/microservice-framework-common/pom.xml +++ b/core-microservice-framework/microservice-framework-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud microservice-framework-parent - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT ../microservice-framework-parent/pom.xml diff --git a/core-microservice-framework/microservice-framework-parent/pom.xml b/core-microservice-framework/microservice-framework-parent/pom.xml index d07cc1990..d37fbddd4 100644 --- a/core-microservice-framework/microservice-framework-parent/pom.xml +++ b/core-microservice-framework/microservice-framework-parent/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT microservice-framework-parent pom @@ -20,7 +20,7 @@ 3.15.0 3.7 0.8.14 - 12.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT ${project.basedir}/../microservice-framework-report-aggregate/target/site/jacoco-aggregate/jacoco.xml @@ -31,7 +31,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-microservice-framework/microservice-framework-report-aggregate/pom.xml b/core-microservice-framework/microservice-framework-report-aggregate/pom.xml index 0faa13c53..757288668 100644 --- a/core-microservice-framework/microservice-framework-report-aggregate/pom.xml +++ b/core-microservice-framework/microservice-framework-report-aggregate/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud microservice-framework-parent - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT ../microservice-framework-parent/pom.xml diff --git a/core-microservice-framework/microservice-framework-resttemplate/pom.xml b/core-microservice-framework/microservice-framework-resttemplate/pom.xml index 12a541211..b857340b4 100644 --- a/core-microservice-framework/microservice-framework-resttemplate/pom.xml +++ b/core-microservice-framework/microservice-framework-resttemplate/pom.xml @@ -3,7 +3,7 @@ microservice-framework-parent com.netcracker.cloud - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT ../microservice-framework-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnRestTemplate.java b/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnRestTemplate.java index 501c933e9..8fc33588f 100644 --- a/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnRestTemplate.java +++ b/core-microservice-framework/microservice-framework-resttemplate/src/test/java/com/netcracker/cloud/microserviceframework/application/TestApplicationOnRestTemplate.java @@ -7,8 +7,12 @@ import org.springframework.cloud.config.client.ConfigClientAutoConfiguration; import org.springframework.context.annotation.Configuration; +import com.netcracker.cloud.security.common.DummyM2MManagerConfiguration; +import org.springframework.context.annotation.Import; + @Configuration @EnableServiceDbaasPostgresql @EnableAutoConfiguration(exclude = {DataElasticsearchAutoConfiguration.class, ConfigClientAutoConfiguration.class}) +@Import(DummyM2MManagerConfiguration.class) public class TestApplicationOnRestTemplate extends BaseApplicationOnRestTemplate { } diff --git a/core-microservice-framework/microservice-framework-webclient/pom.xml b/core-microservice-framework/microservice-framework-webclient/pom.xml index 58bc026ed..b2cf045ce 100644 --- a/core-microservice-framework/microservice-framework-webclient/pom.xml +++ b/core-microservice-framework/microservice-framework-webclient/pom.xml @@ -3,7 +3,7 @@ microservice-framework-parent com.netcracker.cloud - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT ../microservice-framework-parent/pom.xml 4.0.0 diff --git a/core-microservice-framework/pom.xml b/core-microservice-framework/pom.xml index d92445ce0..bad33252a 100644 --- a/core-microservice-framework/pom.xml +++ b/core-microservice-framework/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud microservice-framework-aggregator - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT pom microservice-framework-aggregator Common microservice framework library diff --git a/core-mongo-evolution/mongo-evolution-java/pom.xml b/core-mongo-evolution/mongo-evolution-java/pom.xml index e4cc0ad3b..a3fcbac7a 100644 --- a/core-mongo-evolution/mongo-evolution-java/pom.xml +++ b/core-mongo-evolution/mongo-evolution-java/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud mongo-evolution - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT mongo-evolution-java Common mongo-evolution library which is free from any frameworks @@ -33,7 +33,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml b/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml index 6c052e75c..d5fe3a733 100644 --- a/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml +++ b/core-mongo-evolution/mongo-evolution-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud mongo-evolution-aggregator - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT pom diff --git a/core-mongo-evolution/mongo-evolution-spring/pom.xml b/core-mongo-evolution/mongo-evolution-spring/pom.xml index fe7e40369..91332f804 100644 --- a/core-mongo-evolution/mongo-evolution-spring/pom.xml +++ b/core-mongo-evolution/mongo-evolution-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud mongo-evolution-spring - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT mongo-evolution-spring mongo-evolution library which based on Spring Framework @@ -32,7 +32,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-mongo-evolution/pom.xml b/core-mongo-evolution/pom.xml index 652e19e1a..d284bc347 100644 --- a/core-mongo-evolution/pom.xml +++ b/core-mongo-evolution/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud mongo-evolution-aggregator - 8.1.0-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT pom diff --git a/core-process-orchestrator/pom.xml b/core-process-orchestrator/pom.xml index b4cc1fb9f..1968bb43a 100644 --- a/core-process-orchestrator/pom.xml +++ b/core-process-orchestrator/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.netcracker.core process-engine - 1.5.0-SNAPSHOT + 1.5.0-rest-client-SNAPSHOT Process Engine @@ -27,7 +27,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-quarkus-extensions/build-parent/pom.xml b/core-quarkus-extensions/build-parent/pom.xml index 3ad1a9de3..6ca37cc2e 100644 --- a/core-quarkus-extensions/build-parent/pom.xml +++ b/core-quarkus-extensions/build-parent/pom.xml @@ -5,7 +5,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml build-parent diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml index 8dba44196..c24fc0c07 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-internal/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus cloud-core-quarkus-bom-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../cloud-core-quarkus-bom-parent/pom.xml cloud-core-quarkus-bom-internal @@ -13,13 +13,13 @@ - 8.2.0-SNAPSHOT - - 9.1.0-SNAPSHOT - 3.1.0-SNAPSHOT - 7.2.0-SNAPSHOT - 12.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT + + 9.1.0-rest-client-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT 2.3.34 @@ -34,7 +34,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml index c2cf72236..6b0f39d90 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-parent/pom.xml @@ -5,13 +5,13 @@ cloud-core-quarkus-bom com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml cloud-core-quarkus-bom-parent pom - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml index 9ec33ce0e..1ea3b3089 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/cloud-core-quarkus-bom-publish/pom.xml @@ -6,7 +6,7 @@ com.netcracker.cloud.quarkus cloud-core-quarkus-bom-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../cloud-core-quarkus-bom-parent/pom.xml cloud-core-quarkus-bom-publish diff --git a/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml b/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml index fd30d03a9..f93a1f718 100644 --- a/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml +++ b/core-quarkus-extensions/cloud-core-quarkus-bom/pom.xml @@ -3,7 +3,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml b/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml index 3b079fd0d..384ea1f30 100644 --- a/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/common-config-source/common-config-source-deployment/pom.xml @@ -3,7 +3,7 @@ common-config-source com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-quarkus-extensions/config-sources/common-config-source/pom.xml b/core-quarkus-extensions/config-sources/common-config-source/pom.xml index e9cbb2376..9150dbc74 100644 --- a/core-quarkus-extensions/config-sources/common-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/common-config-source/pom.xml @@ -3,7 +3,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml b/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml index 33242dabe..64bf4e69f 100644 --- a/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus consul-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-client/pom.xml b/core-quarkus-extensions/config-sources/consul-client/pom.xml index 10cb16a72..01518212f 100644 --- a/core-quarkus-extensions/config-sources/consul-client/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/pom.xml @@ -5,7 +5,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml b/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml index 0fa4b731f..e2d87d35a 100644 --- a/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-client/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus consul-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml index 02130c975..ab2e6888b 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus consul-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/pom.xml index 4261ee3e7..a82d8a0ea 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/pom.xml @@ -4,7 +4,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml index cbc88d771..9ad2a1d86 100644 --- a/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/consul-config-source/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus consul-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/pom.xml b/core-quarkus-extensions/config-sources/pom.xml index 4162ae5d9..0fe15c0a2 100644 --- a/core-quarkus-extensions/config-sources/pom.xml +++ b/core-quarkus-extensions/config-sources/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml 4.0.0 diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml index 9079ee914..0796bf574 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus springcloud-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml index 713001ab7..a1cd2cdba 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/pom.xml @@ -4,7 +4,7 @@ config-sources com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml index db01951f3..bc220bc11 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus springcloud-config-source-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml @@ -58,7 +58,13 @@ com.squareup.okhttp3 okhttp - + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + + + org.mockito mockito-core diff --git a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java index 55802062b..e3c260562 100644 --- a/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java +++ b/core-quarkus-extensions/config-sources/springcloud-config-source/runtime/src/main/java/com/netcracker/cloud/springcloud/config/source/ConfigServerClientImpl.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; import com.netcracker.cloud.quarkus.security.auth.M2MManager; -import com.netcracker.cloud.security.core.auth.Token; import com.netcracker.cloud.security.core.utils.tls.TlsUtils; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import okhttp3.*; import org.apache.commons.lang3.exception.ExceptionUtils; import org.eclipse.microprofile.config.Config; @@ -36,7 +36,8 @@ public class ConfigServerClientImpl implements ConfigServerClient { private URL url; public ConfigServerClientImpl(String csUrl) throws MalformedURLException { - client = new OkHttpClient.Builder() + client = M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()) + .newBuilder() .connectionSpecs(Collections.singletonList( csUrl.startsWith("https") ? ConnectionSpec.COMPATIBLE_TLS : ConnectionSpec.CLEARTEXT) ) @@ -87,9 +88,7 @@ private String processRequest(Request request) throws IOException { int count = 1; while (true) { try { - Token token = M2MManager.getInstance().getToken(); request = request.newBuilder() - .addHeader("Authorization", token.getTokenType() + " " + token.getTokenValue()) .build(); Response response = client.newCall(request).execute(); return response.body().string(); diff --git a/core-quarkus-extensions/context/messaging-context/deployment/pom.xml b/core-quarkus-extensions/context/messaging-context/deployment/pom.xml index fded56ece..3c31bad77 100644 --- a/core-quarkus-extensions/context/messaging-context/deployment/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus messaging-context-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/pom.xml b/core-quarkus-extensions/context/messaging-context/pom.xml index 586a467a0..9e7fb19f0 100644 --- a/core-quarkus-extensions/context/messaging-context/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/pom.xml @@ -4,7 +4,7 @@ context-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/messaging-context/runtime/pom.xml b/core-quarkus-extensions/context/messaging-context/runtime/pom.xml index a94ecc80c..006af4cd4 100644 --- a/core-quarkus-extensions/context/messaging-context/runtime/pom.xml +++ b/core-quarkus-extensions/context/messaging-context/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus messaging-context-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/context/pom.xml b/core-quarkus-extensions/context/pom.xml index 87ef55e8f..da06f7944 100644 --- a/core-quarkus-extensions/context/pom.xml +++ b/core-quarkus-extensions/context/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml index f17c8f979..62f3781a2 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-cassandra-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml index 1197815d2..2aae955ce 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/pom.xml @@ -6,7 +6,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml index edf610006..7f7be76e4 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-cassandra-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-cassandra-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml index 12c4b9f48..a241faee9 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-client-test/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml index 884c071f1..9af2c3f28 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-common-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml index 2fb2ceceb..cd816337b 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml index 7fd6ee6d2..22b497602 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-common-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml @@ -63,6 +63,11 @@ com.netcracker.cloud.security.core.utils tls-utils + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + io.quarkus diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/DbaasClientProducer.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/DbaasClientProducer.java index efc805b3c..1d5da1be2 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/DbaasClientProducer.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/DbaasClientProducer.java @@ -12,14 +12,14 @@ public class DbaasClientProducer { @Produces @DefaultBean - public DbaasClient dbaaSClient(DbaasClientConfig dbaasClientConfig) { + public DbaasClient dbaaSClient(SecurityConfig securityConfig, DbaasClientConfig dbaasClientConfig) { if (dbaasClientConfig.dbaasUrl().isPresent() && dbaasClientConfig.dbaasUsername().isPresent() && dbaasClientConfig.dbaasPassword().isPresent()) { log.debug("Create dbaas client with basic auth"); return new BasicDbaaSClient(dbaasClientConfig).build(); } log.debug("Create dbaas client with m2m auth"); - return new M2MDbaaSClient(dbaasClientConfig).build(); + return new M2MDbaaSClient(securityConfig, dbaasClientConfig).build(); } } diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java index 559aa3ddc..d2ab4d741 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClient.java @@ -1,40 +1,55 @@ package com.netcracker.cloud.dbaas.common.config; -import jakarta.enterprise.context.ApplicationScoped; -import okhttp3.OkHttpClient; -import okhttp3.Request; import com.netcracker.cloud.context.propagation.core.ContextManager; import com.netcracker.cloud.dbaas.client.DbaaSClientOkHttpImpl; import com.netcracker.cloud.dbaas.client.DbaasClient; import com.netcracker.cloud.framework.contexts.tenant.TenantContextObject; import com.netcracker.cloud.quarkus.security.auth.M2MManager; -import com.netcracker.cloud.security.core.auth.Token; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import com.netcracker.cloud.security.core.utils.tls.TlsUtils; +import jakarta.enterprise.context.ApplicationScoped; +import lombok.extern.slf4j.Slf4j; +import okhttp3.OkHttpClient; +import okhttp3.Request; import java.util.Optional; import static com.netcracker.cloud.dbaas.common.config.DbaasClientConfig.DEFAULT_DBAAS_AGENT_ADDRESS; import static com.netcracker.cloud.framework.contexts.tenant.BaseTenantProvider.TENANT_CONTEXT_NAME; +@Slf4j @ApplicationScoped public class M2MDbaaSClient { - private DbaasClientConfig config; private static final int MAX_RETRIES = 3; private static final long INITIAL_RETRY_DELAY = 500; - public M2MDbaaSClient(DbaasClientConfig config) { - this.config = config; + private final SecurityConfig securityConfig; + private final DbaasClientConfig dbaasConfig; + + public M2MDbaaSClient(SecurityConfig securityConfig, DbaasClientConfig dbaasConfig) { + this.securityConfig = securityConfig; + this.dbaasConfig = dbaasConfig; } public DbaasClient build() { - String url = config.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); - OkHttpClient httpClient = new OkHttpClient.Builder() + String dbaasAgentUrl = dbaasConfig.dbaasAgentUrl().orElse(DEFAULT_DBAAS_AGENT_ADDRESS); + + String dbaasUrl = dbaasAgentUrl; + if(securityConfig.k8sEnabled()) { + if(dbaasConfig.dbaasUrl().isEmpty()) { + log.warn("DBaaS address is not available, falling back to dbaas-agent. Specify 'api.dbaas.address' property to DBaaS url"); + } + dbaasUrl = dbaasConfig.dbaasUrl().orElse(dbaasAgentUrl); + } + + System.setProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP, dbaasAgentUrl); + OkHttpClient httpClient = M2MClientFactory.getDbaasOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()); + System.clearProperty(M2MClientFactory.DBAAS_AGENT_URL_PROP); + + httpClient = httpClient.newBuilder() .addInterceptor(chain -> { Request original = chain.request(); - Token token = M2MManager.getInstance().getToken(); - String credentials = token.getTokenType() + " " + token.getTokenValue(); - Request.Builder requestBuilder = original.newBuilder() - .addHeader("Authorization", credentials); + Request.Builder requestBuilder = original.newBuilder(); Optional tenantContextData = ContextManager.getSafe(TENANT_CONTEXT_NAME); if (tenantContextData.isPresent() && tenantContextData.get().getTenant() != null) { requestBuilder.addHeader("tenant", tenantContextData.get().getTenant()); @@ -44,6 +59,6 @@ public DbaasClient build() { .addInterceptor(new RetryInterceptor(MAX_RETRIES, INITIAL_RETRY_DELAY)) .sslSocketFactory(TlsUtils.getSslContext().getSocketFactory(), TlsUtils.getTrustManager()) .build(); - return new DbaaSClientOkHttpImpl(url, httpClient); + return new DbaaSClientOkHttpImpl(dbaasUrl, httpClient); } } diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java new file mode 100644 index 000000000..947f0bf49 --- /dev/null +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/main/java/com/netcracker/cloud/dbaas/common/config/SecurityConfig.java @@ -0,0 +1,15 @@ +package com.netcracker.cloud.dbaas.common.config; + +import io.smallrye.config.ConfigMapping; +import io.smallrye.config.WithDefault; +import io.smallrye.config.WithName; + +@ConfigMapping(prefix = "security.m2m") +public interface SecurityConfig { + /** + * kubernetes tokens authentication enabled + */ + @WithName("kubernetes.enabled") + @WithDefault("false") + boolean k8sEnabled(); +} diff --git a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java index adea1a0b5..85c49a456 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java +++ b/core-quarkus-extensions/dbaas-client/dbaas-common/runtime/src/test/java/com/netcracker/cloud/dbaas/common/config/M2MDbaaSClientTest.java @@ -16,11 +16,18 @@ class M2MDbaaSClientTest { private M2MDbaaSClient m2MDbaaSClient; private static final String DB_AGENT_URL = "http://dbaas-agent:8080"; + private static final String DB_AGGREGATOR_URL = "http://dbaas-aggregator:8080"; + @BeforeEach void setUp() { - DbaasClientConfig config = mock(DbaasClientConfig.class); - when(config.dbaasAgentUrl()).thenReturn(Optional.of(DB_AGENT_URL)); - m2MDbaaSClient = new M2MDbaaSClient(config); + SecurityConfig securityConfig = mock(SecurityConfig.class); + when(securityConfig.k8sEnabled()).thenReturn(true); + + DbaasClientConfig dbaasConfig = mock(DbaasClientConfig.class); + when(dbaasConfig.dbaasAgentUrl()).thenReturn(Optional.of(DB_AGENT_URL)); + when(dbaasConfig.dbaasUrl()).thenReturn(Optional.of(DB_AGGREGATOR_URL)); + + m2MDbaaSClient = new M2MDbaaSClient(securityConfig, dbaasConfig); } @Test void testBuild() throws NoSuchFieldException, IllegalAccessException { @@ -29,8 +36,6 @@ void testBuild() throws NoSuchFieldException, IllegalAccessException { clientField.setAccessible(true); OkHttpClient clientValue = (OkHttpClient) clientField.get(client); assertNotNull(client); - assertEquals(2, clientValue.interceptors().size()); + assertEquals(3, clientValue.interceptors().size()); } } - - diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml index 988f4b1ef..bfe863c8f 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-datasource-postgresql-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml index 68d277796..7cb3f4b95 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/pom.xml @@ -6,7 +6,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml index 5bc78a145..505c33eef 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-datasource/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-datasource-postgresql-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml index 0d8869884..59935dd77 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/deployment/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-mongo-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml index 81bc4447b..6c7c7fe05 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml index b61c898bc..41d4a35cf 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-mongoclient/runtime/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus dbaas-mongo-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml index 4447e6a9d..434c25038 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-opensearch-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT dbaas-opensearch-client-deployment diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml index 0af0f5c82..4ceabb6c0 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../../build-parent/pom.xml dbaas-opensearch-parent diff --git a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml index 15665f3df..8e2cabcab 100644 --- a/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml +++ b/core-quarkus-extensions/dbaas-client/dbaas-opensearch-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus dbaas-opensearch-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT dbaas-opensearch-client diff --git a/core-quarkus-extensions/dbaas-client/pom.xml b/core-quarkus-extensions/dbaas-client/pom.xml index bd9ad3ad6..71660cf8c 100644 --- a/core-quarkus-extensions/dbaas-client/pom.xml +++ b/core-quarkus-extensions/dbaas-client/pom.xml @@ -3,7 +3,7 @@ cloud-core-quarkus com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/log-manager/deployment/pom.xml b/core-quarkus-extensions/log-manager/deployment/pom.xml index 74225ad2d..35355c724 100644 --- a/core-quarkus-extensions/log-manager/deployment/pom.xml +++ b/core-quarkus-extensions/log-manager/deployment/pom.xml @@ -5,7 +5,7 @@ log-manager-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/log-manager/pom.xml b/core-quarkus-extensions/log-manager/pom.xml index ad83a58a6..9f54281a1 100644 --- a/core-quarkus-extensions/log-manager/pom.xml +++ b/core-quarkus-extensions/log-manager/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/log-manager/runtime/pom.xml b/core-quarkus-extensions/log-manager/runtime/pom.xml index fd838dbf8..2a0befec6 100644 --- a/core-quarkus-extensions/log-manager/runtime/pom.xml +++ b/core-quarkus-extensions/log-manager/runtime/pom.xml @@ -4,7 +4,7 @@ log-manager-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/maas-client/deployment/pom.xml b/core-quarkus-extensions/maas-client/deployment/pom.xml index cc87386be..d97deb762 100644 --- a/core-quarkus-extensions/maas-client/deployment/pom.xml +++ b/core-quarkus-extensions/maas-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/maas-client/pom.xml b/core-quarkus-extensions/maas-client/pom.xml index 7e224230c..769c2b576 100644 --- a/core-quarkus-extensions/maas-client/pom.xml +++ b/core-quarkus-extensions/maas-client/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/maas-client/runtime/pom.xml b/core-quarkus-extensions/maas-client/runtime/pom.xml index ab8eeafd8..15cf8b86e 100644 --- a/core-quarkus-extensions/maas-client/runtime/pom.xml +++ b/core-quarkus-extensions/maas-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/pom.xml b/core-quarkus-extensions/pom.xml index b0c425085..6c51e14ae 100644 --- a/core-quarkus-extensions/pom.xml +++ b/core-quarkus-extensions/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT cloud-core-quarkus pom diff --git a/core-quarkus-extensions/report-aggregate/pom.xml b/core-quarkus-extensions/report-aggregate/pom.xml index a1be9f04b..a73aa8563 100644 --- a/core-quarkus-extensions/report-aggregate/pom.xml +++ b/core-quarkus-extensions/report-aggregate/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml pom diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml index 2ec67ef82..5da40a8a3 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/deployment/pom.xml @@ -4,7 +4,7 @@ rest-api-deprecation-switcher-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml index 0f9992bc3..e389c0774 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/pom.xml @@ -4,7 +4,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml rest-api-deprecation-switcher-parent diff --git a/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml b/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml index be4d65f62..b94228ff7 100644 --- a/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml +++ b/core-quarkus-extensions/rest-api-deprecation-switcher/runtime/pom.xml @@ -4,7 +4,7 @@ rest-api-deprecation-switcher-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/routes-registrator/deployment/pom.xml b/core-quarkus-extensions/routes-registrator/deployment/pom.xml index 053ab5a2f..547e9603a 100644 --- a/core-quarkus-extensions/routes-registrator/deployment/pom.xml +++ b/core-quarkus-extensions/routes-registrator/deployment/pom.xml @@ -3,7 +3,7 @@ routes-registrator-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-quarkus-extensions/routes-registrator/pom.xml b/core-quarkus-extensions/routes-registrator/pom.xml index b3055f930..4a126a189 100644 --- a/core-quarkus-extensions/routes-registrator/pom.xml +++ b/core-quarkus-extensions/routes-registrator/pom.xml @@ -3,7 +3,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/routes-registrator/runtime/pom.xml b/core-quarkus-extensions/routes-registrator/runtime/pom.xml index cfc3433b1..259ee097a 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/pom.xml +++ b/core-quarkus-extensions/routes-registrator/runtime/pom.xml @@ -3,7 +3,7 @@ routes-registrator-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT 4.0.0 @@ -46,7 +46,12 @@ com.netcracker.cloud.security.core.utils tls-utils - + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + + io.quarkus quarkus-junit diff --git a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java index fca416dcb..12432e5e2 100644 --- a/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java +++ b/core-quarkus-extensions/routes-registrator/runtime/src/main/java/com/netcracker/cloud/quarkus/routesregistration/runtime/gateway/route/RouteRegistrationConfig.java @@ -4,7 +4,7 @@ import com.netcracker.cloud.routesregistration.common.gateway.route.*; import com.netcracker.cloud.routesregistration.common.gateway.route.rest.RegistrationRequestFactory; import com.netcracker.cloud.routesregistration.common.gateway.route.transformation.RouteTransformer; -import com.netcracker.cloud.security.core.auth.Token; +import com.netcracker.cloud.security.core.utils.tls.TlsUtils; import io.quarkus.arc.Unremovable; import io.reactivex.Scheduler; import io.reactivex.schedulers.Schedulers; @@ -12,8 +12,8 @@ import jakarta.enterprise.inject.Produces; import jakarta.inject.Named; import okhttp3.OkHttpClient; -import okhttp3.Request; import org.eclipse.microprofile.config.inject.ConfigProperty; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import java.util.Optional; @@ -82,16 +82,10 @@ ControlPlaneClient controlPlaneClient(@Named(CONTROL_PLANE_HTTP_CLIENT) OkHttpCl @Produces @Named(CONTROL_PLANE_HTTP_CLIENT) OkHttpClient controlPlaneHttpClient() { - return new OkHttpClient.Builder() - .addInterceptor(chain -> { - Token token = M2MManager.getInstance().getToken(); - Request original = chain.request(); - Request request = original.newBuilder() - .addHeader("Authorization", token.getTokenType() + " " + token.getTokenValue()) - .build(); - return chain.proceed(request); - }) + return M2MClientFactory.getM2mOkHttpClient(() -> M2MManager.getInstance().getToken().getTokenValue()) + .newBuilder() .retryOnConnectionFailure(true) + .sslSocketFactory(TlsUtils.getSslContext().getSocketFactory(), TlsUtils.getTrustManager()) .build(); } diff --git a/core-quarkus-extensions/security/deployment/pom.xml b/core-quarkus-extensions/security/deployment/pom.xml index ea3ab4cf2..d76c06ad7 100644 --- a/core-quarkus-extensions/security/deployment/pom.xml +++ b/core-quarkus-extensions/security/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus security-adapters-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/security/pom.xml b/core-quarkus-extensions/security/pom.xml index c739c0e94..12757d562 100644 --- a/core-quarkus-extensions/security/pom.xml +++ b/core-quarkus-extensions/security/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/security/runtime/pom.xml b/core-quarkus-extensions/security/runtime/pom.xml index 2922ea0b5..e6bab97c9 100644 --- a/core-quarkus-extensions/security/runtime/pom.xml +++ b/core-quarkus-extensions/security/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus security-adapters-parent - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml b/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml index 6df029199..668ef4a2f 100644 --- a/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/deployment/pom.xml @@ -5,7 +5,7 @@ stomp-ws-server-aggregator com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/pom.xml b/core-quarkus-extensions/stomp-ws-server/pom.xml index 10e9cd861..c97faf4e5 100644 --- a/core-quarkus-extensions/stomp-ws-server/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/pom.xml @@ -5,7 +5,7 @@ build-parent com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../build-parent/pom.xml diff --git a/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml b/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml index 272e4f25f..e61d07a06 100644 --- a/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml +++ b/core-quarkus-extensions/stomp-ws-server/runtime/pom.xml @@ -4,7 +4,7 @@ stomp-ws-server-aggregator com.netcracker.cloud.quarkus - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml index 51ec976a1..59aba1972 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-common/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml index ff4748195..872c8171a 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 @@ -25,5 +25,10 @@ rest-security-adapters ${project.version} + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + diff --git a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java index 23b3d2ca9..42dc38423 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-resttemplate/src/main/java/com/netcracker/cloud/configserver/resttemplate/RestTemplateConfigServerConfigDataLocationResolver.java @@ -1,5 +1,6 @@ package com.netcracker.cloud.configserver.resttemplate; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.apache.hc.client5.http.classic.HttpClient; import org.apache.hc.client5.http.impl.classic.HttpClients; import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; @@ -14,10 +15,9 @@ import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.logging.DeferredLogFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; +import org.springframework.http.client.JdkClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; -import java.util.Collections; - public class RestTemplateConfigServerConfigDataLocationResolver extends AbstractCustomConfigServerConfigDataLocationResolver { @Value("${connection.readTimeout:60000}") @@ -39,19 +39,17 @@ private RestTemplate createM2MRestTemplate() { RestTemplate template = new RestTemplate(); SocketConfig socketConfig = SocketConfig.custom().setSoTimeout(Timeout.ofMilliseconds(readTimeout)).build(); - final PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = PoolingHttpClientConnectionManagerBuilder.create() - .setDefaultSocketConfig(socketConfig) - .build(); - HttpClient httpClient = HttpClients.custom().setConnectionManager(poolingHttpClientConnectionManager).build(); - - template.setRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient)); if (hasM2M(configurableBootstrapContext)) { - template.setInterceptors(Collections.singletonList((request, body, execution) -> { - request.getHeaders().setBearerAuth(getM2MToken(configurableBootstrapContext)); - return execution.execute(request, body); - })); + var client = M2MClientFactory.getM2mHttpClient(() -> getM2MToken(configurableBootstrapContext)); + template.setRequestFactory(new JdkClientHttpRequestFactory(client)); + } else { + final PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = PoolingHttpClientConnectionManagerBuilder.create() + .setDefaultSocketConfig(socketConfig) + .build(); + HttpClient httpClient = HttpClients.custom().setConnectionManager(poolingHttpClientConnectionManager).build(); + + template.setRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient)); } - return template; } diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml index 9a3efcdf6..44819baf5 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/pom.xml @@ -3,7 +3,7 @@ config-server-loader com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 @@ -25,5 +25,10 @@ rest-security-adapters ${project.version} + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + diff --git a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java index 9fa2e419b..e40a85a6a 100644 --- a/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java +++ b/core-rest-libraries/config-server-loader/config-server-loader-webclient/src/main/java/com/netcracker/cloud/configserver/webclient/WebClientConfigServerConfigDataLocationResolver.java @@ -4,12 +4,12 @@ import com.netcracker.cloud.restclient.MicroserviceRestClient; import com.netcracker.cloud.restclient.webclient.MicroserviceWebClient; import com.netcracker.cloud.security.core.auth.M2MManager; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.springframework.boot.bootstrap.ConfigurableBootstrapContext; import org.springframework.boot.logging.DeferredLogFactory; -import org.springframework.web.reactive.function.client.ClientRequest; +import org.springframework.http.client.reactive.JdkClientHttpConnector; import org.springframework.web.reactive.function.client.WebClient; - -import static org.springframework.http.HttpHeaders.AUTHORIZATION; +import java.net.http.HttpClient; public class WebClientConfigServerConfigDataLocationResolver extends AbstractCustomConfigServerConfigDataLocationResolver { @@ -26,13 +26,10 @@ public MicroserviceRestClient getMicroserviceRestClient() { } private WebClient createM2MWebClient() { - WebClient.Builder builder = WebClient.builder(); + var builder = WebClient.builder(); if (hasM2M(configurableBootstrapContext)) { - builder.filter( - (request, next) -> - next.exchange(ClientRequest.from(request). - header(AUTHORIZATION, "Bearer " + getM2MToken(configurableBootstrapContext)).build()) - ); + HttpClient client = M2MClientFactory.getM2mHttpClient(() -> getM2MToken(configurableBootstrapContext)); + builder.clientConnector(new JdkClientHttpConnector(client)); } return builder.build(); } diff --git a/core-rest-libraries/config-server-loader/pom.xml b/core-rest-libraries/config-server-loader/pom.xml index 1f1db98f1..a37c333f3 100644 --- a/core-rest-libraries/config-server-loader/pom.xml +++ b/core-rest-libraries/config-server-loader/pom.xml @@ -3,7 +3,7 @@ rest-libraries-parent com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml index b8c7ef424..03b831ecb 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-common/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml index bdec739c0..46681a6fa 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-common/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml index e13789560..bd28f0a05 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-resttemplate/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml index 530fd8770..4c8077de6 100644 --- a/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml +++ b/core-rest-libraries/consul-config-provider/consul-config-provider-spring-webclient/pom.xml @@ -3,7 +3,7 @@ consul-config-provider com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/consul-config-provider/pom.xml b/core-rest-libraries/consul-config-provider/pom.xml index 345dcb0ce..d5ede8868 100644 --- a/core-rest-libraries/consul-config-provider/pom.xml +++ b/core-rest-libraries/consul-config-provider/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/log-manager/log-manager-common/pom.xml b/core-rest-libraries/log-manager/log-manager-common/pom.xml index 925a34b26..9dad1bc7f 100644 --- a/core-rest-libraries/log-manager/log-manager-common/pom.xml +++ b/core-rest-libraries/log-manager/log-manager-common/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud log-manager - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/log-manager/logger-manager-spring/pom.xml b/core-rest-libraries/log-manager/logger-manager-spring/pom.xml index 10e93a191..d88c03d6d 100644 --- a/core-rest-libraries/log-manager/logger-manager-spring/pom.xml +++ b/core-rest-libraries/log-manager/logger-manager-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud log-manager - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/log-manager/pom.xml b/core-rest-libraries/log-manager/pom.xml index 4fb77e8d0..4d9e1be3f 100644 --- a/core-rest-libraries/log-manager/pom.xml +++ b/core-rest-libraries/log-manager/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/pom.xml b/core-rest-libraries/pom.xml index 2239f8d72..6f99b7b71 100644 --- a/core-rest-libraries/pom.xml +++ b/core-rest-libraries/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries pom - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT @@ -17,7 +17,7 @@ 21 - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/core-rest-libraries/report-aggregate/pom.xml b/core-rest-libraries/report-aggregate/pom.xml index f004476f2..a6f65954a 100644 --- a/core-rest-libraries/report-aggregate/pom.xml +++ b/core-rest-libraries/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml pom diff --git a/core-rest-libraries/rest-api-deprecation-switcher/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/pom.xml index faf99e4c8..eb71eba45 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml index 62ef0e93e..3e6aff6a7 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-api-deprecation-switcher-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml index 2db569133..207c2abee 100644 --- a/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml +++ b/core-rest-libraries/rest-api-deprecation-switcher/rest-api-deprecation-switcher-spring/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-api-deprecation-switcher-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/core-rest-libraries/rest-libraries-bom/pom.xml b/core-rest-libraries/rest-libraries-bom/pom.xml index 47180c3ab..40f741fa6 100644 --- a/core-rest-libraries/rest-libraries-bom/pom.xml +++ b/core-rest-libraries/rest-libraries-bom/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-bom - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/rest-libraries-parent/pom.xml b/core-rest-libraries/rest-libraries-parent/pom.xml index 5f0ed4b9b..451692d17 100644 --- a/core-rest-libraries/rest-libraries-parent/pom.xml +++ b/core-rest-libraries/rest-libraries-parent/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/rest-third-party/pom.xml b/core-rest-libraries/rest-third-party/pom.xml index a4cac0399..d1da94407 100644 --- a/core-rest-libraries/rest-third-party/pom.xml +++ b/core-rest-libraries/rest-third-party/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud rest-libraries - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../pom.xml @@ -13,9 +13,9 @@ pom - 7.1.0-SNAPSHOT - 8.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT 2.0.9 3.0.2 @@ -26,7 +26,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-rest-libraries/restlegacy/pom.xml b/core-rest-libraries/restlegacy/pom.xml index 9fdddc30d..026e49453 100644 --- a/core-rest-libraries/restlegacy/pom.xml +++ b/core-rest-libraries/restlegacy/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud restlegacy - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml b/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml index 02dfef5a1..58a1928ad 100644 --- a/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml +++ b/core-rest-libraries/restlegacy/rest-legacy-bom/pom.xml @@ -2,7 +2,7 @@ com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT pom diff --git a/core-rest-libraries/restlegacy/restclient/pom.xml b/core-rest-libraries/restlegacy/restclient/pom.xml index 365ba6ec5..b85b83fcc 100644 --- a/core-rest-libraries/restlegacy/restclient/pom.xml +++ b/core-rest-libraries/restlegacy/restclient/pom.xml @@ -3,7 +3,7 @@ restlegacy-parent com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../restlegacy-parent/pom.xml 4.0.0 diff --git a/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml b/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml index 1fbc32397..b3bf8d5e7 100644 --- a/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml +++ b/core-rest-libraries/restlegacy/restlegacy-parent/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/restlegacy/resttemplate/pom.xml b/core-rest-libraries/restlegacy/resttemplate/pom.xml index c9694cdf8..07f3622fd 100644 --- a/core-rest-libraries/restlegacy/resttemplate/pom.xml +++ b/core-rest-libraries/restlegacy/resttemplate/pom.xml @@ -3,7 +3,7 @@ restlegacy-parent com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../restlegacy-parent/pom.xml 4.0.0 diff --git a/core-rest-libraries/route-registration/pom.xml b/core-rest-libraries/route-registration/pom.xml index b96d1841d..378cf8d9c 100644 --- a/core-rest-libraries/route-registration/pom.xml +++ b/core-rest-libraries/route-registration/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml diff --git a/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml b/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml index b3fde09bd..09e230b75 100644 --- a/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-common-spring/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-common/pom.xml b/core-rest-libraries/route-registration/route-registration-common/pom.xml index f4c4eea13..2e9d39fd1 100644 --- a/core-rest-libraries/route-registration/route-registration-common/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-common/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml b/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml index 76ae5516f..eddc7ec8b 100644 --- a/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-resttemplate/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/route-registration/route-registration-webclient/pom.xml b/core-rest-libraries/route-registration/route-registration-webclient/pom.xml index ed4eac6f0..5ed93332d 100644 --- a/core-rest-libraries/route-registration/route-registration-webclient/pom.xml +++ b/core-rest-libraries/route-registration/route-registration-webclient/pom.xml @@ -3,7 +3,7 @@ route-registration com.netcracker.cloud - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT 4.0.0 diff --git a/core-rest-libraries/security/pom.xml b/core-rest-libraries/security/pom.xml index 0c599d6e8..d66ff053c 100644 --- a/core-rest-libraries/security/pom.xml +++ b/core-rest-libraries/security/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud rest-libraries - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT rest-security-adapters @@ -14,7 +14,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-rest-libraries/webclient/pom.xml b/core-rest-libraries/webclient/pom.xml index b3918b118..73c949126 100644 --- a/core-rest-libraries/webclient/pom.xml +++ b/core-rest-libraries/webclient/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud rest-libraries-parent - 7.2.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT ../rest-libraries-parent/pom.xml 4.0.0 diff --git a/core-restclient/microservice-restclient-api/pom.xml b/core-restclient/microservice-restclient-api/pom.xml index e08b0a899..20d6e6787 100644 --- a/core-restclient/microservice-restclient-api/pom.xml +++ b/core-restclient/microservice-restclient-api/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../parent/pom.xml microservice-restclient-api @@ -14,7 +14,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-restclient/microservice-restclient-report-aggregate/pom.xml b/core-restclient/microservice-restclient-report-aggregate/pom.xml index 5ea684ffb..516127355 100644 --- a/core-restclient/microservice-restclient-report-aggregate/pom.xml +++ b/core-restclient/microservice-restclient-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud microservice-restclient-parent - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../parent/pom.xml pom diff --git a/core-restclient/microservice-restclient-resttemplate/pom.xml b/core-restclient/microservice-restclient-resttemplate/pom.xml index 208090be9..2fc81584b 100644 --- a/core-restclient/microservice-restclient-resttemplate/pom.xml +++ b/core-restclient/microservice-restclient-resttemplate/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../parent/pom.xml microservice-restclient-resttemplate @@ -14,7 +14,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-restclient/microservice-restclient-test-utils/pom.xml b/core-restclient/microservice-restclient-test-utils/pom.xml index 6cd7d14fe..3ed4261d0 100644 --- a/core-restclient/microservice-restclient-test-utils/pom.xml +++ b/core-restclient/microservice-restclient-test-utils/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../parent/pom.xml microservice-restclient-test-utils @@ -14,7 +14,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-restclient/microservice-restclient-webclient/pom.xml b/core-restclient/microservice-restclient-webclient/pom.xml index 6afc4fef8..2c214dd3e 100644 --- a/core-restclient/microservice-restclient-webclient/pom.xml +++ b/core-restclient/microservice-restclient-webclient/pom.xml @@ -4,7 +4,7 @@ microservice-restclient-parent com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../parent/pom.xml microservice-restclient-webclient @@ -14,7 +14,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-restclient/parent/pom.xml b/core-restclient/parent/pom.xml index 6366ef9b7..b145d7384 100644 --- a/core-restclient/parent/pom.xml +++ b/core-restclient/parent/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud microservice-restclient-parent - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT pom @@ -21,8 +21,8 @@ 3.15.0 3.4.0 - 4.2.0-SNAPSHOT - 3.1.0-SNAPSHOT + 4.2.0-rest-client-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT ${project.basedir}/../microservice-restclient-report-aggregate/target/site/jacoco-aggregate/jacoco.xml diff --git a/core-restclient/pom.xml b/core-restclient/pom.xml index 351e12688..7f0e5415b 100644 --- a/core-restclient/pom.xml +++ b/core-restclient/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.netcracker.cloud - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT microservice-restclient-aggregator pom diff --git a/core-springboot-starter/pom.xml b/core-springboot-starter/pom.xml index dd7537010..29a5b9079 100644 --- a/core-springboot-starter/pom.xml +++ b/core-springboot-starter/pom.xml @@ -10,7 +10,7 @@ com.netcracker.cloud netcracker-spring-boot-starter-parent - 12.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT pom netcracker-spring-boot-starter @@ -27,8 +27,8 @@ UTF-8 21 - 12.1.0-SNAPSHOT - 8.1.0-SNAPSHOT + 12.1.0-rest-client-SNAPSHOT + 8.1.0-rest-client-SNAPSHOT diff --git a/core-utils/k8s/pom.xml b/core-utils/k8s/pom.xml index 79d62a963..fba03ef50 100644 --- a/core-utils/k8s/pom.xml +++ b/core-utils/k8s/pom.xml @@ -5,11 +5,12 @@ core-utils-aggregator com.netcracker.cloud.security.core.utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT ../pom.xml k8s-utils + 3.1.0-rest-client-SNAPSHOT jar @@ -41,6 +42,16 @@ jose4j 0.9.6 + + com.github.ben-manes.caffeine + caffeine + 3.2.3 + + + com.squareup.okhttp3 + okhttp + 4.12.0 + @@ -61,6 +72,7 @@ com.squareup.okhttp3 mockwebserver + 4.12.0 test @@ -68,6 +80,18 @@ logback-classic test + + org.wiremock + wiremock + 3.13.2 + test + + + com.github.stefanbirkner + system-lambda + 1.2.1 + test + diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java new file mode 100644 index 000000000..9a880a3bb --- /dev/null +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/M2MClientFactory.java @@ -0,0 +1,66 @@ +package com.netcracker.cloud.security.core.utils.k8s; + +import com.netcracker.cloud.security.core.utils.k8s.impl.M2MAuthenticator; +import com.netcracker.cloud.security.core.utils.k8s.impl.M2MHttpClient; +import com.netcracker.cloud.security.core.utils.k8s.impl.M2MInterceptor; +import com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import okhttp3.OkHttpClient; + +import java.net.http.HttpClient; +import java.util.Optional; +import java.util.function.Supplier; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class M2MClientFactory { + public static final String DBAAS_AGENT_URL_PROP = "com.netcracker.cloud.dbaas.agent.url"; + public static final String MAAS_AGENT_URL_PROP = "com.netcracker.cloud.maas.agent.url"; + + private static final Supplier k8sAuthHeaderSupplier = + getBearerAuthHeaderSupplier(() -> KubernetesAudienceToken.getToken(AudienceName.NETCRACKER)); + + public static OkHttpClient getM2mOkHttpClient(Supplier keycloakTokenSupplier) { + return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier)); + } + + public static OkHttpClient getDbaasOkHttpClient(Supplier keycloakTokenSupplier) { + return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080")); + } + + public static OkHttpClient getMaasOkHttpClient(Supplier keycloakTokenSupplier) { + return getAgentOkHttpClient(keycloakTokenSupplier, Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080")); + } + + public static HttpClient getM2mHttpClient(Supplier keycloakTokenSupplier) { + return buildHttpClient(new M2MAuthenticator(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier)); + } + + public static HttpClient getDbaasHttpClient(Supplier keycloakTokenSupplier) { + String agentUrl = Optional.ofNullable(System.getProperty(DBAAS_AGENT_URL_PROP)).orElse("http://dbaas-agent:8080"); + return buildHttpClient(new M2MAuthenticator(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); + } + + public static HttpClient getMaasHttpClient(Supplier keycloakTokenSupplier) { + String agentUrl = Optional.ofNullable(System.getProperty(MAAS_AGENT_URL_PROP)).orElse("http://maas-agent:8080"); + return buildHttpClient(new M2MAuthenticator(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); + } + + private static OkHttpClient getAgentOkHttpClient(Supplier keycloakTokenSupplier, String agentUrl) { + return getOkHttpClient(new M2MInterceptor(new UrlCache(), getBearerAuthHeaderSupplier(keycloakTokenSupplier), k8sAuthHeaderSupplier, agentUrl)); + } + + private static OkHttpClient getOkHttpClient(M2MInterceptor interceptor) { + return new OkHttpClient.Builder() + .addInterceptor(interceptor) + .build(); + } + + private static HttpClient buildHttpClient(M2MAuthenticator authenticator) { + return new M2MHttpClient(HttpClient.newHttpClient(), authenticator); + } + + private static Supplier getBearerAuthHeaderSupplier(Supplier tokenSupplier) { + return () -> "Bearer " + tokenSupplier.get(); + } +} diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java new file mode 100644 index 000000000..b10c7be6b --- /dev/null +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MAuthenticator.java @@ -0,0 +1,132 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.function.Supplier; + +import static com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache.calculateCacheKey; + +@Slf4j +public final class M2MAuthenticator { + + public static final String KUBERNETES_TOKEN_ACQUISITION_ERROR = """ + Error acquiring kubernetes token for m2m communication. + The current version of the security library expects a kubernetes token with the `netcracker` audience to be mounted in the deployment. + if you do not intend to use a kubernetes token at this time, please roll back to a previous version of the library. + otherwise, make sure that a kubernetes token with the `netcracker` audience is properly mounted. + the previous authentication method will be used as a fallback."""; + public static final String KUBERNETES_TOKEN_UNAUTHORIZED_ERROR = """ + Unauthorized access (http 401). + During an m2m interaction attempt using a kubernetes token with the `netcracker` audience, a 401 error was received. + The possible cause is an outdated version of the security library on the server side. + The previous authentication method will be used as a fallback."""; + + @FunctionalInterface + public interface HttpSender { + T send(URI url, String authHeader) throws IOException; + } + + private final boolean k8sEnabled; + private final UrlCache urlCache; + private final Supplier fallbackAuthHeaderSupplier; + private final Supplier k8sAuthHeaderSupplier; + private final URI fallbackBaseUri; + + public M2MAuthenticator(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier) { + this(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, null); + } + + public M2MAuthenticator(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl) { + String k8sEnabledProp = System.getProperty("security.m2m.kubernetes.enabled"); + if (k8sEnabledProp == null) { + k8sEnabledProp = System.getenv("SECURITY_M2M_KUBERNETES_ENABLED"); + } + + this.k8sEnabled = Boolean.parseBoolean(k8sEnabledProp); + this.urlCache = urlCache; + this.fallbackAuthHeaderSupplier = fallbackAuthHeaderSupplier; + this.k8sAuthHeaderSupplier = k8sAuthHeaderSupplier; + this.fallbackBaseUri = (fallbackBaseUrl != null) ? URI.create(fallbackBaseUrl) : null; + } + + public T execute( + URI requestUrl, + HttpSender sender, + Predicate isUnauthorized, + Predicate isSuccessful, + Consumer closeResponse) throws IOException { + + final String cacheKey = calculateCacheKey(requestUrl); + + if (k8sEnabled && !urlCache.containsKey(cacheKey)) { + try { + String k8sHeader = k8sAuthHeaderSupplier.get(); + validateAuthHeader(k8sHeader); + T response = sender.send(requestUrl, k8sHeader); + if (!isUnauthorized.test(response)) { + return response; + } + closeResponse.accept(response); + return doFallback(requestUrl, sender, isSuccessful, KUBERNETES_TOKEN_UNAUTHORIZED_ERROR, cacheKey); + } catch (IllegalStateException | IllegalArgumentException ex) { + log.warn("failed to get or invalid auth header", ex); + return doFallback(requestUrl, sender, isSuccessful, KUBERNETES_TOKEN_ACQUISITION_ERROR, cacheKey); + } + } + + URI targetUrl = k8sEnabled ? resolveTargetUrl(requestUrl) : requestUrl; + String authHeader = fallbackAuthHeaderSupplier.get(); + validateAuthHeader(authHeader); + return sender.send(targetUrl, authHeader); + } + + private T doFallback( + URI requestUrl, + HttpSender sender, + Predicate isSuccessful, + String reason, + String cacheKey) throws IOException { + URI targetUrl = resolveTargetUrl(requestUrl); + log.debug("Failed to establish m2m connection to {}\n falling back to keycloak token: {}", targetUrl, reason); + + String authHeader = fallbackAuthHeaderSupplier.get(); + validateAuthHeader(authHeader); + T response = sender.send(targetUrl, authHeader); + if (isSuccessful.test(response)) { + urlCache.store(cacheKey); + } + return response; + } + + private URI resolveTargetUrl(URI original) { + if (fallbackBaseUri == null) { + return original; + } + try { + return new URI( + fallbackBaseUri.getScheme(), + null, + fallbackBaseUri.getHost(), + fallbackBaseUri.getPort(), + original.getPath(), + original.getQuery(), + original.getFragment() + ); + } catch (URISyntaxException e) { + throw new IllegalStateException("Failed to rebase URI: " + original, e); + } + } + + private static void validateAuthHeader(String authHeader) { + if (StringUtils.isEmpty(authHeader)) { + throw new IllegalStateException("M2M auth header is empty."); + } + } +} diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java new file mode 100644 index 000000000..b1615acce --- /dev/null +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClient.java @@ -0,0 +1,139 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLParameters; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.net.Authenticator; +import java.net.CookieHandler; +import java.net.ProxySelector; +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.time.Duration; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; + +public final class M2MHttpClient extends HttpClient { + + private final HttpClient delegate; + private final M2MAuthenticator authenticator; + + public M2MHttpClient(HttpClient delegate, M2MAuthenticator authenticator) { + this.delegate = delegate; + this.authenticator = authenticator; + } + + @Override + public HttpResponse send(HttpRequest request, HttpResponse.BodyHandler responseBodyHandler) + throws IOException, InterruptedException { + try { + return authenticator.execute( + request.uri(), + (targetUrl, authHeader) -> sendWithDelegate(buildRequest(request, targetUrl, authHeader), responseBodyHandler), + response -> response.statusCode() == 401, + response -> response.statusCode() >= 200 && response.statusCode() < 300, + response -> { } + ); + } catch (IOException e) { + if (e.getCause() instanceof InterruptedException ie) { + throw ie; + } + throw e; + } + } + + private HttpResponse sendWithDelegate(HttpRequest request, HttpResponse.BodyHandler handler) throws IOException { + try { + return delegate.send(request, handler); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IOException("Interrupted during HTTP request", e); + } + } + + @Override + public CompletableFuture> sendAsync(HttpRequest request, HttpResponse.BodyHandler responseBodyHandler) { + return CompletableFuture.supplyAsync(() -> { + try { + return send(request, responseBodyHandler); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IllegalStateException("Request was interrupted", e); + } catch (IOException e) { + throw new UncheckedIOException("IO error during request execution", e); + } + }, executor().orElse(Runnable::run)); + } + + @Override + public CompletableFuture> sendAsync(HttpRequest request, HttpResponse.BodyHandler responseBodyHandler, HttpResponse.PushPromiseHandler pushPromiseHandler) { + return sendAsync(request, responseBodyHandler); + } + + private static HttpRequest buildRequest(HttpRequest original, URI targetUrl, String authHeader) { + HttpRequest.Builder builder = HttpRequest.newBuilder() + .uri(targetUrl) + .method(original.method(), original.bodyPublisher().orElse(HttpRequest.BodyPublishers.noBody())); + original.headers().map().forEach((name, values) -> { + for (String value : values) { + builder.header(name, value); + } + }); + builder.header("Authorization", authHeader); + original.timeout().ifPresent(builder::timeout); + return builder.build(); + } + + @Override + public Optional cookieHandler() { + return delegate.cookieHandler(); + } + + @Override + public Optional connectTimeout() { + return delegate.connectTimeout(); + } + + @Override + public Redirect followRedirects() { + return delegate.followRedirects(); + } + + @Override + public Optional proxy() { + return delegate.proxy(); + } + + @Override + public SSLContext sslContext() { + return delegate.sslContext(); + } + + @Override + public SSLParameters sslParameters() { + return delegate.sslParameters(); + } + + @Override + public Optional authenticator() { + return delegate.authenticator(); + } + + @Override + public Version version() { + return delegate.version(); + } + + @Override + public Optional executor() { + return delegate.executor(); + } + + @Override + public void close() { + delegate.close(); + } +} diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java new file mode 100644 index 000000000..71ea39de0 --- /dev/null +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptor.java @@ -0,0 +1,45 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import okhttp3.HttpUrl; +import okhttp3.Interceptor; +import okhttp3.Request; +import okhttp3.Response; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.net.URI; +import java.util.Objects; +import java.util.function.Supplier; + +public final class M2MInterceptor implements Interceptor { + + private final M2MAuthenticator authenticator; + + public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier) { + this.authenticator = new M2MAuthenticator(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier); + } + + public M2MInterceptor(UrlCache urlCache, Supplier fallbackAuthHeaderSupplier, Supplier k8sAuthHeaderSupplier, String fallbackBaseUrl) { + this.authenticator = new M2MAuthenticator(urlCache, fallbackAuthHeaderSupplier, k8sAuthHeaderSupplier, fallbackBaseUrl); + } + + @NotNull + @Override + public Response intercept(final Chain chain) throws IOException { + final Request request = chain.request(); + return authenticator.execute( + request.url().uri(), + (targetUrl, authHeader) -> chain.proceed(buildRequest(request, targetUrl, authHeader)), + response -> response.code() == 401, + Response::isSuccessful, + Response::close + ); + } + + private static Request buildRequest(Request original, URI targetUrl, String authHeader) { + return original.newBuilder() + .url(Objects.requireNonNull(HttpUrl.get(targetUrl))) + .header("Authorization", authHeader) + .build(); + } +} diff --git a/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java new file mode 100644 index 000000000..24edd19b8 --- /dev/null +++ b/core-utils/k8s/src/main/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCache.java @@ -0,0 +1,90 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; + +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeUnit; + +@Slf4j +public class UrlCache { + private static final String INTERNAL_GATEWAY = "internal-gateway"; + private static final int CACHE_SIZE = 400; + private static final long CACHE_DURATION_SECONDS = TimeUnit.HOURS.toSeconds(5); + private final Cache cache; + + public UrlCache() { + this(CACHE_SIZE, CACHE_DURATION_SECONDS); + } + + public UrlCache(final int cacheSize, final long ttlSeconds) { + this.cache = Caffeine.newBuilder() + .maximumSize(cacheSize) + .expireAfterAccess(ttlSeconds, TimeUnit.SECONDS) + .build(); + } + + public void store(@NotNull final String key) { + cache.put(key, Boolean.TRUE); + } + + public boolean containsKey(@NotNull final String key) { + return cache.getIfPresent(key) != null; + } + + public static String calculateCacheKey(final String rawUrl) { + URI parsedURI; + try { + parsedURI = new URI(rawUrl); + } catch (Exception ex) { + throw new RuntimeException("Failed during parsing of URL: ", ex); //NOSONAR + } + return calculateCacheKey(parsedURI); + } + + public static String calculateCacheKey(final URI parsedURI) { + return parsedURI.getHost().contains(INTERNAL_GATEWAY) + ? calculateCacheKeyForInternalGateway(parsedURI) + : parsedURI.getHost() + ":" + parsedURI.getPort(); + } + + private static String calculateCacheKeyForInternalGateway(final URI parsedUri) { + final String[] segments = StringUtils.strip(parsedUri.getPath(), "/").split("/"); + final List filteredSegments = new ArrayList<>(); + + String version = ""; + String serviceName = ""; + + for (String segment : segments) { + if (StringUtils.isNotEmpty(version)) { + serviceName = segment; + break; + } + filteredSegments.add(segment); + if (isVersion(segment)) { + version = segment; + } + } + + if (StringUtils.isEmpty(version)) { + log.debug("internal-gateway url does not contain any version; whole path will be used as a key for m2m decision cache"); + } + String key = parsedUri.getHost() + ":" + parsedUri.getPort() + "/" + StringUtils.join(filteredSegments, "/"); + if (parsedUri.getPath().startsWith("/api") && StringUtils.isNotEmpty(serviceName)) { + key = key + "/" + serviceName; + } + + return key; + } + + private static boolean isVersion(final String segment) { + if (segment.length() < 2 || segment.charAt(0) != 'v') + return false; + return segment.substring(1).matches("\\d+"); + } +} diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java new file mode 100644 index 000000000..071e7ba30 --- /dev/null +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MHttpClientTest.java @@ -0,0 +1,187 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.WireMock; +import lombok.SneakyThrows; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.net.URI; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.util.function.Supplier; + +import static com.github.tomakehurst.wiremock.client.WireMock.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.when; + +class M2MHttpClientTest { + private static final String TEST_ENDPOINT = "/test/endpoint"; + private static final int TEST_CACHE_SIZE = 10; + private static final long TEST_CACHE_DURATION_SEC = 60; + + private WireMockServer wireMockServer; + private HttpClient client; + + private Supplier fallbackSupplier; + private Supplier k8sSupplier; + + private static final String K8S_TOKEN_HEADER = "Bearer k8s-test-token"; + private static final String FALLBACK_TOKEN_HEADER = "Bearer fallback-test-token"; + + @BeforeEach + @SuppressWarnings("unchecked") + void beforeEach() { + System.setProperty("security.m2m.kubernetes.enabled", "true"); + + wireMockServer = new WireMockServer(0); + wireMockServer.start(); + WireMock.configureFor("localhost", wireMockServer.port()); + + UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); + fallbackSupplier = Mockito.mock(Supplier.class); + k8sSupplier = Mockito.mock(Supplier.class); + + when(k8sSupplier.get()).thenReturn(K8S_TOKEN_HEADER); + when(fallbackSupplier.get()).thenReturn(FALLBACK_TOKEN_HEADER); + + M2MAuthenticator authenticator = new M2MAuthenticator(urlCache, fallbackSupplier, k8sSupplier); + client = new M2MHttpClient(HttpClient.newHttpClient(), authenticator); + } + + @AfterEach + void afterEach() { + wireMockServer.stop(); + System.clearProperty("security.m2m.kubernetes.enabled"); + } + + @Test + @SneakyThrows + void kubernetesTokenAuth_Success() { + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200).withBody("ok"))); + + HttpResponse response = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); + + assertEquals(200, response.statusCode()); + assertEquals("ok", response.body()); + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT))); + } + + @Test + @SneakyThrows + void keycloakTokenAuth_UnauthorizedFallback() { + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(401))); + + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200).withBody("fallback-ok"))); + + HttpResponse response = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); + + assertEquals(200, response.statusCode()); + assertEquals("fallback-ok", response.body()); + + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + + // Second call should go straight to fallback (cached) + HttpResponse response2 = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); + assertEquals(200, response2.statusCode()); + + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(2, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + } + + @Test + @SneakyThrows + void kubernetesTokenAcquisitionError_Fallback() { + when(k8sSupplier.get()).thenThrow(new IllegalStateException("K8s failed")); + + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200).withBody("fallback-ok"))); + + HttpResponse response = client.send(buildRequest(), HttpResponse.BodyHandlers.ofString()); + + assertEquals(200, response.statusCode()); + verify(0, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + } + + @Test + @SneakyThrows + void bothTokensEmpty_ThrowsException() { + when(k8sSupplier.get()).thenReturn(""); + when(fallbackSupplier.get()).thenReturn(""); + + var req = buildRequest(); + var respHandler = HttpResponse.BodyHandlers.ofString(); + assertThrows(IllegalStateException.class, () -> client.send(req, respHandler)); + } + + @Test + @SneakyThrows + void fallbackUrl_RebasesHostWhenFallbackOccurs() { + WireMockServer fallbackServer = new WireMockServer(0); + fallbackServer.start(); + WireMock.configureFor("localhost", fallbackServer.port()); + + fallbackServer.stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200).withBody("from-fallback-server"))); + + wireMockServer.stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(401))); + + UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); + String fallbackBaseUrl = "http://localhost:" + fallbackServer.port(); + + M2MAuthenticator authenticator = new M2MAuthenticator(urlCache, fallbackSupplier, k8sSupplier, fallbackBaseUrl); + HttpClient clientWithFallback = new M2MHttpClient(HttpClient.newHttpClient(), authenticator); + + HttpRequest request = HttpRequest.newBuilder() + .uri(URI.create(wireMockServer.baseUrl() + TEST_ENDPOINT)) + .GET() + .build(); + + HttpResponse response = clientWithFallback.send(request, HttpResponse.BodyHandlers.ofString()); + + assertEquals(200, response.statusCode()); + assertEquals("from-fallback-server", response.body()); + + wireMockServer.verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + fallbackServer.verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + + fallbackServer.stop(); + } + + @Test + @SneakyThrows + void sendAsync_Works() { + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200).withBody("async-ok"))); + + HttpResponse response = client.sendAsync(buildRequest(), HttpResponse.BodyHandlers.ofString()).get(); + + assertEquals(200, response.statusCode()); + assertEquals("async-ok", response.body()); + } + + private HttpRequest buildRequest() { + return HttpRequest.newBuilder() + .uri(URI.create(wireMockServer.baseUrl() + TEST_ENDPOINT)) + .GET() + .build(); + } +} diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java new file mode 100644 index 000000000..91db08840 --- /dev/null +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/M2MInterceptorTest.java @@ -0,0 +1,184 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import org.junit.jupiter.api.Test; +import com.github.tomakehurst.wiremock.WireMockServer; +import com.github.tomakehurst.wiremock.client.WireMock; +import lombok.SneakyThrows; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.Response; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.mockito.Mockito; + +import java.util.function.Supplier; + +import static com.github.tomakehurst.wiremock.client.WireMock.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.when; + +class M2MInterceptorTest { + private static final String TEST_ENDPOINT = "/test/endpoint"; + private static final int TEST_CACHE_SIZE = 10; + private static final long TEST_CACHE_DURATION_SEC = 60; + + private WireMockServer wireMockServer; + private OkHttpClient client; + + private Supplier fallbackSupplier; + private Supplier k8sSupplier; + + private static final String K8S_TOKEN_HEADER = "Bearer k8s-test-token"; + private static final String FALLBACK_TOKEN_HEADER = "Bearer fallback-test-token"; + + @BeforeEach + @SuppressWarnings("unchecked") + void beforeEach() { + System.setProperty("security.m2m.kubernetes.enabled", "true"); + + wireMockServer = new WireMockServer(0); + wireMockServer.start(); + WireMock.configureFor("localhost", wireMockServer.port()); + + UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); + fallbackSupplier = Mockito.mock(Supplier.class); + k8sSupplier = Mockito.mock(Supplier.class); + + // Default behavior: return valid tokens + when(k8sSupplier.get()).thenReturn(K8S_TOKEN_HEADER); + when(fallbackSupplier.get()).thenReturn(FALLBACK_TOKEN_HEADER); + + final M2MInterceptor interceptor = new M2MInterceptor(urlCache, fallbackSupplier, k8sSupplier); + + client = new OkHttpClient.Builder() + .addInterceptor(interceptor) + .build(); + } + + @AfterEach + void afterEach() { + wireMockServer.stop(); + System.clearProperty("security.m2m.kubernetes.enabled"); + } + + @Test + @SneakyThrows + void kubernetesTokenAuth_Success() { + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200))); + + try (Response response = client.newCall(buildRequest()).execute()) { + assertEquals(200, response.code()); + } + + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT))); + } + + @Test + @SneakyThrows + void keycloakTokenAuth_UnauthorizedFallback() { + // 1. First call with K8s token returns 401 + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(401))); + + // 2. Fallback call with Keycloak token returns 200 + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200))); + + try (Response response = client.newCall(buildRequest()).execute()) { + assertEquals(200, response.code()); + } + + // Verify both requests were made + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + + // 3. Second call should go STRAIGHT to fallback because URL is now cached as "non-k8s" + try (Response response = client.newCall(buildRequest()).execute()) { + assertEquals(200, response.code()); + } + + // Total count for fallback should be 2, but K8s should still be 1 + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(2, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + } + + @Test + @SneakyThrows + void kubernetesTokenAcquisitionError_Fallback() { + // Simulate acquisition error + when(k8sSupplier.get()).thenThrow(new IllegalStateException("K8s failed")); + + stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200))); + + try (Response response = client.newCall(buildRequest()).execute()) { + assertEquals(200, response.code()); + } + + // Verify it never tried K8s at the network level and went straight to fallback + verify(0, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)).withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + } + + @Test + @SneakyThrows + void bothTokensEmpty_ThrowsException() { + when(k8sSupplier.get()).thenReturn(""); + when(fallbackSupplier.get()).thenReturn(""); + + var call = client.newCall(buildRequest()); + assertThrows(IllegalStateException.class, call::execute); + } + + private Request buildRequest() { + return new Request.Builder() + .url(wireMockServer.baseUrl() + TEST_ENDPOINT) + .get() + .build(); + } + + @Test + @SneakyThrows + void fallbackUrl_RebasesHostWhenFallbackOccurs() { + WireMockServer fallbackServer = new WireMockServer(0); + fallbackServer.start(); + WireMock.configureFor("localhost", fallbackServer.port()); + + fallbackServer.stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(200))); + + wireMockServer.stubFor(get(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER)) + .willReturn(aResponse().withStatus(401))); + + UrlCache urlCache = new UrlCache(TEST_CACHE_SIZE, TEST_CACHE_DURATION_SEC); + String fallbackBaseUrl = "http://localhost:" + fallbackServer.port(); + + M2MInterceptor interceptor = new M2MInterceptor(urlCache, fallbackSupplier, k8sSupplier, fallbackBaseUrl); + OkHttpClient clientWithFallbackUrl = new OkHttpClient.Builder() + .addInterceptor(interceptor) + .build(); + + Request request = new Request.Builder() + .url(wireMockServer.baseUrl() + TEST_ENDPOINT) + .get() + .build(); + + try (Response response = clientWithFallbackUrl.newCall(request).execute()) { + assertEquals(200, response.code()); + } + + wireMockServer.verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(K8S_TOKEN_HEADER))); + fallbackServer.verify(1, getRequestedFor(urlEqualTo(TEST_ENDPOINT)) + .withHeader("Authorization", equalTo(FALLBACK_TOKEN_HEADER))); + + fallbackServer.stop(); + } +} diff --git a/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java new file mode 100644 index 000000000..a450fe4dd --- /dev/null +++ b/core-utils/k8s/src/test/java/com/netcracker/cloud/security/core/utils/k8s/impl/UrlCacheTest.java @@ -0,0 +1,38 @@ +package com.netcracker.cloud.security.core.utils.k8s.impl; + +import org.junit.jupiter.api.Test; + +import static com.netcracker.cloud.security.core.utils.k8s.impl.UrlCache.calculateCacheKey; +import static org.junit.jupiter.api.Assertions.*; + +class UrlCacheTest { + + @Test + void calculateCacheKeyTest() { + String key = calculateCacheKey("https://internal-gateway:3030/api/v1/service-a/resource/123"); + assertEquals("internal-gateway:3030/api/v1/service-a", key); + + key = calculateCacheKey("https://internal-gateway:3030/api/v1"); + assertEquals("internal-gateway:3030/api/v1", key); + + key = calculateCacheKey("https://internal-gateway:3030/custom-prefix/api/v2/module-b/action"); + assertEquals("internal-gateway:3030/custom-prefix/api/v2", key); + + key = calculateCacheKey("https://internal-gateway:3030/long/complex/path/v3/target/item"); + assertEquals("internal-gateway:3030/long/complex/path/v3", key); + + key = calculateCacheKey("https://internal-gateway:3030/api/v/resource"); + assertEquals("internal-gateway:3030/api/v/resource", key); + + key = calculateCacheKey("https://internal-gateway:3030/api/vv/resource"); + assertEquals("internal-gateway:3030/api/vv/resource", key); + + key = calculateCacheKey("https://internal-gateway:3030/api/v1/service?query=param&data=true"); + assertEquals("internal-gateway:3030/api/v1/service", key); + + key = calculateCacheKey("https://external-service:8080/api/v1/resource"); + assertEquals("external-service:8080", key); + + assertThrows(RuntimeException.class, () -> calculateCacheKey("illegal characters here")); + } +} diff --git a/core-utils/k8s/src/test/resources/logback.xml b/core-utils/k8s/src/test/resources/logback.xml index 9fa50918a..473e4e83e 100644 --- a/core-utils/k8s/src/test/resources/logback.xml +++ b/core-utils/k8s/src/test/resources/logback.xml @@ -1,17 +1,19 @@ - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%kvp- %msg%n - + + + + + diff --git a/core-utils/pom.xml b/core-utils/pom.xml index 197cc6e90..808ba2410 100644 --- a/core-utils/pom.xml +++ b/core-utils/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.security.core.utils core-utils-aggregator pom - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT core-utils-aggregator @@ -33,7 +33,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/core-utils/tls/pom.xml b/core-utils/tls/pom.xml index d45ddfb20..536bdd529 100644 --- a/core-utils/tls/pom.xml +++ b/core-utils/tls/pom.xml @@ -3,7 +3,7 @@ core-utils-aggregator com.netcracker.cloud.security.core.utils - 3.1.0-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT ../pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml index 5bb896700..9afb54ec3 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom-internal/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml @@ -21,13 +21,13 @@ 7.0.0 11.20.3 7.7.0 - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT - 7.2.0-SNAPSHOT - 7.1.0-SNAPSHOT - 8.2.0-SNAPSHOT - 3.1.0-SNAPSHOT + 7.2.0-rest-client-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT diff --git a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml index bb87f484f..c24a67b83 100644 --- a/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/dbaas-client-bom/pom.xml @@ -4,7 +4,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-bom-parent/pom.xml b/dbaas-client/dbaas-client-bom-parent/pom.xml index d253e6890..097fb436f 100644 --- a/dbaas-client/dbaas-client-bom-parent/pom.xml +++ b/dbaas-client/dbaas-client-bom-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml index 7b4cd1ff8..77ee8de5a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml index 18a503fe4..70852ed7a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-arangodb-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml index 7bb26abbc..d796d8537 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml index 7602811e7..9a05d749a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml index b6121aea2..ece6cc6c6 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-migration/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml index 62612aeb1..bc82db3cd 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-cassandra-starter/pom.xml @@ -7,7 +7,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent diff --git a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml index 6ed68cea5..312133b15 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml index 32f6c893a..457bfb49a 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-clickhouse-starter/pom.xml @@ -3,7 +3,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml index 48d7840d5..69e976136 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/pom.xml @@ -3,7 +3,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java index cb04b224e..9fb12349c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/DbaasClientImpl.java @@ -38,21 +38,21 @@ public class DbaasClientImpl implements DbaasClient { private final MicroserviceRestClient dbaasRestClient; private final RetryTemplate retryTemplate; private final RetryTemplate awaitAsyncDbCreationRetryTemplate; - private final String dbaasAgentHost; + private final String dbaasHost; private final ClassifierChecker classifierChecker; private static final String RECEIVED_RESPONSE = "Received response {}"; - public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, String dbaasAgentHost) { - this(dbaasRestClient, null, dbaasAgentHost); + public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, String dbaasHost) { + this(dbaasRestClient, null, dbaasHost); } - public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, String dbaasAgentHost) { - this(dbaasRestClient, retryTemplate, null, dbaasAgentHost); + public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, String dbaasHost) { + this(dbaasRestClient, retryTemplate, null, dbaasHost); } - public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, RetryTemplate awaitAsyncDbCreationRetryTemplate, String dbaasAgentHost) { + public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate retryTemplate, RetryTemplate awaitAsyncDbCreationRetryTemplate, String dbaasHost) { Objects.requireNonNull(dbaasRestClient); - Objects.requireNonNull(dbaasAgentHost); + Objects.requireNonNull(dbaasHost); if (retryTemplate == null) { retryTemplate = getDefaultRetryTemplate(); } @@ -61,7 +61,7 @@ public DbaasClientImpl(MicroserviceRestClient dbaasRestClient, RetryTemplate ret } this.dbaasRestClient = dbaasRestClient; this.retryTemplate = retryTemplate; - this.dbaasAgentHost = dbaasAgentHost; + this.dbaasHost = dbaasHost; this.awaitAsyncDbCreationRetryTemplate = awaitAsyncDbCreationRetryTemplate; classifierChecker = new ClassifierChecker(); } @@ -88,7 +88,7 @@ private void rethrowException(MicroserviceRestClientException restException, Str @Nullable public PhysicalDatabases getPhysicalDatabases(String type) throws DbaasException, DbaasUnavailableException { - URI uri = new UriTemplate(dbaasAgentHost + GET_PHYSICAL_DATABASES_TEMPLATE_ENDPOINT).expand(type); + URI uri = new UriTemplate(dbaasHost + GET_PHYSICAL_DATABASES_TEMPLATE_ENDPOINT).expand(type); try { return this.retryTemplate.execute( context -> getPhysicalDatabaseExecuteRequest(uri)); @@ -117,7 +117,7 @@ public > D getOrCreateDatabase(DatabaseType databaseClass = type.getDatabaseClass(); try { - URI uri = new UriTemplate(dbaasAgentHost + ASYNC_CREATE_DATABASE_TEMPLATE_ENDPOINT).expand(namespace); + URI uri = new UriTemplate(dbaasHost + ASYNC_CREATE_DATABASE_TEMPLATE_ENDPOINT).expand(namespace); String uriString = uri.toString(); return this.retryTemplate.execute( context -> executeCreateDbRequest(uriString, dbCreateRequest, databaseClass) @@ -161,7 +161,7 @@ public > D getDatabase(final DatabaseType HashMap params = new HashMap<>(); params.put(NAMESPACE, namespace); params.put("type", type.getName()); - URI uri = new UriTemplate(dbaasAgentHost + GET_CONNECTION_TEMPLATE_ENDPOINT).expand(params); + URI uri = new UriTemplate(dbaasHost + GET_CONNECTION_TEMPLATE_ENDPOINT).expand(params); try { return this.retryTemplate.execute( context -> executeGetDatabaseRequest(uri, classifier, userRole, databaseClass) @@ -203,7 +203,7 @@ private > D executeGetDatabaseRequest(URI uri, public boolean isAvailable() { try { - URI isAvailableUri = URI.create(dbaasAgentHost + HEALTH_ENDPOINT); + URI isAvailableUri = URI.create(dbaasHost + HEALTH_ENDPOINT); log.debug("Sending isAvailable request to URI: {}", isAvailableUri); RestClientResponseEntity responseEntity = dbaasRestClient.doRequest(isAvailableUri, HttpMethod.GET, @@ -223,7 +223,7 @@ public String toString() { return "DbaasClientImpl{" + "dbaasRestClient=" + dbaasRestClient + ", retryTemplate=" + retryTemplate + - ", dbaasAgentHost='" + dbaasAgentHost + '\'' + + ", dbaasHost='" + dbaasHost + '\'' + '}'; } } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java index c4ffd1a9d..3781a5832 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/DbaasClientConfiguration.java @@ -78,4 +78,3 @@ DbaasClassifierFactory dbaasClassifierFactory(MSInfoProvider msInfoProvider) { return new DbaasClassifierFactory(msInfoProvider); } } - diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java index d71c3687b..eff84933d 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/main/java/com/netcracker/cloud/dbaas/client/config/SpringDbaasApiProperties.java @@ -2,17 +2,27 @@ import lombok.AccessLevel; import lombok.Getter; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import java.util.Optional; +@Slf4j @Getter public class SpringDbaasApiProperties { private static final String DEFAULT_DBAAS_AGENT_URL = "http://dbaas-agent:8080"; @Getter(AccessLevel.NONE) @Value("${dbaas.api.address:#{null}}") - private Optional address; + private Optional dbaasAgentAddress; + + @Getter(AccessLevel.NONE) + @Value("${api.dbaas.address:#{null}}") + private Optional dbaasAddress; + + @Getter(AccessLevel.NONE) + @Value("${security.m2m.kubernetes.enabled:false}") + private boolean k8sEnabled; @Value("${dbaas.api.retry.default.template.maxAttempts:10}") private int dbaasDefaultRetryMaxAttempts; @@ -24,6 +34,13 @@ public class SpringDbaasApiProperties { private int dbaasAsyncRetryTimeoutInS; public String getAddress() { - return address.orElse(DEFAULT_DBAAS_AGENT_URL); + if(!k8sEnabled) { + return dbaasAgentAddress.orElse(DEFAULT_DBAAS_AGENT_URL); + } + if(dbaasAddress.isEmpty()) { + log.warn("DBaaS address is not available, falling back to dbaas-agent. Specify 'api.dbaas.address' property to DBaaS url"); + return dbaasAgentAddress.orElse(DEFAULT_DBAAS_AGENT_URL); + } + return dbaasAddress.get(); } } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/DbaasClientRetryTest.java b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/DbaasClientRetryTest.java index 1dce9d926..01881957c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/DbaasClientRetryTest.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/java/com/netcracker/cloud/dbaas/client/DbaasClientRetryTest.java @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; import java.net.URI; @@ -22,6 +23,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = {TestDbaasCoreConfiguration.class}) +@TestPropertySource(properties = "api.dbaas.address=http://ms-name.namespace:8080") public class DbaasClientRetryTest { @Autowired diff --git a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/resources/application.yml b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/resources/application.yml index 3aefce013..31acfef01 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/resources/application.yml +++ b/dbaas-client/dbaas-client-java/dbaas-client-core/src/test/resources/application.yml @@ -1,3 +1,7 @@ spring: main: - allow-bean-definition-overriding: true \ No newline at end of file + allow-bean-definition-overriding: true + +api: + dbaas: + address: http://ms-name.namespace:8080 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml index 27df3f237..5d8759ffd 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-java-parent/pom.xml @@ -4,7 +4,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml index 130ec869f..a5c9c3fc3 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-light/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml index 5417cb50c..f013ac5f5 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-mongo-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent dbaas-client-mongo-base diff --git a/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml index 80ea62030..e5807b6ea 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-mongo-starter/pom.xml @@ -6,7 +6,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/ 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml index 2ae0acf20..9e43d9c2b 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml index f23f821de..e0aa567e8 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-opensearch-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml index ef267ab20..1d99762b2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml index 7aae02d17..7ddcf5369 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-flyway/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-spring-parent/pom.xml dbaas-client-postgres-flyway diff --git a/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml index 05763fb41..55a696354 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-postgres-starter/pom.xml @@ -5,7 +5,7 @@ dbaas-client-spring-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-spring-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml index 6c6dc3bd1..2460cf4b2 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-redis-base/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml index d84b58775..ea884ee3f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-redis-starter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT dbaas-client-spring-parent ./../dbaas-client-spring-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml index 3ce967a3b..f1e936691 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/pom.xml @@ -3,7 +3,7 @@ dbaas-client-restclient com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 @@ -31,6 +31,11 @@ com.netcracker.cloud.security.core.utils tls-utils + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java index ad19034dd..352553a66 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-resttemplate/src/main/java/com/netcracker/cloud/dbaas/client/restclient/resttemplate/DbaasRestTemplateConfiguration.java @@ -3,10 +3,12 @@ import com.netcracker.cloud.restclient.MicroserviceRestClient; import com.netcracker.cloud.restclient.resttemplate.MicroserviceRestTemplate; import com.netcracker.cloud.restlegacy.resttemplate.configuration.annotation.EnableFrameworkRestTemplate; -import org.springframework.beans.factory.annotation.Qualifier; +import com.netcracker.cloud.security.core.auth.M2MManager; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.client.JdkClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; @Configuration @@ -14,7 +16,8 @@ @ConditionalOnProperty(value = "dbaas.restclient.resttemplate.basic-auth", havingValue = "false", matchIfMissing = true) public class DbaasRestTemplateConfiguration { @Bean("dbaasRestClient") - public MicroserviceRestClient dbaasRestClient(@Qualifier("m2mRestTemplate") RestTemplate restTemplate){ - return new MicroserviceRestTemplate(restTemplate); + public MicroserviceRestClient dbaasRestClient(M2MManager m2MManager){ + var client = M2MClientFactory.getDbaasHttpClient(() -> m2MManager.getToken().getTokenValue()); + return new MicroserviceRestTemplate(new RestTemplate(new JdkClientHttpRequestFactory(client))); } } diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml index ca793b544..d58dd585f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/dbaas-client-webclient/pom.xml @@ -3,7 +3,7 @@ dbaas-client-restclient com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml index 620d1901d..0419ad792 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-restclient/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml index af8a7cbcb..e5f96de1f 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/cassandra-sample-test/pom.xml @@ -4,7 +4,7 @@ dbaas-client-sample-tests com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT cassandra-sample-test diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml index ca48b5820..58ebd735d 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/mongo-sample-test/pom.xml @@ -3,7 +3,7 @@ dbaas-client-sample-tests com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT mongo-sample-test 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml index 8adba8f38..55b3a112b 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/pom.xml @@ -3,7 +3,7 @@ dbaas-client-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../../dbaas-client-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml index f7112fb70..a57c41d75 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-sample-tests/postgres-sample-test/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-sample-tests - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT postgres-sample-test diff --git a/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml index fccbf61a2..f9b23df2c 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-spring-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ./../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml index b406fc816..1c4312bef 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-base-test/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud dbaas-client-test-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml index 8bb0d670b..67668e24d 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/dbaas-client-test-bom/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud dbaas-client-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../../../dbaas-client-parent/pom.xml diff --git a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml index d52e858ce..8fa697568 100644 --- a/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml +++ b/dbaas-client/dbaas-client-java/dbaas-client-test-parent/pom.xml @@ -3,7 +3,7 @@ dbaas-client-java-parent com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../dbaas-client-java-parent/pom.xml 4.0.0 diff --git a/dbaas-client/dbaas-client-java/pom.xml b/dbaas-client/dbaas-client-java/pom.xml index 947a75c73..007dd1e8e 100644 --- a/dbaas-client/dbaas-client-java/pom.xml +++ b/dbaas-client/dbaas-client-java/pom.xml @@ -3,7 +3,7 @@ dbaas-client-root com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 diff --git a/dbaas-client/dbaas-client-parent/pom.xml b/dbaas-client/dbaas-client-parent/pom.xml index b6c57999c..96b6b0396 100644 --- a/dbaas-client/dbaas-client-parent/pom.xml +++ b/dbaas-client/dbaas-client-parent/pom.xml @@ -1,7 +1,7 @@ com.netcracker.cloud - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT 4.0.0 dbaas-client-parent diff --git a/dbaas-client/dbaas-client-report-aggregate/pom.xml b/dbaas-client/dbaas-client-report-aggregate/pom.xml index ccd71cf85..104a31238 100644 --- a/dbaas-client/dbaas-client-report-aggregate/pom.xml +++ b/dbaas-client/dbaas-client-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud dbaas-client-root - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT pom diff --git a/dbaas-client/pom.xml b/dbaas-client/pom.xml index 1a2c05efe..52433d787 100644 --- a/dbaas-client/pom.xml +++ b/dbaas-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud dbaas-client-root - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT pom diff --git a/maas-client-quarkus/maas-client-quarkus-bom/pom.xml b/maas-client-quarkus/maas-client-quarkus-bom/pom.xml index 127287dcd..fd72c6af8 100644 --- a/maas-client-quarkus/maas-client-quarkus-bom/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-bom - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT pom diff --git a/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml b/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml index e1bfae189..e56682e8e 100644 --- a/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-common/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-common-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-common/pom.xml b/maas-client-quarkus/maas-client-quarkus-common/pom.xml index 065f115fc..757a1a029 100644 --- a/maas-client-quarkus/maas-client-quarkus-common/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-common/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml b/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml index 94a40159d..b2e0a5f67 100644 --- a/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-common/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-common-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml b/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml index 92b775383..fecd25b40 100644 --- a/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-kafka/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-kafka-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml b/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml index f4e54ab65..da572bbfe 100644 --- a/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-kafka/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml b/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml index 9f7196a46..160d4b7f9 100644 --- a/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-kafka/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-kafka-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml b/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml index 090ec47d6..679678e05 100644 --- a/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-rabbit/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-rabbit-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml b/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml index eda09165d..50dcad248 100644 --- a/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-rabbit/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml b/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml index 035d7cc66..10ce1767a 100644 --- a/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-rabbit/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-rabbit-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml b/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml index ca72d0d5e..31efd56ed 100644 --- a/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml +++ b/maas-client-quarkus/maas-client-quarkus-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.quarkus maas-client-quarkus-parent - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT pom diff --git a/maas-client-quarkus/pom.xml b/maas-client-quarkus/pom.xml index d80d49d2e..10ed0e882 100644 --- a/maas-client-quarkus/pom.xml +++ b/maas-client-quarkus/pom.xml @@ -5,7 +5,7 @@ pom maas-client-quarkus-parent com.netcracker.cloud.quarkus - 11.0.0-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT @@ -30,9 +30,9 @@ UTF-8 UTF-8 3.33.1 - 10.0.0-SNAPSHOT + 10.0.0-rest-client-SNAPSHOT - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT 3.5.5 diff --git a/maas-client-spring/maas-client-spring-kafka/pom.xml b/maas-client-spring/maas-client-spring-kafka/pom.xml index 6f47840be..4de3e8a42 100644 --- a/maas-client-spring/maas-client-spring-kafka/pom.xml +++ b/maas-client-spring/maas-client-spring-kafka/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-spring/maas-client-spring-rabbit/pom.xml b/maas-client-spring/maas-client-spring-rabbit/pom.xml index b488bfe2c..cc5d4a59a 100644 --- a/maas-client-spring/maas-client-spring-rabbit/pom.xml +++ b/maas-client-spring/maas-client-spring-rabbit/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-spring/maas-client-spring-report-aggregate/pom.xml b/maas-client-spring/maas-client-spring-report-aggregate/pom.xml index aa102a82b..68772eddd 100644 --- a/maas-client-spring/maas-client-spring-report-aggregate/pom.xml +++ b/maas-client-spring/maas-client-spring-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml pom diff --git a/maas-client-spring/maas-client-spring/pom.xml b/maas-client-spring/maas-client-spring/pom.xml index 508d5f6e8..a771f291e 100644 --- a/maas-client-spring/maas-client-spring/pom.xml +++ b/maas-client-spring/maas-client-spring/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-spring-parent - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client-spring/pom.xml b/maas-client-spring/pom.xml index f78f04f3b..9dec70d57 100644 --- a/maas-client-spring/pom.xml +++ b/maas-client-spring/pom.xml @@ -4,7 +4,7 @@ maas-client-spring-parent com.netcracker.cloud.maas.client - 9.1.0-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT pom @@ -19,8 +19,8 @@ 21 21 UTF-8 - 12.2.0-SNAPSHOT - 3.1.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT 0.8.14 ${project.basedir}/../maas-client-spring-report-aggregate/target/site/jacoco-aggregate/jacoco.xml @@ -53,7 +53,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/maas-client/bom/pom.xml b/maas-client/bom/pom.xml index ee6142825..3033d73a6 100644 --- a/maas-client/bom/pom.xml +++ b/maas-client/bom/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-bom - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT pom maas-client-bom diff --git a/maas-client/client/pom.xml b/maas-client/client/pom.xml index 30fada87f..0324d0a94 100644 --- a/maas-client/client/pom.xml +++ b/maas-client/client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml @@ -53,6 +53,11 @@ org.slf4j slf4j-api + + com.netcracker.cloud.security.core.utils + k8s-utils + 3.1.0-rest-client-SNAPSHOT + diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java index c14809c8a..17c9971b7 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/ApiUrlProvider.java @@ -9,11 +9,11 @@ public class ApiUrlProvider { @Getter private final ServerApiVersion serverApiVersion; - private final String maasAgentUrl; + private final String maasUrl; - public ApiUrlProvider(ServerApiVersion serverApiVersion, String maasAgentUrl) { + public ApiUrlProvider(ServerApiVersion serverApiVersion, String maasUrl) { this.serverApiVersion = serverApiVersion; - this.maasAgentUrl = maasAgentUrl; + this.maasUrl = maasUrl; } public String getKafkaTopicUrl(OnTopicExists onTopicExists) { @@ -37,7 +37,7 @@ public String getKafkaTopicSearchUrl() { } public String getKafkaTopicWatchCreateUrl(Duration timeout) { - return String.format("%s/api/v2/kafka/topic/watch-create?timeout=%ds", maasAgentUrl, timeout.getSeconds()); + return String.format("%s/api/v2/kafka/topic/watch-create?timeout=%ds", maasUrl, timeout.getSeconds()); } public String getKafkaTopicGetByClassifierUrl() { @@ -63,8 +63,8 @@ public String getRabbitVhostGetByClassifierUrl(boolean extended) { private String getBaseUrl() { // from 2.16 maas api version v1 is deprecated and must be avoided if (serverApiVersion.isCompatible(2, 16)) { - return maasAgentUrl + "/api/v2"; + return maasUrl + "/api/v2"; } - return maasAgentUrl + "/api/v1"; + return maasUrl + "/api/v1"; } } diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java index c9aa5694c..3e32738e0 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/Env.java @@ -23,20 +23,32 @@ public class Env { static final String ENV_CLOUD_NAMESPACE = "CLOUD_NAMESPACE"; static final String ENV_ORIGIN_NAMESPACE = "ORIGIN_NAMESPACE"; static final String ENV_MICROSERVICE_NAME = "MICROSERVICE_NAME"; + static final String ENV_K8S_ENABLED = "SECURITY_M2M_KUBERNETES_ENABLED"; public static final String PROP_CLOUD_NAMESPACE = "cloud.microservice.namespace"; public static final String PROP_NAMESPACE = "maas.client.classifier.namespace"; //todo deprecated - delete in the next major release public static final String PROP_ORIGIN_NAMESPACE = "origin_namespace"; //todo change to 'origin.namespace' - public static final String PROP_API_URL = "maas.client.api.url"; + public static final String PROP_MAAS_AGENT_URL = "maas.client.api.url"; + public static final String PROP_MAAS_URL = "maas.internal.address"; public static final String PROP_API_AUTH = "maas.client.api.auth"; public static final String PROP_TENANT_MANAGER_URL = "maas.client.tenant-manager.url"; public static final String PROP_TENANT_MANAGER_RECONNECT_TIMEOUT = "maas.client.tenant-manager.reconnect-timeout"; public static final String PROP_HTTP_TIMEOUT = "maas.http.timeout"; public static String apiUrl() { - return stringProperty(PROP_API_URL) + boolean k8sEnabled = Boolean.parseBoolean(System.getenv().get(ENV_K8S_ENABLED)); + String maasAgentUrl = stringProperty(PROP_MAAS_AGENT_URL) .map(Env::normalizeUrl) .orElse(addr2http("maas-agent")); + if(!k8sEnabled) { + return maasAgentUrl; + } + return stringProperty(PROP_MAAS_URL) + .map(Env::normalizeUrl) + .orElseGet(() -> { + log.warn("MaaS address is not available, falling back to maas-agent. Specify '{}'property to MaaS url", PROP_MAAS_URL); + return maasAgentUrl; + }); } public static String apiAuth() { diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java index 49a66ad8e..e8717678b 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/MaaSAPIClientImpl.java @@ -20,14 +20,14 @@ public class MaaSAPIClientImpl implements MaaSAPIClient { private final ApiUrlProvider apiProvider; public MaaSAPIClientImpl(Supplier tokenSupplier) { - this.restClient = new HttpClient(tokenSupplier); + this.restClient = HttpClient.getMaasClient(tokenSupplier); this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl()); - this.tenantManagerConnector = new Lazy<>(() -> new TenantManagerConnectorImpl(restClient)); + this.tenantManagerConnector = new Lazy<>(() -> new TenantManagerConnectorImpl(HttpClient.getM2mClient(tokenSupplier))); this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl()); } public MaaSAPIClientImpl(Supplier tokenSupplier, TenantManagerConnector tenantManagerConnector, BlueGreenStatePublisher statePublisher) { - this.restClient = new HttpClient(tokenSupplier); + this.restClient = HttpClient.getMaasClient(tokenSupplier); this.serverApiVersion = new ServerApiVersion(restClient, Env.apiUrl()); this.tenantManagerConnector = new Lazy<>(() -> tenantManagerConnector); this.apiProvider = new ApiUrlProvider(serverApiVersion, Env.apiUrl()); diff --git a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java index a7b2f366d..c19152069 100644 --- a/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java +++ b/maas-client/client/src/main/java/com/netcracker/cloud/maas/client/impl/http/HttpClient.java @@ -2,6 +2,7 @@ import com.netcracker.cloud.context.propagation.core.RequestContextPropagation; import com.netcracker.cloud.maas.client.impl.Env; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import okhttp3.OkHttpClient; import okhttp3.Request; @@ -10,16 +11,21 @@ public class HttpClient { private final OkHttpClient httpClient; - public HttpClient(Supplier tokenSupplier) { - this.httpClient = new OkHttpClient.Builder() + public static HttpClient getM2mClient(Supplier tokenSupplier) { + return new HttpClient(M2MClientFactory.getM2mOkHttpClient(tokenSupplier)); + } + + public static HttpClient getMaasClient(Supplier tokenSupplier) { + return new HttpClient(M2MClientFactory.getMaasOkHttpClient(tokenSupplier)); + } + + private HttpClient(OkHttpClient client) { + this.httpClient = client.newBuilder() .addInterceptor(chain -> { Request.Builder reqBuilder = chain.request().newBuilder(); // dump context RequestContextPropagation.populateResponse((key, value) -> reqBuilder.header(key, String.valueOf(value))); - - // add authorization token - reqBuilder.header("Authorization", Env.apiAuth() + " " + tokenSupplier.get()); Env.namespaceOpt().ifPresent(ns -> reqBuilder.header("X-Origin-Namespace", ns)); // process request diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java index 31048b5ad..205e9ed5b 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/EnvTest.java @@ -11,25 +11,38 @@ class EnvTest { @Test void testApiUrl() { - withProp(Env.PROP_API_URL, null, () -> + withProp(Env.PROP_MAAS_AGENT_URL, null, () -> assertEquals("http://maas-agent:8080", Env.apiUrl()) ); } @Test void testApiUrlOverride() { - withProp(Env.PROP_API_URL, "http://localhost:8080/", () -> + withProp(Env.PROP_MAAS_AGENT_URL, "http://localhost:8080/", () -> assertEquals("http://localhost:8080", Env.apiUrl()) ); } @Test void testApiUrlWrongOverride() { - withProp(Env.PROP_API_URL, "localhost:8080", () -> - assertThrows(IllegalArgumentException.class, () -> Env.apiUrl()) + withProp(Env.PROP_MAAS_AGENT_URL, "localhost:8080", () -> + assertThrows(IllegalArgumentException.class, Env::apiUrl) ); } + @Test + void testApiUrlK8sEnabled() throws Exception { + withEnvironmentVariable(Env.ENV_K8S_ENABLED, "true") + .execute(() -> { + withProp(Env.PROP_MAAS_AGENT_URL, null, () -> + assertEquals("http://maas-agent:8080", Env.apiUrl()) + ); + withProp(Env.PROP_MAAS_URL, "http://localhost:8080/", () -> + assertEquals( "http://localhost:8080", Env.apiUrl()) + ); + }); + } + @Test void testTenantManagerReconnectTimeoutDefaults() { withProp(Env.PROP_TENANT_MANAGER_RECONNECT_TIMEOUT, null, () -> diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java index fa0809339..9632c8636 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/apiversion/ServerApiVersionTest.java @@ -2,6 +2,7 @@ import com.netcracker.cloud.maas.client.Utils; import com.netcracker.cloud.maas.client.impl.http.HttpClient; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockserver.integration.ClientAndServer; @@ -50,7 +51,8 @@ private ServerApiVersion setup(ClientAndServer mockServer, String version) { .withBody(Utils.readResourceAsString("api-version." + version + ".json")) ); - var httpClient = new HttpClient(() -> "faketoken"); + System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, "http://localhost:" + mockServer.getPort()); + var httpClient = HttpClient.getMaasClient(() -> "faketoken"); return new ServerApiVersion(httpClient, "http://localhost:" + mockServer.getPort()); } } diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java index f02a69d18..8852ec014 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaMaaSClientImplTest.java @@ -17,6 +17,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -546,7 +547,7 @@ public void testGetOrCreateTopicV2(ClientAndServer mockServer) { @Test void testWatchTopicCreate(ClientAndServer mockServer) throws InterruptedException { withProp(Env.PROP_NAMESPACE, "cloud-dev", () -> { - withProp(Env.PROP_API_URL, "http://localhost:" + mockServer.getPort(), () -> { + withProp(Env.PROP_MAAS_AGENT_URL, "http://localhost:" + mockServer.getPort(), () -> { HttpRequest req = request().withMethod("POST").withPath("/api/v2/kafka/topic/watch-create"); ExpectationResponseCallback respWithError = httpRequest -> { @@ -581,7 +582,7 @@ void testWatchTopicCreate(ClientAndServer mockServer) throws InterruptedExceptio @Test void testTopicDeleteSuccess(ClientAndServer mockServer) throws Exception { withProp(Env.PROP_NAMESPACE, "cloud-dev", () -> { - withProp(Env.PROP_API_URL, "http://localhost:" + mockServer.getPort(), () -> { + withProp(Env.PROP_MAAS_AGENT_URL, "http://localhost:" + mockServer.getPort(), () -> { mockServer.when( request().withMethod("DELETE").withPath("/api/v2/kafka/topic"), Times.once() @@ -604,7 +605,7 @@ void testTopicDeleteSuccess(ClientAndServer mockServer) throws Exception { @Test void testTopicDeleteError(ClientAndServer mockServer) throws Exception { withProp(Env.PROP_NAMESPACE, "cloud-dev", () -> { - withProp(Env.PROP_API_URL, "http://localhost:" + mockServer.getPort(), () -> { + withProp(Env.PROP_MAAS_AGENT_URL, "http://localhost:" + mockServer.getPort(), () -> { mockServer.when( request().withMethod("DELETE").withPath("/api/v2/kafka/topic"), @@ -764,7 +765,8 @@ void testSearchTopic(ClientAndServer mockServer) { } private KafkaMaaSClientImpl createKafkaClient(String agentUrl) { - var httpClient = new HttpClient(() -> "faketoken"); + System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); + var httpClient = HttpClient.getMaasClient(() -> "faketoken"); var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); return new KafkaMaaSClientImpl( diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java index 58af89501..6920aa8c1 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/kafka/KafkaWatchTenantTopicsTest.java @@ -5,6 +5,7 @@ import com.netcracker.cloud.maas.client.impl.Env; import com.netcracker.cloud.maas.client.impl.apiversion.ServerApiVersion; import com.netcracker.cloud.maas.client.impl.http.HttpClient; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import com.netcracker.cloud.tenantmanager.client.impl.TenantManagerConnectorImpl; import com.netcracker.cloud.testharness.MaaSCocoonExtension; import com.netcracker.cloud.testharness.TenantManagerMockInject; @@ -50,13 +51,15 @@ public void resetMOckServer(ClientAndServer mockServer) { @Test public void testWatchEvents(ClientAndServer mockServer) throws Exception { withProp(Env.PROP_NAMESPACE, "core-dev", () -> { - HttpClient httpClient = new HttpClient(() -> "faketoken"); - var agentUrl = "http://localhost:" + mockServer.getPort(); + var agentUrl = "http://localhost:" + mockServer.getPort(); + System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); + + HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken"); var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( httpClient, - () -> new TenantManagerConnectorImpl(tmMock.getUrl(), httpClient), + () -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken")), new ApiUrlProvider(serverApiVersion, agentUrl)); BlockingQueue> events = new LinkedBlockingDeque<>(); @@ -130,11 +133,13 @@ public void testWatchEvents(ClientAndServer mockServer) throws Exception { @Test public void testWatchEvents_ButTopicsNotFoundInMaaS(ClientAndServer mockServer) throws Exception { withProp(Env.PROP_NAMESPACE, "core-dev", () -> { - HttpClient httpClient = new HttpClient(() -> "faketoken"); - var agentUrl = "http://localhost:" + mockServer.getPort(); + var agentUrl = "http://localhost:" + mockServer.getPort(); + System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); + + HttpClient httpClient = HttpClient.getMaasClient(() -> "faketoken"); KafkaMaaSClientImpl client = new KafkaMaaSClientImpl( httpClient, - () -> new TenantManagerConnectorImpl(tmMock.getUrl(), httpClient), + () -> new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken")), new ApiUrlProvider(new ServerApiVersion(httpClient, agentUrl), agentUrl)); BlockingQueue> events = new LinkedBlockingDeque<>(); diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java index 6badea5fb..b495afb8c 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/maas/client/impl/rabbit/RabbitMaaSClientImplTest.java @@ -7,6 +7,7 @@ import com.netcracker.cloud.maas.client.impl.Env; import com.netcracker.cloud.maas.client.impl.apiversion.ServerApiVersion; import com.netcracker.cloud.maas.client.impl.http.HttpClient; +import com.netcracker.cloud.security.core.utils.k8s.M2MClientFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -217,7 +218,8 @@ public void testVersionedQueueName1() { } private RabbitMaaSClientImpl createRabbitClient(String agentUrl) { - var httpClient = new HttpClient(() -> "faketoken"); + System.setProperty(M2MClientFactory.MAAS_AGENT_URL_PROP, agentUrl); + var httpClient = HttpClient.getMaasClient(() -> "faketoken"); var serverApiVersion = new ServerApiVersion(httpClient, agentUrl); return new RabbitMaaSClientImpl(httpClient, new ApiUrlProvider(serverApiVersion, agentUrl)); diff --git a/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java b/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java index dac2283d9..4596bf1c2 100644 --- a/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java +++ b/maas-client/client/src/test/java/com/netcracker/cloud/tenantmanager/client/impl/TenantManagerConnectorImplTest.java @@ -31,7 +31,7 @@ class TenantManagerConnectorImplTest { @Test public void testApi() throws Exception { BlockingQueue> events = new LinkedBlockingDeque<>(); - try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), new HttpClient(() -> "faketoken"))) { + try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken"))) { client.subscribe(events::add); List tenants = events.poll(1, TimeUnit.SECONDS); assertNotNull(tenants); @@ -66,7 +66,7 @@ public void testApi() throws Exception { public void testReconnect() throws Exception { withProp(Env.PROP_TENANT_MANAGER_RECONNECT_TIMEOUT, "1", () -> { BlockingQueue> events = new LinkedBlockingDeque<>(); - try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), new HttpClient(() -> "faketoken"))) { + try (TenantManagerConnectorImpl client = new TenantManagerConnectorImpl(tmMock.getUrl(), HttpClient.getM2mClient(() -> "faketoken"))) { client.subscribe(events::add); List tenants = events.poll(1, TimeUnit.SECONDS); diff --git a/maas-client/deployment-version-tracker/pom.xml b/maas-client/deployment-version-tracker/pom.xml index 59c5f02ec..7d4e4dfd2 100644 --- a/maas-client/deployment-version-tracker/pom.xml +++ b/maas-client/deployment-version-tracker/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-blue-green-consumer/pom.xml b/maas-client/kafka-blue-green-consumer/pom.xml index 8e6bfe060..815e9acd5 100644 --- a/maas-client/kafka-blue-green-consumer/pom.xml +++ b/maas-client/kafka-blue-green-consumer/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-context-propagation/pom.xml b/maas-client/kafka-context-propagation/pom.xml index da22d52fe..688497983 100644 --- a/maas-client/kafka-context-propagation/pom.xml +++ b/maas-client/kafka-context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/kafka-streams-adapter/pom.xml b/maas-client/kafka-streams-adapter/pom.xml index 878ad29e4..cb0f9bc5a 100644 --- a/maas-client/kafka-streams-adapter/pom.xml +++ b/maas-client/kafka-streams-adapter/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/pom.xml b/maas-client/pom.xml index 7fd992438..5039ede7b 100644 --- a/maas-client/pom.xml +++ b/maas-client/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT pom @@ -19,8 +19,8 @@ 21 21 UTF-8 - 8.2.0-SNAPSHOT - 2.1.0-SNAPSHOT + 8.2.0-rest-client-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT 4.2.0 @@ -72,7 +72,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/maas-client/rabbit-blue-green/pom.xml b/maas-client/rabbit-blue-green/pom.xml index f44876607..7128ce439 100644 --- a/maas-client/rabbit-blue-green/pom.xml +++ b/maas-client/rabbit-blue-green/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/rabbit-context-propagation/pom.xml b/maas-client/rabbit-context-propagation/pom.xml index 7cb1705b7..a8fd23833 100644 --- a/maas-client/rabbit-context-propagation/pom.xml +++ b/maas-client/rabbit-context-propagation/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-client/report-aggregate/pom.xml b/maas-client/report-aggregate/pom.xml index a42320059..2abf80adc 100644 --- a/maas-client/report-aggregate/pom.xml +++ b/maas-client/report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-client-parent - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT pom diff --git a/maas-declarative-client-commons/maas-kafka-client/pom.xml b/maas-declarative-client-commons/maas-kafka-client/pom.xml index 4da45e67e..1f627ac67 100644 --- a/maas-declarative-client-commons/maas-kafka-client/pom.xml +++ b/maas-declarative-client-commons/maas-kafka-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.client maas-declarative-kafka-client-parent - 6.1.0-SNAPSHOT + 6.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-commons/pom.xml b/maas-declarative-client-commons/pom.xml index e84db2071..a09d75a95 100644 --- a/maas-declarative-client-commons/pom.xml +++ b/maas-declarative-client-commons/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.client maas-declarative-kafka-client-parent - 6.1.0-SNAPSHOT + 6.1.0-rest-client-SNAPSHOT pom @@ -27,7 +27,7 @@ 3.5.5 4.2.0 - 12.2.0-SNAPSHOT + 12.2.0-rest-client-SNAPSHOT @@ -47,7 +47,7 @@ com.netcracker.cloud core-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml index 55c2f3106..b22d73bc5 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client-report-aggregate/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT pom diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml index 01e7669b8..67f373fac 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/deployment/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-parent - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml index a380058ee..768da2041 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/pom.xml @@ -3,7 +3,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml index f755c86ed..f6e8109d4 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-parent - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java index 48b2d690c..fce4f4131 100644 --- a/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java +++ b/maas-declarative-client-quarkus/maas-kafka-quarkus-client/runtime/src/main/java/com/netcracker/maas/declarative/kafka/quarkus/client/config/MaasKafkaProdClientConfig.java @@ -21,7 +21,7 @@ public class MaasKafkaProdClientConfig { @Singleton @Produces KafkaMaaSClient kafkaMaaSClient(MaasKafkaProps props, M2MManager m2mManager) { - HttpClient httpClient = new HttpClient(() -> m2mManager.getToken().getTokenValue()); + HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue()); return new KafkaMaaSClientImpl( httpClient, () -> new TenantManagerConnectorImpl(httpClient), @@ -41,7 +41,7 @@ MaasKafkaTopicServiceProvider maasKafkaTopicServiceProvider(KafkaMaaSClient kafk @Produces @DefaultBean InternalTenantService internalTenantService(M2MManager m2mManager) { - HttpClient httpClient = new HttpClient(() -> m2mManager.getToken().getTokenValue()); + HttpClient httpClient = HttpClient.getM2mClient(() -> m2mManager.getToken().getTokenValue()); TenantManagerConnectorImpl tenantManagerConnector = new TenantManagerConnectorImpl(httpClient); return new InternalTenantServiceImpl(tenantManagerConnector); } diff --git a/maas-declarative-client-quarkus/pom.xml b/maas-declarative-client-quarkus/pom.xml index 4cc39c8da..451f80ae2 100644 --- a/maas-declarative-client-quarkus/pom.xml +++ b/maas-declarative-client-quarkus/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-quarkus-bom - 9.0.0-SNAPSHOT + 9.0.0-rest-client-SNAPSHOT pom @@ -32,10 +32,10 @@ 3.5.3 5.1.0 - 6.1.0-SNAPSHOT - 11.0.0-SNAPSHOT - 4.0.0-SNAPSHOT - 3.1.0-SNAPSHOT + 6.1.0-rest-client-SNAPSHOT + 11.0.0-rest-client-SNAPSHOT + 4.0.0-rest-client-SNAPSHOT + 3.1.0-rest-client-SNAPSHOT ${project.basedir}/../../maas-kafka-quarkus-client-report-aggregate/target/site/jacoco-aggregate/jacoco.xml @@ -52,7 +52,7 @@ com.netcracker.cloud core-quarkus-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml b/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml index b40f81fd9..f88dba894 100644 --- a/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml +++ b/maas-declarative-client-spring/maas-kafka-spring-client/pom.xml @@ -5,7 +5,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-spring-bom - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT ../pom.xml diff --git a/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java b/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java index 46d95d69c..7dae07738 100644 --- a/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java +++ b/maas-declarative-client-spring/maas-kafka-spring-client/src/main/java/com/netcracker/maas/declarative/kafka/spring/client/config/MaasKafkaProdClientConfig.java @@ -29,12 +29,12 @@ public class MaasKafkaProdClientConfig { @Bean HttpClient maasHttpClient(@Autowired M2MManager m2MManager) { - return new HttpClient(() -> m2MManager.getToken().getTokenValue()); + return HttpClient.getMaasClient(() -> m2MManager.getToken().getTokenValue()); } @Bean - TenantManagerConnector tenantManagerConnector(HttpClient httpClient) { - return new TenantManagerConnectorImpl(httpClient); + TenantManagerConnector tenantManagerConnector(@Autowired M2MManager m2MManager) { + return new TenantManagerConnectorImpl(HttpClient.getM2mClient(() -> m2MManager.getToken().getTokenValue())); } @Bean diff --git a/maas-declarative-client-spring/pom.xml b/maas-declarative-client-spring/pom.xml index 658275eae..9895e87b0 100644 --- a/maas-declarative-client-spring/pom.xml +++ b/maas-declarative-client-spring/pom.xml @@ -4,7 +4,7 @@ com.netcracker.cloud.maas.declarative maas-declarative-kafka-client-spring-bom - 7.1.0-SNAPSHOT + 7.1.0-rest-client-SNAPSHOT pom @@ -26,9 +26,9 @@ 21 21 - 6.1.0-SNAPSHOT - 9.1.0-SNAPSHOT - 2.1.0-SNAPSHOT + 6.1.0-rest-client-SNAPSHOT + 9.1.0-rest-client-SNAPSHOT + 2.1.0-rest-client-SNAPSHOT @@ -36,7 +36,7 @@ com.netcracker.cloud core-spring-internal-bom - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 804745b59..f8d5d43db 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.netcracker.cloud qubership-core-java-libs - 1.0.0-SNAPSHOT + 1.0.0-rest-client-SNAPSHOT pom Monorepo Aggregator