fix k8stag key

qiniu · Aug 16, 2018 · a560c82 · a560c82
1 parent 9cda102
commit a560c82
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/reader/http/http_test.go b/reader/http/http_test.go
@@ -21,7 +21,7 @@ import (
 
 var testData []string
 
-func getHttpReader() (*Reader, error) {
+func getHttpReader(port string) (*Reader, error) {
 	readConf := conf.MapConf{
 		reader.KeyMetaPath: MetaDir,
 		reader.KeyFileDone: MetaDir,
@@ -34,7 +34,7 @@ func getHttpReader() (*Reader, error) {
 	}
 
 	c := conf.MapConf{
-		reader.KeyHTTPServiceAddress: "127.0.0.1:7110",
+		reader.KeyHTTPServiceAddress: "127.0.0.1:" + port,
 		reader.KeyHTTPServicePath:    "/logkit/aaa,/logkit/bbb,/logkit/ccc,/logkit/ddd",
 	}
 	reader, err := NewReader(meta, c)
@@ -50,7 +50,7 @@ func getHttpReader() (*Reader, error) {
 }
 
 func TestNewHttpReader(t *testing.T) {
-	httpReader, err := getHttpReader()
+	httpReader, err := getHttpReader("7111")
 	assert.NoError(t, err)
 	defer func() {
 		os.RemoveAll("./meta")
@@ -65,14 +65,14 @@ func TestNewHttpReader(t *testing.T) {
 	// 测试正常发送
 	var wg sync.WaitGroup
 	for index, val := range testData {
-		req, err := http.NewRequest(http.MethodPost, "http://127.0.0.1:7110"+paths[index], nil)
+		req, err := http.NewRequest(http.MethodPost, "http://127.0.0.1:7111"+paths[index], nil)
 		assert.NoError(t, err)
 		wg.Add(1)
 		go func(httpReader *Reader, t *testing.T, index int, val string) {
 			got, err := httpReader.ReadLine()
 			assert.NoError(t, err)
 			assert.Equal(t, val, got)
-			assert.Equal(t, "127.0.0.1:7110"+paths[index], httpReader.Source())
+			assert.Equal(t, "127.0.0.1:7111"+paths[index], httpReader.Source())
 			wg.Done()
 		}(httpReader, t, index, val)
 		req.Body = ioutil.NopCloser(bytes.NewReader([]byte(val)))
@@ -84,7 +84,7 @@ func TestNewHttpReader(t *testing.T) {
 }
 
 func TestNewHttpReaderWithGzip(t *testing.T) {
-	httpReader, err := getHttpReader()
+	httpReader, err := getHttpReader("7112")
 	assert.NoError(t, err)
 	defer func() {
 		os.RemoveAll("./meta")
@@ -99,7 +99,7 @@ func TestNewHttpReaderWithGzip(t *testing.T) {
 	// 测试 gzip 发送
 	var wg sync.WaitGroup
 	for index, val := range testData {
-		req, err := http.NewRequest(http.MethodPost, "http://127.0.0.1:7110"+paths[index], nil)
+		req, err := http.NewRequest(http.MethodPost, "http://127.0.0.1:7112"+paths[index], nil)
 		req.Header.Set(ContentTypeHeader, ApplicationGzip)
 		req.Header.Set(ContentEncodingHeader, "gzip")
 		assert.NoError(t, err)
@@ -114,7 +114,7 @@ func TestNewHttpReaderWithGzip(t *testing.T) {
 			got, err := httpReader.ReadLine()
 			assert.NoError(t, err)
 			assert.Equal(t, val, got)
-			assert.Equal(t, "127.0.0.1:7110"+paths[index], httpReader.Source())
+			assert.Equal(t, "127.0.0.1:7112"+paths[index], httpReader.Source())
 			wg.Done()
 		}(httpReader, t, index, val)
 		req.Body = ioutil.NopCloser(bytes.NewReader(byteVal))

diff --git a/transforms/mutate/split.go b/transforms/mutate/split.go
@@ -15,10 +15,11 @@ var (
 )
 
 type Spliter struct {
-	Key         string `json:"key"`
-	SeperateKey string `json:"sep"`
-	ArraryName  string `json:"newfield"`
-	stats       StatsInfo
+	Key           string `json:"key"`
+	SeperateKey   string `json:"sep"`
+	ArraryName    string `json:"newfield"`
+	ArraryNameNew string `json:"new"`
+	stats         StatsInfo
 }
 
 func (g *Spliter) RawTransform(datas []string) ([]string, error) {
@@ -28,6 +29,9 @@ func (g *Spliter) RawTransform(datas []string) ([]string, error) {
 func (g *Spliter) Transform(datas []Data) ([]Data, error) {
 	var err, fmtErr error
 	errNum := 0
+	if g.ArraryName == "" {
+		g.ArraryName = g.ArraryNameNew
+	}
 	if g.ArraryName == "" {
 		fmtErr = errors.New("array name is empty string,can't use as array field key name")
 		g.stats.LastError = fmtErr.Error()
@@ -87,7 +91,7 @@ func (g *Spliter) ConfigOptions() []Option {
 			Default:      "",
 			Required:     true,
 			Placeholder:  "new_field_keyname",
-			DefaultNoUse: false,
+			DefaultNoUse: true,
 			Description:  "解析后数据的字段名(newfield)",
 			Type:         transforms.TransformTypeString,
 		},

diff --git a/transforms/service/k8stag.go b/transforms/service/k8stag.go
@@ -85,13 +85,13 @@ func (g *K8sTag) SampleConfig() string {
 func (g *K8sTag) ConfigOptions() []Option {
 	return []Option{
 		{
-			KeyName:      "key",
+			KeyName:      "sourcefilefield",
 			ChooseOnly:   false,
 			Default:      "",
 			Required:     true,
 			Placeholder:  "my_field_keyname",
 			DefaultNoUse: true,
-			Description:  "要进行Transform变化的键(key)",
+			Description:  "要进行Transform变化的键(sourcefilefield)",
 			Type:         transforms.TransformTypeString,
 			ToolTip:      "此处填写 File Reader 中 datasource_tag 选项配置的 key，该选项会记录文件路径",
 		},