From e2cbf683473e4edccb7e9519a951242c990e9995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=B3=BD=E8=BD=A9?= Date: Fri, 28 Jun 2024 09:54:23 +0800 Subject: [PATCH] chore: don't hardcode names twice (#603) Signed-off-by: spacewander --- controller/plugins/bandwidth_limit/config.go | 6 +----- controller/plugins/buffer/config.go | 6 +----- controller/plugins/cors/config.go | 6 +----- controller/plugins/ext_proc/config.go | 4 ++-- controller/plugins/fault/config.go | 6 +----- controller/plugins/local_ratelimit/config.go | 6 +----- controller/plugins/lua/config.go | 4 ++-- controller/registries/nacos/config.go | 2 +- types/plugins/ext_proc/config.go | 9 +++++++-- types/plugins/lua/config.go | 9 +++++++-- types/registries/nacos/config.go | 6 +++++- 11 files changed, 29 insertions(+), 35 deletions(-) diff --git a/controller/plugins/bandwidth_limit/config.go b/controller/plugins/bandwidth_limit/config.go index 798a0228..d3b65e15 100644 --- a/controller/plugins/bandwidth_limit/config.go +++ b/controller/plugins/bandwidth_limit/config.go @@ -19,12 +19,8 @@ import ( "mosn.io/htnn/types/plugins/bandwidth_limit" ) -const ( - Name = "bandwidthLimit" -) - func init() { - plugins.RegisterHttpPlugin(Name, &plugin{}) + plugins.RegisterHttpPlugin(bandwidth_limit.Name, &plugin{}) } type plugin struct { diff --git a/controller/plugins/buffer/config.go b/controller/plugins/buffer/config.go index 9908136d..0cdb0ccc 100644 --- a/controller/plugins/buffer/config.go +++ b/controller/plugins/buffer/config.go @@ -19,12 +19,8 @@ import ( "mosn.io/htnn/types/plugins/buffer" ) -const ( - Name = "buffer" -) - func init() { - plugins.RegisterHttpPlugin(Name, &plugin{}) + plugins.RegisterHttpPlugin(buffer.Name, &plugin{}) } type plugin struct { diff --git a/controller/plugins/cors/config.go b/controller/plugins/cors/config.go index d3c9390e..21f2f35b 100644 --- a/controller/plugins/cors/config.go +++ b/controller/plugins/cors/config.go @@ -19,12 +19,8 @@ import ( "mosn.io/htnn/types/plugins/cors" ) -const ( - Name = "cors" -) - func init() { - plugins.RegisterHttpPlugin(Name, &plugin{}) + plugins.RegisterHttpPlugin(cors.Name, &plugin{}) } type plugin struct { diff --git a/controller/plugins/ext_proc/config.go b/controller/plugins/ext_proc/config.go index 3332a1db..baadda5e 100644 --- a/controller/plugins/ext_proc/config.go +++ b/controller/plugins/ext_proc/config.go @@ -20,8 +20,8 @@ import ( ) func init() { - plugins.RegisterHttpPlugin("outerExtProc", &outerPlugin{}) - plugins.RegisterHttpPlugin("innerExtProc", &innerPlugin{}) + plugins.RegisterHttpPlugin(ext_proc.OuterName, &outerPlugin{}) + plugins.RegisterHttpPlugin(ext_proc.InnerName, &innerPlugin{}) } type plugin struct { diff --git a/controller/plugins/fault/config.go b/controller/plugins/fault/config.go index 638434d9..cc57c703 100644 --- a/controller/plugins/fault/config.go +++ b/controller/plugins/fault/config.go @@ -19,12 +19,8 @@ import ( "mosn.io/htnn/types/plugins/fault" ) -const ( - Name = "fault" -) - func init() { - plugins.RegisterHttpPlugin(Name, &plugin{}) + plugins.RegisterHttpPlugin(fault.Name, &plugin{}) } type plugin struct { diff --git a/controller/plugins/local_ratelimit/config.go b/controller/plugins/local_ratelimit/config.go index 55a67caa..4405e018 100644 --- a/controller/plugins/local_ratelimit/config.go +++ b/controller/plugins/local_ratelimit/config.go @@ -19,12 +19,8 @@ import ( "mosn.io/htnn/types/plugins/local_ratelimit" ) -const ( - Name = "localRatelimit" -) - func init() { - plugins.RegisterHttpPlugin(Name, &plugin{}) + plugins.RegisterHttpPlugin(local_ratelimit.Name, &plugin{}) } type plugin struct { diff --git a/controller/plugins/lua/config.go b/controller/plugins/lua/config.go index 603a01a7..52323a2b 100644 --- a/controller/plugins/lua/config.go +++ b/controller/plugins/lua/config.go @@ -20,8 +20,8 @@ import ( ) func init() { - plugins.RegisterHttpPlugin("outerLua", &outerPlugin{}) - plugins.RegisterHttpPlugin("innerLua", &innerPlugin{}) + plugins.RegisterHttpPlugin(lua.OuterName, &outerPlugin{}) + plugins.RegisterHttpPlugin(lua.InnerName, &innerPlugin{}) } type plugin struct { diff --git a/controller/registries/nacos/config.go b/controller/registries/nacos/config.go index e7c7d7a4..7b741b24 100644 --- a/controller/registries/nacos/config.go +++ b/controller/registries/nacos/config.go @@ -42,7 +42,7 @@ import ( ) func init() { - registry.AddRegistryFactory("nacos", func(store registry.ServiceEntryStore, om metav1.ObjectMeta) (registry.Registry, error) { + registry.AddRegistryFactory(nacos.Name, func(store registry.ServiceEntryStore, om metav1.ObjectMeta) (registry.Registry, error) { reg := &Nacos{ logger: log.NewLogger(&log.RegistryLoggerOptions{ Name: om.Name, diff --git a/types/plugins/ext_proc/config.go b/types/plugins/ext_proc/config.go index cf0d4a34..46dead5f 100644 --- a/types/plugins/ext_proc/config.go +++ b/types/plugins/ext_proc/config.go @@ -21,9 +21,14 @@ import ( "mosn.io/htnn/api/pkg/plugins" ) +const ( + OuterName = "outerExtProc" + InnerName = "innerExtProc" +) + func init() { - plugins.RegisterHttpPluginType("outerExtProc", &OuterPlugin{}) - plugins.RegisterHttpPluginType("innerExtProc", &InnerPlugin{}) + plugins.RegisterHttpPluginType(OuterName, &OuterPlugin{}) + plugins.RegisterHttpPluginType(InnerName, &InnerPlugin{}) } type plugin struct { diff --git a/types/plugins/lua/config.go b/types/plugins/lua/config.go index 20fa901f..dec3d7d9 100644 --- a/types/plugins/lua/config.go +++ b/types/plugins/lua/config.go @@ -21,9 +21,14 @@ import ( "mosn.io/htnn/api/pkg/plugins" ) +const ( + OuterName = "outerLua" + InnerName = "innerLua" +) + func init() { - plugins.RegisterHttpPluginType("outerLua", &OuterPlugin{}) - plugins.RegisterHttpPluginType("innerLua", &InnerPlugin{}) + plugins.RegisterHttpPluginType(OuterName, &OuterPlugin{}) + plugins.RegisterHttpPluginType(InnerName, &InnerPlugin{}) } type plugin struct { diff --git a/types/registries/nacos/config.go b/types/registries/nacos/config.go index eec177cb..22410f2a 100644 --- a/types/registries/nacos/config.go +++ b/types/registries/nacos/config.go @@ -18,8 +18,12 @@ import ( "mosn.io/htnn/types/pkg/registry" ) +const ( + Name = "nacos" +) + func init() { - registry.AddRegistryType("nacos", &RegistryType{}) + registry.AddRegistryType(Name, &RegistryType{}) } type RegistryType struct {