Skip to content

cherry pick #4777 for 4.3.0 #4784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leebrouse wants to merge 5 commits into
base: release-4.3.0
Choose a base branch
from
Open

cherry pick #4777 for 4.3.0 #4784

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
502822d
fix: show all of dms data
leebrouse Jun 25, 2026
8f4ae90
fix: proto render
leebrouse Jun 25, 2026
666ed83
debug: add log for proto
leebrouse Jun 25, 2026
3fc6072
fix: proto id render
leebrouse Jun 25, 2026
b40ab95
fix: proto render id
leebrouse Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkg/microservice/aslan/core/common/service/workflowcontroller/jobcontroller/job_apisix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,13 +289,14 @@ func (c *ApisixJobCtl) executeServiceTask(client *apisix.Client, task *commonmod

func (c *ApisixJobCtl) executeProtoTask(client *apisix.Client, task *commonmodels.ApisixItemUpdateSpec) error {
proto, err := convertToProto(task.UserSpec)

if err != nil {
return fmt.Errorf("failed to convert spec to proto: %v", err)
}

switch task.Action {
case config.ApisixActionTypeCreate:
resp, err := client.CreateProto(proto)
resp, err := client.UpdateProto(proto.ID, proto)
if err != nil {
return err
}
Expand Down Expand Up @@ -398,6 +399,8 @@ func convertToProto(spec interface{}) (*apisix.Proto, error) {
if err := json.Unmarshal(data, proto); err != nil {
return nil, fmt.Errorf("failed to unmarshal to proto: %v", err)
}
proto.Desc = proto.Name
proto.ID = proto.Name

return proto, nil
}
Expand Down
Loading