From 522e2c94c1fe6f86506e509cbf6b92babe37bef0 Mon Sep 17 00:00:00 2001 From: fatedier Date: Thu, 23 May 2024 14:52:12 +0800 Subject: [PATCH] config: return error if plugin type is empty (#4235) --- pkg/config/v1/plugin.go | 7 ++++++- pkg/config/v1/proxy.go | 4 ++++ pkg/config/v1/visitor.go | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkg/config/v1/plugin.go b/pkg/config/v1/plugin.go index 5602a81..3a7c834 100644 --- a/pkg/config/v1/plugin.go +++ b/pkg/config/v1/plugin.go @@ -17,6 +17,7 @@ package v1 import ( "bytes" "encoding/json" + "errors" "fmt" "reflect" ) @@ -42,7 +43,7 @@ func (c *TypedClientPluginOptions) UnmarshalJSON(b []byte) error { c.Type = typeStruct.Type if c.Type == "" { - return nil + return errors.New("plugin type is empty") } v, ok := clientPluginOptionsTypeMap[typeStruct.Type] @@ -63,6 +64,10 @@ func (c *TypedClientPluginOptions) UnmarshalJSON(b []byte) error { return nil } +func (c *TypedClientPluginOptions) MarshalJSON() ([]byte, error) { + return json.Marshal(c.ClientPluginOptions) +} + const ( PluginHTTP2HTTPS = "http2https" PluginHTTPProxy = "http_proxy" diff --git a/pkg/config/v1/proxy.go b/pkg/config/v1/proxy.go index 8530e21..45c489f 100644 --- a/pkg/config/v1/proxy.go +++ b/pkg/config/v1/proxy.go @@ -195,6 +195,10 @@ func (c *TypedProxyConfig) UnmarshalJSON(b []byte) error { return nil } +func (c *TypedProxyConfig) MarshalJSON() ([]byte, error) { + return json.Marshal(c.ProxyConfigurer) +} + type ProxyConfigurer interface { Complete(namePrefix string) GetBaseConfig() *ProxyBaseConfig diff --git a/pkg/config/v1/visitor.go b/pkg/config/v1/visitor.go index e9fa166..51fe88a 100644 --- a/pkg/config/v1/visitor.go +++ b/pkg/config/v1/visitor.go @@ -120,6 +120,10 @@ func (c *TypedVisitorConfig) UnmarshalJSON(b []byte) error { return nil } +func (c *TypedVisitorConfig) MarshalJSON() ([]byte, error) { + return json.Marshal(c.VisitorConfigurer) +} + func NewVisitorConfigurerByType(t VisitorType) VisitorConfigurer { v, ok := visitorConfigTypeMap[t] if !ok {