validate k8s response status before parsing config, fixes #113

mazay · Mar 5, 2022 · 0404ef1 · 0404ef1
1 parent 8d33a0b
commit 0404ef1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/service/config.go b/service/config.go
@@ -129,8 +129,10 @@ func getConfig() *Config {
 	var config *Config
 
 	if inK8s && configmap != "" {
-		cfg := k8sGetCm(clientset, configmap)
-		config = readConfigString(cfg)
+		result, cfg := k8sGetCm(clientset, configmap)
+		if result {
+			config = readConfigString(cfg)
+		}
 	} else {
 		config = readConfigFile(configpath)
 	}

diff --git a/service/k8s.go b/service/k8s.go
@@ -85,8 +85,9 @@ func k8sWatchCm(clientset kubernetes.Interface, configmap string, reloaderChan c
 	}
 }
 
-func k8sGetCm(clientset kubernetes.Interface, configmap string) string {
+func k8sGetCm(clientset kubernetes.Interface, configmap string) (bool, string) {
 	var configMap map[string]string
+	var result bool
 
 	ctx := context.Background()
 	cm := strings.Split(configmap, "/")
@@ -98,9 +99,11 @@ func k8sGetCm(clientset kubernetes.Interface, configmap string) string {
 
 	if err != nil {
 		logger.Errorln(err.Error())
+		result = false
 	} else {
 		configMap = cmObj.Data
+		result = true
 	}
 
-	return configMap["config.yml"]
+	return result, configMap["config.yml"]
 }
diff --git a/service/k8s_test.go b/service/k8s_test.go
@@ -49,7 +49,7 @@ sites:
 		{"test/mock-configmap-does-not-exist", "fail"},
 	}
 	for _, tt := range tests {
-		data := k8sGetCm(clientset, tt.cm)
+		_, data := k8sGetCm(clientset, tt.cm)
 		if !reflect.DeepEqual(config, data) && tt.want != "fail" {
 			t.Error(
 				"Expected:", config,