chore(spring-zeebe) bump version of spring zeebe to 8.5.7 (#2815)

* chore(spring-zeebe) bump version of spring zeebe to 8.5.7 * chore(spring-zeebe) bump version of spring zeebe to 8.5.7 (necessary changes in the code had to be made) --------- Co-authored-by: Simon <[email protected]>
camunda · Jul 8, 2024 · c29e947 · c29e947
1 parent 9344267
commit c29e947
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/...time-spring/src/main/java/io/camunda/connector/runtime/secret/ConsoleSecretApiClient.java b/...time-spring/src/main/java/io/camunda/connector/runtime/secret/ConsoleSecretApiClient.java
@@ -66,7 +66,7 @@ public Map<String, String> getSecrets() {
     try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
       var request = new HttpGet(secretsEndpoint);
       var authHeader = authentication.getTokenHeader(Product.CONSOLE);
-      request.addHeader(authHeader.getKey(), authHeader.getValue());
+      authHeader.forEach(request::addHeader);
       return httpClient.execute(request, this::handleSecretsResponse);
     } catch (Exception e) {
       throw new RuntimeException(e);

diff --git a/...e-spring/src/test/java/io/camunda/connector/runtime/secret/ConsoleSecretProviderTest.java b/...e-spring/src/test/java/io/camunda/connector/runtime/secret/ConsoleSecretProviderTest.java
@@ -44,16 +44,15 @@ public class ConsoleSecretProviderTest {
 
   static Authentication auth;
 
-  static Map.Entry<String, String> authToken;
+  static Map<String, String> authToken;
 
   static ConsoleSecretApiClient client;
 
   @BeforeAll
   static void beforeAll() {
     // Mock authentication
     auth = Mockito.mock(Authentication.class);
-    authToken =
-        Collections.singletonMap("Authorization", "Bearer XXX").entrySet().iterator().next();
+    authToken = Map.of("Authorization", "Bearer XXX");
     when(auth.getTokenHeader(Product.CONSOLE)).thenReturn(authToken);
 
     client = new ConsoleSecretApiClient(wm.baseUrl() + "/secrets", auth);
@@ -65,7 +64,7 @@ void testSuccessfulSecretsHandling() {
     var secretsResponse = Collections.singletonMap("secretKey", "secretValue");
     wm.stubFor(
         get(urlPathMatching("/secrets"))
-            .withHeader("Authorization", matching(authToken.getValue()))
+            .withHeader("Authorization", matching("Bearer XXX"))
             .willReturn(ResponseDefinitionBuilder.okForJson(secretsResponse)));
 
     // Test the client
@@ -82,7 +81,7 @@ void testFailureOnInitialLoad() {
     // Mock failing response
     wm.stubFor(
         get(urlPathMatching("/secrets"))
-            .withHeader("Authorization", matching(authToken.getValue()))
+            .withHeader("Authorization", matching("Bearer XXX"))
             .willReturn(ResponseDefinitionBuilder.responseDefinition().withStatus(500)));
 
     // Test the client
@@ -95,7 +94,7 @@ void testSuccessfulSecretResolvingInCaseOfFailure() throws InterruptedException
     var secretsResponse = Collections.singletonMap("secretKey", "secretValue");
     wm.stubFor(
         get(urlPathMatching("/secrets"))
-            .withHeader("Authorization", matching(authToken.getValue()))
+            .withHeader("Authorization", matching("Bearer XXX"))
             .willReturn(ResponseDefinitionBuilder.okForJson(secretsResponse)));
 
     var consoleSecretProvider = new ConsoleSecretProvider(client, Duration.ofMillis(1));
@@ -107,7 +106,7 @@ void testSuccessfulSecretResolvingInCaseOfFailure() throws InterruptedException
     // Mock failing response
     wm.stubFor(
         get(urlPathMatching("/secrets"))
-            .withHeader("Authorization", matching(authToken.getValue()))
+            .withHeader("Authorization", matching("Bearer XXX"))
             .willReturn(ResponseDefinitionBuilder.responseDefinition().withStatus(500)));
 
     // Previously cached secret should still be resolved
@@ -120,7 +119,7 @@ void testSuccessfulSecretResolvingInCaseOfFailure() throws InterruptedException
     secretsResponse = Collections.singletonMap("secretKey", "newSecretValue");
     wm.stubFor(
         get(urlPathMatching("/secrets"))
-            .withHeader("Authorization", matching(authToken.getValue()))
+            .withHeader("Authorization", matching("Bearer XXX"))
             .willReturn(ResponseDefinitionBuilder.okForJson(secretsResponse)));
 
     // New secrets should be resolved

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -73,7 +73,7 @@ limitations under the License.</license.inlineheader>
     <!-- Camunda internal libraries -->
     <version.zeebe>8.5.3</version.zeebe>
     <version.feel-engine>1.18.0-alpha1</version.feel-engine>
-    <version.spring-zeebe>8.5.5</version.spring-zeebe>
+    <version.spring-zeebe>8.5.7</version.spring-zeebe>
 
     <!-- Third party dependencies -->