From 973e610787db8a9cee5da098e2f72672be817aa9 Mon Sep 17 00:00:00 2001
From: wackxu <xushiwei5@huawei.com>
Date: Thu, 12 Oct 2017 10:19:28 +0800
Subject: [PATCH] prevent the same path load multiple times

---
 .../client-go/tools/clientcmd/config.go       |  4 ++-
 .../client-go/tools/clientcmd/loader.go       | 18 ++++++++++++-
 .../client-go/tools/clientcmd/loader_test.go  | 27 +++++++++++++++++++
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/config.go b/staging/src/k8s.io/client-go/tools/clientcmd/config.go
index 16ccdaf20a2..7092c5b10eb 100644
--- a/staging/src/k8s.io/client-go/tools/clientcmd/config.go
+++ b/staging/src/k8s.io/client-go/tools/clientcmd/config.go
@@ -68,7 +68,9 @@ func (o *PathOptions) GetEnvVarFiles() []string {
 		return []string{}
 	}
 
-	return filepath.SplitList(envVarValue)
+	fileList := filepath.SplitList(envVarValue)
+	// prevent the same path load multiple times
+	return deduplicate(fileList)
 }
 
 func (o *PathOptions) GetLoadingPrecedence() []string {
diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/loader.go b/staging/src/k8s.io/client-go/tools/clientcmd/loader.go
index 6ac83b5c843..fe7dfe96f2e 100644
--- a/staging/src/k8s.io/client-go/tools/clientcmd/loader.go
+++ b/staging/src/k8s.io/client-go/tools/clientcmd/loader.go
@@ -139,7 +139,9 @@ func NewDefaultClientConfigLoadingRules() *ClientConfigLoadingRules {
 
 	envVarFiles := os.Getenv(RecommendedConfigPathEnvVar)
 	if len(envVarFiles) != 0 {
-		chain = append(chain, filepath.SplitList(envVarFiles)...)
+		fileList := filepath.SplitList(envVarFiles)
+		// prevent the same path load multiple times
+		chain = append(chain, deduplicate(fileList)...)
 
 	} else {
 		chain = append(chain, RecommendedHomeFile)
@@ -610,3 +612,17 @@ func MakeRelative(path, base string) (string, error) {
 	}
 	return path, nil
 }
+
+// deduplicate removes any duplicated values and returns a new slice, keeping the order unchanged
+func deduplicate(s []string) []string {
+	encountered := map[string]bool{}
+	ret := make([]string, 0)
+	for i := range s {
+		if encountered[s[i]] {
+			continue
+		}
+		encountered[s[i]] = true
+		ret = append(ret, s[i])
+	}
+	return ret
+}
diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/loader_test.go b/staging/src/k8s.io/client-go/tools/clientcmd/loader_test.go
index 74319788aba..20b350ba720 100644
--- a/staging/src/k8s.io/client-go/tools/clientcmd/loader_test.go
+++ b/staging/src/k8s.io/client-go/tools/clientcmd/loader_test.go
@@ -577,3 +577,30 @@ func Example_mergingEverythingNoConflicts() {
 	//   user:
 	//     token: red-token
 }
+
+func TestDeduplicate(t *testing.T) {
+	testCases := []struct {
+		src    []string
+		expect []string
+	}{
+		{
+			src:    []string{"a", "b", "c", "d", "e", "f"},
+			expect: []string{"a", "b", "c", "d", "e", "f"},
+		},
+		{
+			src:    []string{"a", "b", "c", "b", "e", "f"},
+			expect: []string{"a", "b", "c", "e", "f"},
+		},
+		{
+			src:    []string{"a", "a", "b", "b", "c", "b"},
+			expect: []string{"a", "b", "c"},
+		},
+	}
+
+	for _, testCase := range testCases {
+		get := deduplicate(testCase.src)
+		if !reflect.DeepEqual(get, testCase.expect) {
+			t.Errorf("expect: %v, get: %v", testCase.expect, get)
+		}
+	}
+}