feat: refactor listResource and update plugin metadata listing

Author: dspo

api/adc/types.go

@@ -93,8 +93,8 @@ type ConsumerElement struct {
 type Credential struct {
 	Metadata `json:",inline" yaml:",inline"`
 
-	Config map[string]interface{} `json:"config" yaml:"config"`
-	Type   string                 `json:"type" yaml:"type"`
+	Config map[string]any `json:"config" yaml:"config"`
+	Type   string         `json:"type" yaml:"type"`
 }
 
 type Service struct {
@@ -243,7 +243,7 @@ const (
 	Server SSLType = "server"
 )
 
-type Plugins map[string]interface{}
+type Plugins map[string]any
 
 func (p *Plugins) DeepCopyInto(out *Plugins) {
 	b, _ := json.Marshal(&p)

config/samples/gateway.apisix.io_v1alpha1_gatewayproxy.yaml

@@ -1,4 +1,4 @@
-apiVersion: gateway.apisix.io.github.com/v1alpha1
+apiVersion: gateway.apisix.io/v1alpha1
 kind: GatewayProxy
 metadata:
   labels:
@@ -9,4 +9,5 @@ metadata:
     app.kubernetes.io/created-by: api7-ingress-controller
   name: gatewayproxy-sample
 spec:
-  # TODO(user): Add fields here
+  pluginMetadata:
+    "error-page": {"enable":false}

pkg/dashboard/cluster.go

@@ -533,6 +533,12 @@ func addQueryParam(urlStr string, labels map[string]string) string {
 }
 
 func (c *cluster) listResource(ctx context.Context, url, resource string) (listResponse, error) {
+	var list listResponse
+	err := c.listResourceToResponse(ctx, url, resource, &list)
+	return list, err
+}
+
+func (c *cluster) listResourceToResponse(ctx context.Context, url, resource string, listResponse any) error {
 	log.Debugw("list resource in cluster",
 		zap.String("cluster_name", c.name),
 		zap.String("name", resource),
@@ -544,29 +550,25 @@ func (c *cluster) listResource(ctx context.Context, url, resource string) (listR
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
-		return listResponse{}, err
+		return err
 	}
 	resp, err := c.do(req)
 	if err != nil {
-		return listResponse{}, err
+		return err
 	}
 
 	defer drainBody(resp.Body, url)
 	if resp.StatusCode != http.StatusOK {
 		body := readBody(resp.Body, url)
 		if c.isFunctionDisabled(body) {
-			return listResponse{}, ErrFunctionDisabled
+			return ErrFunctionDisabled
 		}
 		err = multierr.Append(err, fmt.Errorf("unexpected status code %d", resp.StatusCode))
 		err = multierr.Append(err, fmt.Errorf("error message: %s", body))
-		return listResponse{}, err
-	}
-	var list listResponse
-	byt, _ := io.ReadAll(resp.Body)
-	if err := json.Unmarshal(byt, &list); err != nil {
-		return listResponse{}, err
+		return err
 	}
-	return list, nil
+
+	return json.NewDecoder(resp.Body).Decode(listResponse)
 }
 
 func (c *cluster) createResource(ctx context.Context, url, resource string, body []byte) (*getResponse, error) {

pkg/dashboard/plugin_metadata.go

@@ -67,32 +67,27 @@ func (r *pluginMetadataClient) Get(ctx context.Context, name string) (*v1.Plugin
 	return pluginMetadata, nil
 }
 
-func (r *pluginMetadataClient) List(ctx context.Context) ([]*v1.PluginMetadata, error) {
+func (r *pluginMetadataClient) List(ctx context.Context) (list []*v1.PluginMetadata, err error) {
 	log.Debugw("try to list pluginMetadatas in APISIX",
 		zap.String("cluster", r.cluster.name),
 		zap.String("url", r.url),
 	)
-	pluginMetadataItems, err := r.cluster.listResource(ctx, r.url, "pluginMetadata")
+	var resp = struct {
+		Value map[string]map[string]any
+	}{}
+	err = r.cluster.listResourceToResponse(ctx, r.url, "plugin_metadata", &resp)
 	if err != nil {
 		log.Errorf("failed to list pluginMetadatas: %s", err)
 		return nil, err
 	}
-
-	items := make([]*v1.PluginMetadata, 0, len(pluginMetadataItems.List))
-	for _, item := range pluginMetadataItems.List {
-		pluginMetadata, err := item.pluginMetadata()
-		if err != nil {
-			log.Errorw("failed to convert pluginMetadata item",
-				zap.String("url", r.url),
-				zap.Error(err),
-			)
-			return nil, err
-		}
-
-		items = append(items, pluginMetadata)
+	for name, metadata := range resp.Value {
+		list = append(list, &v1.PluginMetadata{
+			Name:     name,
+			Metadata: metadata,
+		})
 	}
 
-	return items, nil
+	return
 }
 
 func (r *pluginMetadataClient) Delete(ctx context.Context, obj *v1.PluginMetadata) error {

pkg/dashboard/resource.go

@@ -348,18 +348,6 @@ func (i *getResponse) pluginMetadata() (*v1.PluginMetadata, error) {
 	return &pluginMetadata, nil
 }
 
-func (i *listItem) pluginMetadata() (*v1.PluginMetadata, error) {
-	byt, err := json.Marshal(i)
-	if err != nil {
-		return nil, err
-	}
-	var pluginMetadata v1.PluginMetadata
-	if err := json.Unmarshal(byt, &pluginMetadata.Metadata); err != nil {
-		return nil, err
-	}
-	return &pluginMetadata, nil
-}
-
 // // pluginConfig decodes item.Value and converts it to v1.PluginConfig.
 // func (i *item) pluginConfig() (*v1.PluginConfig, error) {
 // 	log.Debugf("got pluginConfig: %s", string(i.Value))