ensure http client is closed after use

Signed-off-by: Andre Dietisheim <[email protected]>
fabric8io · Aug 30, 2024 · a06f1b7 · a06f1b7
1 parent 0e4baf0
commit a06f1b7
Showing 1 changed file with 37 additions and 36 deletions.
diff --git a/...-client/src/main/java/io/fabric8/openshift/client/internal/OpenShiftOAuthInterceptor.java b/...-client/src/main/java/io/fabric8/openshift/client/internal/OpenShiftOAuthInterceptor.java
@@ -85,52 +85,53 @@ protected boolean useRemoteRefresh(Config newestConfig) {
   }
 
   private static CompletableFuture<String> authorize(Config config, HttpClient client) {
-    HttpClient.DerivedClientBuilder builder = client.newBuilder();
-    builder.addOrReplaceInterceptor(TokenRefreshInterceptor.NAME, null);
-    HttpClient clone = builder.build();
-
-    URL url;
-    try {
-      url = new URL(URLUtils.join(config.getMasterUrl(), AUTHORIZATION_SERVER_PATH));
-    } catch (MalformedURLException e) {
-      throw KubernetesClientException.launderThrowable(e);
-    }
-    CompletableFuture<HttpResponse<String>> responseFuture = clone.sendAsync(clone.newHttpRequestBuilder().url(url).build(),
-        String.class);
-    return responseFuture.thenCompose(response -> {
-      if (!response.isSuccessful() || response.body() == null) {
-        throw new KubernetesClientException("Unexpected response (" + response.code() + " " + response.message() + ")");
-      }
+    try (HttpClient clone = client.newBuilder()
+      .addOrReplaceInterceptor(TokenRefreshInterceptor.NAME, null)
+      .build()) {
 
-      String body = response.body();
+      URL url;
       try {
-        Map<String, Object> jsonResponse = Serialization.unmarshal(body, Map.class);
-        String authorizationServer = String.valueOf(jsonResponse.get("authorization_endpoint"));
+        url = new URL(URLUtils.join(config.getMasterUrl(), AUTHORIZATION_SERVER_PATH));
+      } catch (MalformedURLException e) {
+        throw KubernetesClientException.launderThrowable(e);
+      }
+      CompletableFuture<HttpResponse<String>> responseFuture = clone.sendAsync(clone.newHttpRequestBuilder().url(url).build(),
+        String.class);
+      return responseFuture.thenCompose(response -> {
+        if (!response.isSuccessful() || response.body() == null) {
+          throw new KubernetesClientException("Unexpected response (" + response.code() + " " + response.message() + ")");
+        }
 
-        URL authorizeQuery = new URL(authorizationServer + AUTHORIZE_QUERY);
-        String credential = HttpClientUtils.basicCredentials(config.getUsername(), config.getPassword());
+        String body = response.body();
+        try {
+          Map<String, Object> jsonResponse = Serialization.unmarshal(body, Map.class);
+          String authorizationServer = String.valueOf(jsonResponse.get("authorization_endpoint"));
 
-        return clone.sendAsync(client.newHttpRequestBuilder().url(authorizeQuery).setHeader(AUTHORIZATION, credential).build(),
+          URL authorizeQuery = new URL(authorizationServer + AUTHORIZE_QUERY);
+          String credential = HttpClientUtils.basicCredentials(config.getUsername(), config.getPassword());
+
+          return clone.sendAsync(client.newHttpRequestBuilder().url(authorizeQuery).setHeader(AUTHORIZATION, credential).build(),
             String.class);
-      } catch (Exception e) {
-        throw KubernetesClientException.launderThrowable(e);
-      }
+        } catch (Exception e) {
+          throw KubernetesClientException.launderThrowable(e);
+        }
 
-    }).thenApply(response -> {
-      HttpResponse<?> responseOrPrevious = response.previousResponse().isPresent() ? response.previousResponse().get()
+      }).thenApply(response -> {
+        HttpResponse<?> responseOrPrevious = response.previousResponse().isPresent() ? response.previousResponse().get()
           : response;
 
-      List<String> location = responseOrPrevious.headers(LOCATION);
-      String token = !location.isEmpty() ? location.get(0) : null;
-      if (token == null || token.isEmpty()) {
-        throw new KubernetesClientException("Unexpected response (" + responseOrPrevious.code() + " "
+        List<String> location = responseOrPrevious.headers(LOCATION);
+        String token = !location.isEmpty() ? location.get(0) : null;
+        if (token == null || token.isEmpty()) {
+          throw new KubernetesClientException("Unexpected response (" + responseOrPrevious.code() + " "
             + responseOrPrevious.message() + "), to the authorization request. Missing header:[" + LOCATION
             + "].  More than likely the username / password are not correct.");
-      }
-      token = token.substring(token.indexOf(BEFORE_TOKEN) + BEFORE_TOKEN.length());
-      token = token.substring(0, token.indexOf(AFTER_TOKEN));
-      return token;
-    });
+        }
+        token = token.substring(token.indexOf(BEFORE_TOKEN) + BEFORE_TOKEN.length());
+        token = token.substring(0, token.indexOf(AFTER_TOKEN));
+        return token;
+      });
+    }
   }
 
   @Override