From 92a4bebb2e060d233a00797f35753128ecfd6beb Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 7 May 2021 19:17:45 +0800 Subject: [PATCH] cloudproxy: forwards: show details for fwd returned from create-from-server --- pkg/cloudproxy/models/forwards.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/cloudproxy/models/forwards.go b/pkg/cloudproxy/models/forwards.go index 5949c57a36..9fcce616ca 100644 --- a/pkg/cloudproxy/models/forwards.go +++ b/pkg/cloudproxy/models/forwards.go @@ -256,7 +256,11 @@ func (man *SForwardManager) PerformCreateFromServer(ctx context.Context, userCre data, err = man.validatePortReq(ctx, typ, -1, agentId, epId, data) } - forward := &SForward{} + forwardObj, err := db.NewModelObject(man) + if err != nil { + return nil, httperrors.NewGeneralError(err) + } + forward := forwardObj.(*SForward) if err := data.Unmarshal(forward); err != nil { return nil, httperrors.NewServerError("unmarshal create params: %v", err) } @@ -267,7 +271,7 @@ func (man *SForwardManager) PerformCreateFromServer(ctx context.Context, userCre return nil, httperrors.NewServerError("database insertion error: %v", err) } - return jsonutils.Marshal(forward), nil + return db.GetItemDetails(man, forward, ctx, userCred) } func (man *SForwardManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {