fix(parser) global plugins are processed same as regular ones

Protocols, Enabled and other fields are processed for global plugins as
well. This was ignored previously.

Fix #502

internal/ingress/controller/parser/parser.go

@@ -986,10 +986,7 @@ func (p *Parser) globalPlugins() ([]Plugin, error) {
  continue
  }
  res[pluginName] = Plugin{
- Plugin: kong.Plugin{
- Name: kong.String(pluginName),
- Config: kong.Configuration(k8sPlugin.Config),
- },
+ Plugin: kongPluginFromK8SPlugin(k8sPlugin),
  }
  }
  for _, plugin := range duplicates {
@@ -1093,8 +1090,12 @@ func (p *Parser) getPlugin(namespace, name string) (kong.Plugin, error) {
  if k8sPlugin.PluginName == "" {
  return plugin, errors.Errorf("invalid empty 'plugin' property")
  }
+ plugin = kongPluginFromK8SPlugin(*k8sPlugin)
+ return plugin, nil
+}
 
- plugin = kong.Plugin{
+func kongPluginFromK8SPlugin(k8sPlugin configurationv1.KongPlugin) kong.Plugin {
+ plugin := kong.Plugin{
  Name: kong.String(k8sPlugin.PluginName),
  Config: kong.Configuration(k8sPlugin.Config).DeepCopy(),
  }
@@ -1107,7 +1108,7 @@ func (p *Parser) getPlugin(namespace, name string) (kong.Plugin, error) {
  if len(k8sPlugin.Protocols) > 0 {
  plugin.Protocols = kong.StringSlice(k8sPlugin.Protocols...)
  }
- return plugin, nil
+ return plugin
 }
 
 // getEndpoints returns a list of <endpoint ip>:<port> for a given service/target port combination.

internal/ingress/controller/parser/parser_test.go

@@ -74,6 +74,41 @@ Gn+T2uCyOP4a1DTUoPyoNJXo
  }
 )
 
+func TestGlobalPlugin(t *testing.T) {
+ assert := assert.New(t)
+ t.Run("global plugins are processed correctly", func(t *testing.T) {
+ store, err := store.NewFakeStore(store.FakeObjects{
+ KongPlugins: []*configurationv1.KongPlugin{
+ {
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "foo-plugin",
+ Namespace: "default",
+ Labels: map[string]string{
+ "global": "true",
+ },
+ },
+ PluginName: "key-auth",
+ Protocols: []string{"grpc"},
+ Config: configurationv1.Configuration{
+ "foo": "bar",
+ },
+ },
+ },
+ })
+ assert.Nil(err)
+ parser := New(store)
+ state, err := parser.Build()
+ assert.Nil(err)
+ assert.NotNil(state)
+ assert.Equal(1, len(state.Plugins),
+ "expected one plugin to be rendered")
+ assert.Equal("key-auth", *state.Plugins[0].Name)
+ assert.Equal(1, len(state.Plugins[0].Protocols))
+ assert.Equal("grpc", *state.Plugins[0].Protocols[0])
+ assert.Equal(kong.Configuration{"foo": "bar"}, state.Plugins[0].Config)
+ })
+}
+
 func TestServiceClientCertificate(t *testing.T) {
  assert := assert.New(t)
  t.Run("valid client-cert annotation", func(t *testing.T) {