feat: restore import export plugins (#3042)

Signed-off-by: Song Gao <[email protected]>
lf-edge · Jul 23, 2024 · 592ef28 · 592ef28
1 parent bddc2a1
commit 592ef28
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 0 deletions.
diff --git a/internal/server/yaml_import_export.go b/internal/server/yaml_import_export.go
@@ -43,6 +43,7 @@ type MetaConfiguration struct {
 	SinkConfig       map[string]map[string]any `json:"sinkConfig,omitempty" yaml:"sinkConfig,omitempty"`
 	ConnectionConfig map[string]map[string]any `json:"connectionConfig,omitempty" yaml:"connectionConfig,omitempty"`
 	// plugins
+	NativePlugins   map[string]*plugin.IOPlugin `json:"nativePlugins,omitempty" yaml:"nativePlugins,omitempty"`
 	PortablePlugins map[string]*plugin.IOPlugin `json:"portablePlugins,omitempty" yaml:"portablePlugins,omitempty"`
 	// others
 	Service map[string]*service.ServiceCreationRequest `json:"service,omitempty" yaml:"service,omitempty"`
@@ -124,6 +125,30 @@ func addConfiguration(m *MetaConfiguration) error {
 }
 
 func addPlugins(m *MetaConfiguration) error {
+	if managers["plugin"] != nil {
+		want := make(map[string]*plugin.IOPlugin)
+		pm := managers["plugin"].Export()
+		failpoint.Inject("mockYamlExport", func() {
+			e := map[string]*plugin.IOPlugin{
+				"p1": {
+					Name: "p2",
+					File: "path",
+				},
+			}
+			b, _ := json.Marshal(e)
+			pm = map[string]string{
+				"p2": string(b),
+			}
+		})
+		for k, v := range pm {
+			p := &plugin.IOPlugin{}
+			if err := json.Unmarshal([]byte(v), p); err != nil {
+				return err
+			}
+			want[k] = p
+		}
+		m.NativePlugins = want
+	}
 	if managers["portable"] != nil {
 		want := make(map[string]*plugin.IOPlugin)
 		pm := managers["portable"].Export()
@@ -328,6 +353,7 @@ const (
 	mockServiceErr
 	mockSchemaErr
 	mockPortablePluginErr
+	mockNativePluginErr
 	mockErrEnd
 )
 
@@ -360,6 +386,11 @@ func importYamlConf(m *MetaConfiguration) error {
 	if err != nil {
 		return err
 	}
+	err = importNativePlugins(m) //nolint:staticcheck
+	err = mockImportErr(err, mockNativePluginErr)
+	if err != nil {
+		return err
+	}
 	err = importPortablePlugins(m) //nolint:staticcheck
 	err = mockImportErr(err, mockPortablePluginErr)
 	if err != nil {
@@ -442,6 +473,19 @@ func importPortablePlugins(m *MetaConfiguration) error {
 	return importByManager(importPlugin, manager, "portable plugin")
 }
 
+func importNativePlugins(m *MetaConfiguration) error {
+	manager, ok := managers["plugin"]
+	if !ok {
+		return fmt.Errorf("native manager not exist")
+	}
+	importPlugin := make(map[string]string)
+	for key, value := range m.PortablePlugins {
+		b, _ := json.Marshal(value)
+		importPlugin[key] = string(b)
+	}
+	return importByManager(importPlugin, manager, "native plugin")
+}
+
 func importRules(m *MetaConfiguration) error {
 	for key, value := range m.Rules {
 		deleteRule(key)

diff --git a/internal/server/yaml_import_export_test.go b/internal/server/yaml_import_export_test.go
@@ -46,6 +46,7 @@ func TestMetaConfiguration(t *testing.T) {
 	require.True(t, len(m.SinkConfig) > 0)
 	require.True(t, len(m.ConnectionConfig) > 0)
 	require.True(t, len(m.PortablePlugins) > 0)
+	require.True(t, len(m.NativePlugins) > 0)
 	require.True(t, len(m.Service) > 0)
 	require.True(t, len(m.Schema) > 0)
 	require.True(t, len(m.Uploads) > 0)