Skip to content

Commit

Permalink
chore: don't hardcode names twice (#603)
Browse files Browse the repository at this point in the history
Signed-off-by: spacewander <[email protected]>
  • Loading branch information
spacewander authored Jun 28, 2024
1 parent 0483a64 commit e2cbf68
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 35 deletions.
6 changes: 1 addition & 5 deletions controller/plugins/bandwidth_limit/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 1 addition & 5 deletions controller/plugins/buffer/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 1 addition & 5 deletions controller/plugins/cors/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions controller/plugins/ext_proc/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 1 addition & 5 deletions controller/plugins/fault/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 1 addition & 5 deletions controller/plugins/local_ratelimit/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions controller/plugins/lua/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion controller/registries/nacos/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 7 additions & 2 deletions types/plugins/ext_proc/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 7 additions & 2 deletions types/plugins/lua/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion types/registries/nacos/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit e2cbf68

Please sign in to comment.