From c0a59b32d8aa1ac51bf632a7459c13411f3fcf9a Mon Sep 17 00:00:00 2001 From: TangBin Date: Mon, 12 Aug 2019 20:24:49 +0800 Subject: [PATCH 1/2] get spec fix --- pkg/apigateway/handler/resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/apigateway/handler/resource.go b/pkg/apigateway/handler/resource.go index c2afc55f6f..d29f8c3d7c 100644 --- a/pkg/apigateway/handler/resource.go +++ b/pkg/apigateway/handler/resource.go @@ -277,7 +277,7 @@ func (f *ResourceHandlers) getSpecHandler(ctx context.Context, w http.ResponseWr appsrv.SendJSON(w, modules.ListResult2JSON(ret)) } } else { - obj, e := module.GetSpecific(session, req.Spec(), req.Spec(), query) + obj, e := module.GetSpecific(session, req.ResID(), req.Spec(), query) if e != nil { httperrors.GeneralServerError(w, e) } else { From 17a5c3243022275c54be6ff3ec008d47a862ec5f Mon Sep 17 00:00:00 2001 From: TangBin Date: Tue, 13 Aug 2019 11:33:34 +0800 Subject: [PATCH 2/2] bucket upload fix --- pkg/mcclient/modules/mod_buckets.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/mcclient/modules/mod_buckets.go b/pkg/mcclient/modules/mod_buckets.go index 674aea601f..0b80ada9f3 100644 --- a/pkg/mcclient/modules/mod_buckets.go +++ b/pkg/mcclient/modules/mod_buckets.go @@ -51,10 +51,16 @@ func (manager *SBucketManager) Upload(s *mcclient.ClientSession, bucketId string headers.Set(api.BUCKET_UPLOAD_OBJECT_ACL_HEADER, acl) } - _, err := manager.rawRequest(s, method, path, headers, body) + resp, err := manager.rawRequest(s, method, path, headers, body) if err != nil { return errors.Wrap(err, "rawRequest") } + + _, _, err = s.ParseJSONResponse(resp, err) + if err != nil { + return err + } + return nil }