From 93e9baa5d416ecadffdcb7c92ed4af36952ca3f4 Mon Sep 17 00:00:00 2001 From: Dave the Dev Date: Mon, 6 Jul 2026 05:10:20 +0000 Subject: [PATCH] 88: Fix PortainerApiClient import/constructor, replace TrustAllStrategy with lambda --- .../portainer/config/PortainerClientConfig.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/portainer-automation/src/main/java/com/hithomelabs/portainer/config/PortainerClientConfig.java b/portainer-automation/src/main/java/com/hithomelabs/portainer/config/PortainerClientConfig.java index 13d56dc..065ee2d 100644 --- a/portainer-automation/src/main/java/com/hithomelabs/portainer/config/PortainerClientConfig.java +++ b/portainer-automation/src/main/java/com/hithomelabs/portainer/config/PortainerClientConfig.java @@ -6,13 +6,12 @@ import org.apache.hc.client5.http.io.HttpClientConnectionManager; import org.apache.hc.client5.http.ssl.NoopHostnameVerifier; import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory; import org.apache.hc.core5.ssl.SSLContexts; -import org.apache.hc.core5.ssl.TrustAllStrategy; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; -import com.hithomelabs.common.client.PortainerApiClient; +import com.hithomelabs.common.portainer.client.PortainerApiClient; import javax.net.ssl.SSLContext; @@ -22,7 +21,7 @@ public class PortainerClientConfig { @Bean public RestTemplate portainerRestTemplate() throws Exception { SSLContext sslContext = SSLContexts.custom() - .loadTrustMaterial(TrustAllStrategy.INSTANCE) + .loadTrustMaterial((chain, authType) -> true) .build(); SSLConnectionSocketFactory sslSocketFactory = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE); @@ -36,6 +35,8 @@ public class PortainerClientConfig { @Bean public PortainerApiClient portainerApiClient(PortainerAutomationProperties props, RestTemplate portainerRestTemplate) { - return new PortainerApiClient(props.getBaseUrl(), props.getApiKey(), portainerRestTemplate); + PortainerApiClient client = new PortainerApiClient(portainerRestTemplate, props.getBaseUrl()); + client.authenticateWithApiKey(props.getApiKey()); + return client; } }