Skip to content

Commit ccf6b65

Browse files
committed
fix:
1 parent dfe3a1d commit ccf6b65

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

internal/provider/adc/translator/gateway.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
package translator
22

33
import (
4+
"encoding/json"
5+
46
adctypes "github.com/api7/api7-ingress-controller/api/adc"
57
"github.com/api7/api7-ingress-controller/api/v1alpha1"
68
"github.com/api7/api7-ingress-controller/internal/provider"
9+
"github.com/api7/gopkg/pkg/log"
10+
"go.uber.org/zap"
711
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
812
)
913

@@ -15,9 +19,19 @@ func (t *Translator) fillPluginsFromGatewayProxy(plugins adctypes.Plugins, gatew
1519

1620
for _, plugin := range gatewayProxy.Spec.Plugins {
1721
// only apply enabled plugins
18-
if plugin.Enabled {
19-
plugins[plugin.Name] = plugin.Config
22+
if !plugin.Enabled {
23+
continue
24+
}
25+
26+
pluginName := plugin.Name
27+
var pluginConfig map[string]any
28+
if err := json.Unmarshal(plugin.Config.Raw, &pluginConfig); err != nil {
29+
log.Errorw("gateway proxy plugin config unmarshal failed", zap.Error(err), zap.String("plugin", pluginName))
30+
continue
2031
}
32+
33+
log.Debugw("fill plugin from gateway proxy", zap.String("plugin", pluginName), zap.Any("config", pluginConfig))
34+
plugins[pluginName] = pluginConfig
2135
}
2236
}
2337

0 commit comments

Comments
 (0)