From 0597883e701b3db9842ee736201588b6b9834d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=80=92=E9=9C=89=E7=8B=90=E7=8B=B8?= <mail@xiaoliu.org>
Date: Thu, 30 Sep 2021 14:31:25 +0800
Subject: [PATCH] fix: contrib config kubernetes lint err (#1523)

* fix: contrib metrics datadog lint err

* fix: contrib config nacos lint err

* fix: contrib config kubernetes lint err

* remove unwanted docs
---
 contrib/config/kubernetes/config_test.go  | 18 ++++++++++
 contrib/config/kubernetes/example.go      | 40 -----------------------
 contrib/config/kubernetes/watcher_test.go | 20 +++++-------
 hack/.lintcheck_failures                  |  2 --
 4 files changed, 27 insertions(+), 53 deletions(-)
 delete mode 100644 contrib/config/kubernetes/example.go

diff --git a/contrib/config/kubernetes/config_test.go b/contrib/config/kubernetes/config_test.go
index a66f59b9e..bd0a605a8 100644
--- a/contrib/config/kubernetes/config_test.go
+++ b/contrib/config/kubernetes/config_test.go
@@ -1,9 +1,11 @@
 package kubernetes
 
 import (
+	"log"
 	"path/filepath"
 	"testing"
 
+	"github.com/go-kratos/kratos/v2/config"
 	"k8s.io/client-go/util/homedir"
 )
 
@@ -22,3 +24,19 @@ func TestSource(t *testing.T) {
 		t.Log(v)
 	}
 }
+
+func ExampleNewSource() {
+	conf := config.New(
+		config.WithSource(
+			NewSource(
+				Namespace("mesh"),
+				LabelSelector("app=test"),
+				KubeConfig(filepath.Join(homedir.HomeDir(), ".kube", "config")),
+			),
+		),
+	)
+	err := conf.Load()
+	if err != nil {
+		log.Panic(err)
+	}
+}
diff --git a/contrib/config/kubernetes/example.go b/contrib/config/kubernetes/example.go
deleted file mode 100644
index b2e1022ac..000000000
--- a/contrib/config/kubernetes/example.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package kubernetes
-
-import (
-	"log"
-	"path/filepath"
-
-	"github.com/go-kratos/kratos/v2/config"
-	"k8s.io/client-go/util/homedir"
-)
-
-// 部署在mesh namespace 下configmap
-const yamlData = `database:
-  mysql:
-    dsn: "root:Test@tcp(mysql.database.svc.cluster.local:3306)/test?timeout=1s&readTimeout=1s&writeTimeout=1s&parseTime=true&loc=Local&charset=utf8mb4,utf8"
-    active: 20
-    idle: 10
-    idle_timeout: 3600
-  redis:
-    addr: "redis-master.redis.svc.cluster.local:6379"
-    password: ""
-    db: 4`
-
-const yamlApp = `application:
-  expire: 3600`
-
-func main() {
-	conf := config.New(
-		config.WithSource(
-			NewSource(
-				Namespace("mesh"),
-				LabelSelector("app=test"),
-				KubeConfig(filepath.Join(homedir.HomeDir(), ".kube", "config")),
-			),
-		),
-	)
-	err := conf.Load()
-	if err != nil {
-		log.Panic(err)
-	}
-}
diff --git a/contrib/config/kubernetes/watcher_test.go b/contrib/config/kubernetes/watcher_test.go
index 803449198..d0b375b3c 100644
--- a/contrib/config/kubernetes/watcher_test.go
+++ b/contrib/config/kubernetes/watcher_test.go
@@ -2,13 +2,14 @@ package kubernetes
 
 import (
 	"context"
+	"path/filepath"
+	"testing"
+	"time"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/homedir"
-	"path/filepath"
-	"testing"
-	"time"
 )
 
 func TestKube(t *testing.T) {
@@ -23,7 +24,7 @@ func TestKube(t *testing.T) {
 	}
 	cmWatcher, err := client.CoreV1().ConfigMaps("mesh").Watch(context.Background(), metav1.ListOptions{
 		LabelSelector: "app=test",
-		//FieldSelector:        "",
+		// FieldSelector:        "",
 	})
 	if err != nil {
 		t.Error(err)
@@ -32,13 +33,10 @@ func TestKube(t *testing.T) {
 		time.Sleep(5 * time.Second)
 		cmWatcher.Stop()
 	}()
-	for {
-		select {
-		case c := <-cmWatcher.ResultChan():
-			if c.Object == nil {
-				return
-			}
-			t.Log(c.Type, c.Object)
+	for c := range cmWatcher.ResultChan() {
+		if c.Object == nil {
+			return
 		}
+		t.Log(c.Type, c.Object)
 	}
 }
diff --git a/hack/.lintcheck_failures b/hack/.lintcheck_failures
index ca4f7a741..037e60443 100644
--- a/hack/.lintcheck_failures
+++ b/hack/.lintcheck_failures
@@ -1,5 +1,3 @@
-./contrib/config/apollo
-./contrib/config/kubernetes
 ./contrib/registry/nacos
 ./contrib/registry/consul
 ./contrib/registry/kubernetes