fix: API7 EE compatibility — unwrap value envelope, route paths, error_msg field

Round 5 fixes for e2e tests against API7 Enterprise Edition:

- Add unwrapValueEnvelope() to strip {"value": {...}} response wrapper
- Fix APIError json tag from "message" to "error_msg"
- Add Route.Paths field, --path flag, backward-compat --uri conversion
- Add --service-id flag to route list command
- Accept positional ID arg in credential create
- Skip plugins without metadata_schema in config dump
- Update all e2e test fixtures: routes use name+paths format
- Global rule update test uses single plugin (API7 EE constraint)
- Update all unit test mocks to use error_msg field

Author: moonming

pkg/api/client.go

@@ -132,5 +132,30 @@ func (c *Client) do(method, path string, query map[string]string, body interface
 		return nil, &apiErr
 	}
 
-	return respBody, nil
+	// API7 EE wraps single-resource responses in {"value": {...}}.
+	// List responses use {"total": N, "list": [...]}, left as-is.
+	return unwrapValueEnvelope(respBody), nil
+}
+
+// unwrapValueEnvelope strips the API7 EE {"value": ...} envelope from
+// single-resource responses. List responses and non-object bodies pass through.
+func unwrapValueEnvelope(body []byte) []byte {
+	trimmed := bytes.TrimSpace(body)
+	if len(trimmed) == 0 || trimmed[0] != '{' {
+		return body
+	}
+
+	var envelope map[string]json.RawMessage
+	if err := json.Unmarshal(body, &envelope); err != nil {
+		return body
+	}
+
+	val, hasValue := envelope["value"]
+	_, hasList := envelope["list"]
+	_, hasTotal := envelope["total"]
+	if hasValue && !hasList && !hasTotal && len(envelope) <= 2 {
+		return val
+	}
+
+	return body
 }

pkg/api/client_test.go

@@ -179,7 +179,7 @@ func TestClient_APIError(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusBadRequest)
 		w.Header().Set("Content-Type", "application/json")
-		w.Write([]byte(`{"message":"bad request"}`))
+		w.Write([]byte(`{"error_msg":"bad request"}`))
 	}))
 	defer server.Close()
 
@@ -213,7 +213,7 @@ func TestClient_APIError_401(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusUnauthorized)
 		w.Header().Set("Content-Type", "application/json")
-		w.Write([]byte(`{"message":"invalid api key"}`))
+		w.Write([]byte(`{"error_msg":"invalid api key"}`))
 	}))
 	defer server.Close()
 
@@ -884,7 +884,7 @@ func TestClient_StatusCode_204(t *testing.T) {
 func TestClient_StatusCode_400(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusBadRequest)
-		w.Write([]byte(`{"message": "bad request"}`))
+		w.Write([]byte(`{"error_msg": "bad request"}`))
 	}))
 	defer server.Close()
 
@@ -904,7 +904,7 @@ func TestClient_StatusCode_400(t *testing.T) {
 func TestClient_StatusCode_403(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusForbidden)
-		w.Write([]byte(`{"message": "forbidden"}`))
+		w.Write([]byte(`{"error_msg": "forbidden"}`))
 	}))
 	defer server.Close()
 
@@ -933,7 +933,7 @@ func TestClient_StatusCode_403(t *testing.T) {
 func TestClient_StatusCode_404(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusNotFound)
-		w.Write([]byte(`{"message": "not found"}`))
+		w.Write([]byte(`{"error_msg": "not found"}`))
 	}))
 	defer server.Close()
 
@@ -962,7 +962,7 @@ func TestClient_StatusCode_404(t *testing.T) {
 func TestClient_StatusCode_500(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusInternalServerError)
-		w.Write([]byte(`{"message": "internal error"}`))
+		w.Write([]byte(`{"error_msg": "internal error"}`))
 	}))
 	defer server.Close()
 
@@ -991,7 +991,7 @@ func TestClient_StatusCode_500(t *testing.T) {
 func TestClient_StatusCode_502(t *testing.T) {
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusBadGateway)
-		w.Write([]byte(`{"message": "bad gateway"}`))
+		w.Write([]byte(`{"error_msg": "bad gateway"}`))
 	}))
 	defer server.Close()
 

pkg/api/types.go

