From b2e00a8adb8077d8e6bf680095baab00a47ccd1a Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Fri, 29 Jan 2021 02:34:47 +0800 Subject: [PATCH] fix(apigateway): ignore fetch IDP errors in getRegions (#10070) Co-authored-by: Qiu Jian --- pkg/apigateway/handler/auth.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkg/apigateway/handler/auth.go b/pkg/apigateway/handler/auth.go index 4ca7588a62..00f7af4762 100644 --- a/pkg/apigateway/handler/auth.go +++ b/pkg/apigateway/handler/auth.go @@ -171,13 +171,12 @@ func (h *AuthHandlers) GetRegionsResponse(ctx context.Context, w http.ResponseWr filters.Add(jsonutils.JSONFalse, "auto_create_user") } idps, err := modules.IdentityProviders.List(s, filters) - if err != nil { - return nil, errors.Wrap(err, "list idp") - } retIdps := make([]jsonutils.JSONObject, 0) - for i := range idps.Data { - retIdp := idps.Data[i].(*jsonutils.JSONDict).CopyIncludes("id", "name", "driver", "template", "icon_uri", "is_default") - retIdps = append(retIdps, retIdp) + if err == nil { + for i := range idps.Data { + retIdp := idps.Data[i].(*jsonutils.JSONDict).CopyIncludes("id", "name", "driver", "template", "icon_uri", "is_default") + retIdps = append(retIdps, retIdp) + } } resp.Add(jsonutils.NewArray(retIdps...), "idps")