From c6ae93a2eacd214f29b2d930f621d69cf474d023 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Mon, 12 Nov 2018 20:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E5=A6=82=E6=9E=9Cpo?= =?UTF-8?q?licy=20blob=E9=94=99=E8=AF=AF=EF=BC=8C=E5=88=99=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=BF=AE=E6=94=B9=E5=92=8C=E5=88=A0=E9=99=A4policy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/mcclient/modules/mod_policies.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/mcclient/modules/mod_policies.go b/pkg/mcclient/modules/mod_policies.go index dfcf61557a..16182d1d88 100644 --- a/pkg/mcclient/modules/mod_policies.go +++ b/pkg/mcclient/modules/mod_policies.go @@ -16,11 +16,12 @@ func policyReadFilter(session *mcclient.ClientSession, s jsonutils.JSONObject) ( ret := ss.CopyIncludes("id", "type") blobStr, _ := ss.GetString("blob") if len(blobStr) > 0 { - blobJson, err := jsonutils.ParseString(blobStr) - if err != nil { - return nil, err + blobJson, _ := jsonutils.ParseString(blobStr) + var policy string + if blobJson != nil { + policy = blobJson.YAMLString() } - ret.Add(jsonutils.NewString(blobJson.YAMLString()), "policy") + ret.Add(jsonutils.NewString(policy), "policy") } return ret, nil }