@@ -19,7 +19,7 @@ type SingleResponse[T any] struct {
 // APIError represents an error response from the API7 EE Admin API.
 type APIError struct {
 	StatusCode int    `json:"-"`
-	ErrorMsg   string `json:"message"`
+	ErrorMsg   string `json:"error_msg"`
 }
 
 func (e *APIError) Error() string {

pkg/api/types_route.go

@@ -7,6 +7,7 @@ type Route struct {
 	Desc       string                 `json:"desc,omitempty" yaml:"desc,omitempty"`
 	URI        string                 `json:"uri,omitempty" yaml:"uri,omitempty"`
 	URIs       []string               `json:"uris,omitempty" yaml:"uris,omitempty"`
+	Paths      []string               `json:"paths,omitempty" yaml:"paths,omitempty"`
 	Methods    []string               `json:"methods,omitempty" yaml:"methods,omitempty"`
 	Host       string                 `json:"host,omitempty" yaml:"host,omitempty"`
 	Hosts      []string               `json:"hosts,omitempty" yaml:"hosts,omitempty"`

pkg/cmd/config/configutil/configutil.go

@@ -462,6 +462,15 @@ func fetchPluginMetadata(client *api.Client, query map[string]string) ([]api.Plu
 			if cmdutil.IsNotFound(err) {
 				continue
 			}
+			// Skip plugins that don't support metadata (e.g., "plugin doesn't
+			// have metadata_schema"). This is common in API7 EE where some
+			// plugins expose the metadata endpoint but return an error.
+			errMsg := err.Error()
+			if strings.Contains(errMsg, "metadata_schema") ||
+				strings.Contains(errMsg, "doesn't have") ||
+				cmdutil.IsOptionalResourceError(err) {
+				continue
+			}
 			return nil, err
 		}
 

pkg/cmd/credential/create/create.go

@@ -23,6 +23,7 @@ type Options struct {
 	GatewayGroup string
 	Consumer     string
 	File         string
+	ID           string
 
 	Desc        string
 	PluginsJSON string
@@ -32,13 +33,16 @@ type Options struct {
 func NewCmd(f *cmd.Factory) *cobra.Command {
 	opts := &Options{IO: f.IOStreams, Client: f.HttpClient, Config: f.Config}
 	c := &cobra.Command{
-		Use:   "create",
+		Use:   "create [id]",
 		Short: "Create a credential",
-		Args:  cobra.NoArgs,
+		Args:  cobra.MaximumNArgs(1),
 		RunE: func(c *cobra.Command, args []string) error {
 			opts.Output, _ = c.Flags().GetString("output")
 			opts.GatewayGroup, _ = c.Flags().GetString("gateway-group")
 			opts.Consumer, _ = c.Flags().GetString("consumer")
+			if len(args) > 0 {
+				opts.ID = args[0]
+			}
 			return actionRun(opts)
 		},
 	}
@@ -75,6 +79,10 @@ func actionRun(opts *Options) error {
 			return err
 		}
 
+		if opts.ID != "" {
+			payload["id"] = opts.ID
+		}
+
 		httpClient, err := opts.Client()
 		if err != nil {
 			return err

pkg/cmd/route/create/create.go

@@ -25,6 +25,7 @@ type Options struct {
 
 	Name       string
 	URI        string
+	Paths      []string
 	Methods    []string
 	Host       string
 	ServiceID  string
@@ -48,7 +49,8 @@ func NewCmd(f *cmd.Factory) *cobra.Command {
 
 	c.Flags().StringVar(&opts.Name, "name", "", "Route name")
 	c.Flags().StringVarP(&opts.File, "file", "f", "", "Path to JSON/YAML file with resource definition")
-	c.Flags().StringVar(&opts.URI, "uri", "", "Route URI")
+	c.Flags().StringVar(&opts.URI, "uri", "", "Route URI (single path, APISIX compat)")
+	c.Flags().StringSliceVar(&opts.Paths, "path", nil, "Route path (repeatable, API7 EE format)")
 	c.Flags().StringSliceVar(&opts.Methods, "methods", nil, "Allowed HTTP methods")
 	c.Flags().StringVar(&opts.Host, "host", "", "Route host")
 	c.Flags().StringVar(&opts.ServiceID, "service-id", "", "Bound service ID")
@@ -100,8 +102,18 @@ func actionRun(opts *Options) error {
 		}
 		return cmdutil.NewExporter(format, opts.IO.Out).Write(json.RawMessage(body))
 	}
-	if opts.URI == "" {
-		return fmt.Errorf("--uri is required")
+	if opts.URI == "" && len(opts.Paths) == 0 {
+		return fmt.Errorf("--path or --uri is required")
+	}
+
+	if opts.Name == "" {
+		return fmt.Errorf("--name is required for flag-based route creation")
+	}
+
+	// Convert --uri to Paths for API7 EE compatibility.
+	paths := opts.Paths
+	if len(paths) == 0 && opts.URI != "" {
+		paths = []string{opts.URI}
 	}
 
 	httpClient, err := opts.Client()
@@ -120,7 +132,7 @@ func actionRun(opts *Options) error {
 
 	bodyReq := api.Route{
 		Name:       opts.Name,
-		URI:        opts.URI,
+		Paths:      paths,
 		Methods:    opts.Methods,
 		Host:       opts.Host,
 		ServiceID:  opts.ServiceID,

pkg/cmd/route/get/get.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -81,6 +82,7 @@ func actionRun(opts *Options) error {
 	tp.AddRow("id", item.ID)
 	tp.AddRow("name", item.Name)
 	tp.AddRow("uri", item.URI)
+	tp.AddRow("paths", strings.Join(item.Paths, ", "))
 	tp.AddRow("host", item.Host)
 	tp.AddRow("service_id", item.ServiceID)
 	tp.AddRow("upstream_id", item.UpstreamID)

pkg/cmd/route/list/list.go

@@ -23,6 +23,7 @@ type Options struct {
 	Output       string
 	GatewayGroup string
 	Label        string
+	ServiceID    string
 }
 
 func NewCmd(f *cmd.Factory) *cobra.Command {
@@ -36,10 +37,12 @@ func NewCmd(f *cmd.Factory) *cobra.Command {
 			opts.Output, _ = c.Flags().GetString("output")
 			opts.GatewayGroup, _ = c.Flags().GetString("gateway-group")
 			opts.Label, _ = c.Flags().GetString("label")
+			opts.ServiceID, _ = c.Flags().GetString("service-id")
 			return actionRun(opts)
 		},
 	}
 	c.Flags().StringVar(&opts.Label, "label", "", "Filter by label (key=value)")
+	c.Flags().StringVar(&opts.ServiceID, "service-id", "", "Filter by service ID (required by API7 EE)")
 	return c
 }
 
@@ -64,6 +67,9 @@ func actionRun(opts *Options) error {
 
 	client := api.NewClient(httpClient, cfg.BaseURL())
 	query := map[string]string{"gateway_group_id": ggID}
+	if opts.ServiceID != "" {
+		query["service_id"] = opts.ServiceID
+	}
 	labelKey, labelValue := cmdutil.ParseLabel(opts.Label)
 	if labelKey != "" {
 		query["label"] = labelKey
@@ -94,13 +100,16 @@ func actionRun(opts *Options) error {
 	}
 
 	tp := tableprinter.New(opts.IO.Out)
-	tp.SetHeaders("ID", "NAME", "URI", "METHODS", "STATUS")
+	tp.SetHeaders("ID", "NAME", "PATHS", "METHODS", "STATUS")
 	for _, item := range resp.List {
-		uri := item.URI
-		if uri == "" && len(item.URIs) > 0 {
-			uri = strings.Join(item.URIs, ",")
+		paths := strings.Join(item.Paths, ",")
+		if paths == "" {
+			paths = item.URI
+			if paths == "" && len(item.URIs) > 0 {
+				paths = strings.Join(item.URIs, ",")
+			}
 		}
-		tp.AddRow(item.ID, item.Name, uri, strings.Join(item.Methods, ","), fmt.Sprintf("%d", item.Status))
+		tp.AddRow(item.ID, item.Name, paths, strings.Join(item.Methods, ","), fmt.Sprintf("%d", item.Status))
 	}
 
 	return tp.Render()

pkg/cmd/route/list/list_test.go

@@ -81,8 +81,8 @@ func TestListRoutes_Table(t *testing.T) {
 	if !strings.Contains(output, "NAME") {
 		t.Error("table should contain NAME header")
 	}
-	if !strings.Contains(output, "URI") {
-		t.Error("table should contain URI header")
+	if !strings.Contains(output, "PATHS") {
+		t.Error("table should contain PATHS header")
 	}
 	if !strings.Contains(output, "METHODS") {
 		t.Error("table should contain METHODS header")