review(config): support for multiple files listed in the KUBECONFIG e…

…nv var

Signed-off-by: Marc Nuri <marc@marcnuri.com>

CHANGELOG.md

@@ -15,7 +15,7 @@
 * Fix #6281: use GitHub binary repo for Kube API Tests
 * Fix #6282: Allow annotated types with Pattern, Min, and Max with Lists and Maps and CRD generation
 * Fix #5480: Move `io.fabric8:zjsonpatch` to KubernetesClient project
-* Fix #6240: Use kubeconfig files listed in the KUBECONFIG env var
+* Fix #6240: Support for multiple files listed in the KUBECONFIG env var
 
 #### Dependency Upgrade
 * Fix #2632: Bumped OkHttp from 3.12.12 to 4.12.0

kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/ConfigBuilder.java

@@ -57,9 +57,8 @@ public Config build() {
         fluent.getOauthTokenProvider(), fluent.getCustomHeaders(), fluent.getRequestRetryBackoffLimit(),
         fluent.getRequestRetryBackoffInterval(), fluent.getUploadRequestTimeout(), fluent.getOnlyHttpWatches(),
         fluent.getCurrentContext(), fluent.getContexts(),
-        Optional.ofNullable(fluent.getAutoConfigure()).orElse(!disableAutoConfig()), true, fluent.getKubeConfigFiles());
+        Optional.ofNullable(fluent.getAutoConfigure()).orElse(!disableAutoConfig()), true);
     buildable.setAuthProvider(fluent.getAuthProvider());
     return buildable;
   }
-
 }

kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/SundrioConfig.java

@@ -50,15 +50,14 @@ public SundrioConfig(String masterUrl, String apiVersion, String namespace, Bool
       String impersonateUsername, String[] impersonateGroups, Map<String, List<String>> impersonateExtras,
       OAuthTokenProvider oauthTokenProvider, Map<String, String> customHeaders, Integer requestRetryBackoffLimit,
       Integer requestRetryBackoffInterval, Integer uploadRequestTimeout, Boolean onlyHttpWatches, NamedContext currentContext,
-      List<NamedContext> contexts, Boolean autoConfigure, List<KubeConfigFile> kubeConfigFiles) {
+      List<NamedContext> contexts, Boolean autoConfigure) {
     super(masterUrl, apiVersion, namespace, trustCerts, disableHostnameVerification, caCertFile, caCertData,
         clientCertFile, clientCertData, clientKeyFile, clientKeyData, clientKeyAlgo, clientKeyPassphrase, username,
         password, oauthToken, autoOAuthToken, watchReconnectInterval, watchReconnectLimit, connectionTimeout, requestTimeout,
         scaleTimeout, loggingInterval, maxConcurrentRequests, maxConcurrentRequestsPerHost, http2Disable,
         httpProxy, httpsProxy, noProxy, userAgent, tlsVersions, websocketPingInterval, proxyUsername, proxyPassword,
         trustStoreFile, trustStorePassphrase, keyStoreFile, keyStorePassphrase, impersonateUsername, impersonateGroups,
         impersonateExtras, oauthTokenProvider, customHeaders, requestRetryBackoffLimit, requestRetryBackoffInterval,
-        uploadRequestTimeout, onlyHttpWatches, currentContext, contexts, autoConfigure, true, kubeConfigFiles);
+        uploadRequestTimeout, onlyHttpWatches, currentContext, contexts, autoConfigure, true);
   }
-
 }

kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/utils/Utils.java

@@ -36,7 +36,6 @@
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -234,7 +233,7 @@ public static String coalesce(String... items) {
    * Utility method to generate UUIDs.
    * This is taken from Spring Framework's <a href=
    * "https://github.com/spring-projects/spring-framework/blob/a4db0e7448287028d228d46fe7b4df202150958a/spring-core/src/main/java/org/springframework/util/SimpleIdGenerator.java#L35">SimpleIdGenerator</a>
-   * 
+   *
    * @return generated UUID
    */
   public static UUID generateId() {
@@ -292,32 +291,16 @@ public static boolean isNullOrEmpty(String str) {
     return str == null || str.isEmpty();
   }
 
-  public static boolean isNotNullOrEmpty(Map<?, ?> map) {
-    return !isNullOrEmpty(map);
-  }
-
-  public static boolean isNullOrEmpty(Map<?, ?> map) {
-    return map == null || map.isEmpty();
-  }
-
-  public static boolean isNotNullOrEmpty(Collection<?> collection) {
-    return !isNullOrEmpty(collection);
-  }
-
-  public static boolean isNullOrEmpty(Collection<?> collection) {
-    return collection == null || collection.isEmpty();
+  public static boolean isNotNullOrEmpty(Map map) {
+    return !(map == null || map.isEmpty());
   }
 
   public static boolean isNotNullOrEmpty(String str) {
     return !isNullOrEmpty(str);
   }
 
   public static boolean isNotNullOrEmpty(String[] array) {
-    return !isNullOrEmpty(array);
-  }
-
-  public static boolean isNullOrEmpty(String[] array) {
-    return array == null || array.length == 0;
+    return !(array == null || array.length == 0);
   }
 
   public static <T> boolean isNotNull(T... refList) {

kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java

@@ -76,7 +76,7 @@ class ConfigTest {
       .filePath(ConfigTest.class.getResource("/test-kubeconfig-exec-args-with-spaces"));
 
   private static final String TEST_KUBECONFIG_NO_CURRENT_CONTEXT_FILE = Utils
-      .filePath(ConfigTest.class.getResource("/test-kubeconfig-nocurrentctxt.yml"));
+      .filePath(ConfigTest.class.getResource("/test-kubeconfig-nocurrentctxt"));
 
   private static final String TEST_KUBECONFIG_EXEC_FILE_CERT_AUTH = Utils
       .filePath(ConfigTest.class.getResource("/test-kubeconfig-exec-cert-auth"));