fix(apigateway): ignore fetch IDP errors in getRegions (#10070)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2021-01-29 02:34:47 +08:00
committed by GitHub
parent b8b4c16c87
commit b2e00a8adb

View File

@@ -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")