api: make ListPlugins parse only known plugin types (#15434)

This commit is contained in:
Tom Proctor
2022-05-17 17:41:26 +01:00
committed by GitHub
parent 0f1784dce2
commit 01fd2660ca
3 changed files with 91 additions and 8 deletions

View File

@@ -100,23 +100,24 @@ func (c *Sys) ListPluginsWithContext(ctx context.Context, i *ListPluginsInput) (
PluginsByType: make(map[consts.PluginType][]string),
}
if i.Type == consts.PluginTypeUnknown {
for pluginTypeStr, pluginsRaw := range secret.Data {
pluginType, err := consts.ParsePluginType(pluginTypeStr)
if err != nil {
return nil, err
for _, pluginType := range consts.PluginTypes {
pluginsRaw, ok := secret.Data[pluginType.String()]
if !ok {
continue
}
pluginsIfc, ok := pluginsRaw.([]interface{})
if !ok {
return nil, fmt.Errorf("unable to parse plugins for %q type", pluginTypeStr)
return nil, fmt.Errorf("unable to parse plugins for %q type", pluginType.String())
}
plugins := make([]string, len(pluginsIfc))
for i, nameIfc := range pluginsIfc {
plugins := make([]string, 0, len(pluginsIfc))
for _, nameIfc := range pluginsIfc {
name, ok := nameIfc.(string)
if !ok {
continue
}
plugins[i] = name
plugins = append(plugins, name)
}
result.PluginsByType[pluginType] = plugins
}