@@ -103,47 +103,47 @@ func NewFramework(r Registry, plugins *config.Plugins, args []config.PluginConfi
103
103
}
104
104
}
105
105
106
- if err := updatePluginList (reflect . ValueOf ( & f .preFilterPlugins ) , plugins .PreFilter , reflect . TypeOf (( * PreFilterPlugin )( nil )) , pluginsMap ); err != nil {
106
+ if err := updatePluginList (& f .preFilterPlugins , plugins .PreFilter , pluginsMap ); err != nil {
107
107
return nil , err
108
108
}
109
109
110
- if err := updatePluginList (reflect . ValueOf ( & f .filterPlugins ) , plugins .Filter , reflect . TypeOf (( * FilterPlugin )( nil )) , pluginsMap ); err != nil {
110
+ if err := updatePluginList (& f .filterPlugins , plugins .Filter , pluginsMap ); err != nil {
111
111
return nil , err
112
112
}
113
113
114
- if err := updatePluginList (reflect . ValueOf ( & f .reservePlugins ) , plugins .Reserve , reflect . TypeOf (( * ReservePlugin )( nil )) , pluginsMap ); err != nil {
114
+ if err := updatePluginList (& f .reservePlugins , plugins .Reserve , pluginsMap ); err != nil {
115
115
return nil , err
116
116
}
117
117
118
- if err := updatePluginList (reflect . ValueOf ( & f .postFilterPlugins ) , plugins .PostFilter , reflect . TypeOf (( * PostFilterPlugin )( nil )) , pluginsMap ); err != nil {
118
+ if err := updatePluginList (& f .postFilterPlugins , plugins .PostFilter , pluginsMap ); err != nil {
119
119
return nil , err
120
120
}
121
121
122
- if err := updatePluginList (reflect . ValueOf ( & f .scorePlugins ) , plugins .Score , reflect . TypeOf (( * ScorePlugin )( nil )) , pluginsMap ); err != nil {
122
+ if err := updatePluginList (& f .scorePlugins , plugins .Score , pluginsMap ); err != nil {
123
123
return nil , err
124
124
}
125
125
126
- if err := updatePluginList (reflect . ValueOf ( & f .preBindPlugins ) , plugins .PreBind , reflect . TypeOf (( * PreBindPlugin )( nil )) , pluginsMap ); err != nil {
126
+ if err := updatePluginList (& f .preBindPlugins , plugins .PreBind , pluginsMap ); err != nil {
127
127
return nil , err
128
128
}
129
129
130
- if err := updatePluginList (reflect . ValueOf ( & f .bindPlugins ) , plugins .Bind , reflect . TypeOf (( * BindPlugin )( nil )) , pluginsMap ); err != nil {
130
+ if err := updatePluginList (& f .bindPlugins , plugins .Bind , pluginsMap ); err != nil {
131
131
return nil , err
132
132
}
133
133
134
- if err := updatePluginList (reflect . ValueOf ( & f .postBindPlugins ) , plugins .PostBind , reflect . TypeOf (( * PostBindPlugin )( nil )) , pluginsMap ); err != nil {
134
+ if err := updatePluginList (& f .postBindPlugins , plugins .PostBind , pluginsMap ); err != nil {
135
135
return nil , err
136
136
}
137
137
138
- if err := updatePluginList (reflect . ValueOf ( & f .unreservePlugins ) , plugins .Unreserve , reflect . TypeOf (( * UnreservePlugin )( nil )) , pluginsMap ); err != nil {
138
+ if err := updatePluginList (& f .unreservePlugins , plugins .Unreserve , pluginsMap ); err != nil {
139
139
return nil , err
140
140
}
141
141
142
- if err := updatePluginList (reflect . ValueOf ( & f .permitPlugins ) , plugins .Permit , reflect . TypeOf (( * PermitPlugin )( nil )) , pluginsMap ); err != nil {
142
+ if err := updatePluginList (& f .permitPlugins , plugins .Permit , pluginsMap ); err != nil {
143
143
return nil , err
144
144
}
145
145
146
- if err := updatePluginList (reflect . ValueOf ( & f .queueSortPlugins ) , plugins .QueueSort , reflect . TypeOf (( * QueueSortPlugin )( nil )) , pluginsMap ); err != nil {
146
+ if err := updatePluginList (& f .queueSortPlugins , plugins .QueueSort , pluginsMap ); err != nil {
147
147
return nil , err
148
148
}
149
149
@@ -160,13 +160,13 @@ func NewFramework(r Registry, plugins *config.Plugins, args []config.PluginConfi
160
160
return f , nil
161
161
}
162
162
163
- func updatePluginList (pluginList reflect. Value , pluginSet * config.PluginSet , pluginType reflect. Type , pluginsMap map [string ]Plugin ) error {
163
+ func updatePluginList (pluginList interface {} , pluginSet * config.PluginSet , pluginsMap map [string ]Plugin ) error {
164
164
if pluginSet == nil {
165
165
return nil
166
166
}
167
167
168
- plugins := pluginList .Elem ()
169
- pluginType = pluginType .Elem ()
168
+ plugins := reflect . ValueOf ( pluginList ) .Elem ()
169
+ pluginType := plugins . Type () .Elem ()
170
170
set := sets .NewString ()
171
171
for _ , ep := range pluginSet .Enabled {
172
172
pg , ok := pluginsMap [ep .Name ]
0 commit comments