fix: discovery fail when at least one api is unavailable

Author: rossignolloic

util/src/main/java/io/kubernetes/client/Discovery.java

@@ -32,9 +32,12 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import okhttp3.Call;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Discovery {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(Discovery.class);
   private final ApiClient apiClient;
 
   public Discovery() {
@@ -60,16 +63,18 @@ public Set<APIResource> findAll() throws ApiException {
     return allResources;
   }
 
-  public Set<APIResource> findAll(String group, List<String> versions, String preferredVersion)
-      throws ApiException {
+  public Set<APIResource> findAll(String group, List<String> versions, String preferredVersion) {
     return findAll(group, versions, preferredVersion, "/apis/" + group + "/" + preferredVersion);
   }
 
-  public Set<APIResource> findAll(
-      String group, List<String> versions, String preferredVersion, String path)
-      throws ApiException {
-    V1APIResourceList resourceList = resourceDiscovery(path);
-    return groupResourcesByName(group, versions, preferredVersion, resourceList);
+  public Set<APIResource> findAll(String group, List<String> versions, String preferredVersion, String path) {
+    try {
+      V1APIResourceList resourceList = resourceDiscovery(path);
+      return groupResourcesByName(group, versions, preferredVersion, resourceList);
+    } catch (ApiException e) {
+      LOGGER.warn("Api {} returns a {} code, all api resources managed by this api cannot be discovered", path, e.getCode(), e);
+      return Collections.emptySet();
+    }
   }
 
   public Set<APIResource> groupResourcesByName(

util/src/test/java/io/kubernetes/client/DiscoveryTest.java

@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertEquals;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import io.kubernetes.client.Discovery.APIResource;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.models.V1APIResource;
@@ -28,6 +29,7 @@
 import io.kubernetes.client.util.ClientBuilder;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Rule;
@@ -101,4 +103,53 @@ public void testGroupResourcesByName() {
     assertEquals(true, meow.getNamespaced());
     assertEquals("mouse", meow.getSubResources().get(0));
   }
+
+  @Test
+  public void findAllShouldReturnAllApiResourceWhenApiResponseIsSuccess() {
+    Discovery discovery = new Discovery(apiClient);
+
+    String group = "test.com";
+    String version = "v1";
+    String path="/apis/"+group+'/'+version;
+
+    wireMockRule.stubFor(
+        get(urlPathEqualTo(path))
+            .willReturn(
+                aResponse()
+                    .withStatus(200)
+                    .withHeader("Content-Type", "application/json")
+                    .withBody(
+                        apiClient
+                            .getJSON()
+                            .serialize(new V1APIResourceList()
+                                .resources(
+                                    Arrays.asList(
+                                      new V1APIResource()
+                                        .name("first"),
+                                      new V1APIResource()
+                                        .name("second")))))));
+
+    Set<APIResource> apiResources = discovery.findAll(group, List.of(version), version);
+    wireMockRule.verify(1, getRequestedFor(urlPathEqualTo(path)));
+    assertEquals(2, apiResources.size());
+  }
+
+  @Test
+  public void findAllShouldReturnEmptyListWhenApiResponseIsNotSuccess() {
+    Discovery discovery = new Discovery(apiClient);
+
+    String group = "test.com";
+    String version = "v1";
+    String path="/apis/"+group+'/'+version;
+
+    wireMockRule.stubFor(
+        get(urlPathEqualTo(path))
+            .willReturn(
+                aResponse()
+                    .withStatus(503)));
+
+    Set<APIResource> apiResources = discovery.findAll(group, List.of(version), version);
+    wireMockRule.verify(1, getRequestedFor(urlPathEqualTo(path)));
+    assertEquals(0, apiResources.size());
+  }
 }