Prechádzať zdrojové kódy

fix(plugin): move plugin meta data out of etc folder

Signed-off-by: Jianxiang Ran <rxan_embedded@163.com>
Jianxiang Ran 2 rokov pred
rodič
commit
6ed73ae10c

+ 0 - 66
etc/sources/test.json

@@ -1,66 +0,0 @@
-{
-  "libs": [],
-  "about": {
-    "trial": false,
-    "author": {
-      "name": "EMQ",
-      "email": "contact@emqx.io",
-      "company": "EMQ Technologies Co., Ltd",
-      "website": "https://www.emqx.io"
-    },
-    "helpUrl": {
-      "en_US": "https://github.com/lf-edge/ekuiper/blob/master/docs/en_US/rules/sources/builtin/test.md",
-      "zh_CN": "https://github.com/lf-edge/ekuiper/blob/master/docs/zh_CN/rules/sources/builtin/test.md"
-    },
-    "description": {
-      "en_US": "Desc US",
-      "zh_CN": "Desc CH"
-    }
-  },
-  "properties": {
-    "default": [
-      {
-        "name": "FIELDS",
-        "optional": false,
-        "control": "text",
-        "type": "array",
-        "hint": {
-          "en_US": "test",
-          "zh_CN": "test"
-        },
-        "label": {
-          "en_US": "FIELDS",
-          "zh_CN": "FIELDS"
-        }
-      },
-      {
-        "name": "QUERY_TABLE",
-        "optional": false,
-        "control": "text",
-        "type": "string",
-        "hint": {
-          "en_US": "test",
-          "zh_CN": "test"
-        },
-        "label": {
-          "en_US": "QUERY_TABLE",
-          "zh_CN": "QUERY_TABLE"
-        }
-      },
-      {
-        "name": "ROWCOUNT",
-        "optional": false,
-        "control": "number",
-        "type": "int",
-        "hint": {
-          "en_US": "test",
-          "zh_CN": "test"
-        },
-        "label": {
-          "en_US": "ROWCOUNT",
-          "zh_CN": "ROWCOUNT"
-        }
-      }
-    ]
-  }
-}

+ 0 - 15
etc/sources/test.yaml

@@ -1,15 +0,0 @@
-default:
-  interval: 1000
-  ashost: 192.168.1.100
-  sysnr: "02"
-  client: "900"
-  user: SPERF
-  passwd: PASSPASS
-  params:
-    QUERY_TABLE: VBAP
-    ROWCOUNT: 10
-    FIELDS: [
-      FIELDNAME: MANDT,
-      FIELDNAME: VBELN,
-      FIELDNAME: POSNR,
-    ]

etc/functions/accumulateWordCount.json → extensions/functions/accumulateWordCount/accumulateWordCount.json


etc/functions/countPlusOne.json → extensions/functions/countPlusOne/countPlusOne.json


etc/functions/echo.json → extensions/functions/echo/echo.json


etc/functions/geohash.json → extensions/functions/geohash/geohash.json


etc/functions/image.json → extensions/functions/image/image.json


etc/functions/labelImage.json → extensions/functions/labelImage/labelImage.json


etc/sinks/file.json → extensions/sinks/file/file.json


etc/sinks/influx.json → extensions/sinks/influx/influx.json


etc/sinks/redis.json → extensions/sinks/redis/redis.json


etc/sinks/sql.json → extensions/sinks/sql/sql.json


etc/sinks/tdengine.json → extensions/sinks/tdengine/tdengine.json


etc/sinks/zmq.json → extensions/sinks/zmq/zmq.json


etc/sources/random.json → extensions/sources/random/random.json


etc/sources/random.yaml → extensions/sources/random/random.yaml


etc/sources/sql.json → extensions/sources/sql/sql.json


etc/sources/sql.yaml → extensions/sources/sql/sql.yaml


etc/sources/zmq.json → extensions/sources/zmq/zmq.json


etc/sources/zmq.yaml → extensions/sources/zmq/zmq.yaml


+ 3 - 0
internal/plugin/native/manager.go

@@ -340,10 +340,13 @@ func (rr *Manager) Delete(t plugin2.PluginType, name string, stop bool) error {
 	switch t {
 	case plugin2.SOURCE:
 		paths = append(paths, path.Join(rr.etcDir, plugin2.PluginTypes[t], name+".yaml"))
+		paths = append(paths, path.Join(rr.etcDir, plugin2.PluginTypes[plugin2.SOURCE], name+".json"))
 		meta.UninstallSource(name)
 	case plugin2.SINK:
+		paths = append(paths, path.Join(rr.etcDir, plugin2.PluginTypes[plugin2.SINK], name+".json"))
 		meta.UninstallSink(name)
 	case plugin2.FUNCTION:
+		paths = append(paths, path.Join(rr.etcDir, plugin2.PluginTypes[plugin2.FUNCTION], name+".json"))
 		old := make([]string, 0)
 		if ok, err := rr.db.Get(name, &old); err != nil {
 			return err