From a71c8754700e70521641cd0ec20e884774253dcf Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Mon, 11 Jan 2021 15:52:51 +0800 Subject: [PATCH] keystone: reword error messages --- pkg/keystone/models/credentials.go | 2 +- pkg/keystone/models/domains.go | 2 +- pkg/keystone/models/identity_provider.go | 2 +- pkg/keystone/models/services.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/keystone/models/credentials.go b/pkg/keystone/models/credentials.go index 2cb5263281..1e4043946d 100644 --- a/pkg/keystone/models/credentials.go +++ b/pkg/keystone/models/credentials.go @@ -113,7 +113,7 @@ func (manager *SCredentialManager) InitializeData() error { func (manager *SCredentialManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) { if !data.Contains("type") { - return nil, httperrors.NewInputParameterError("missing input feild type") + return nil, httperrors.NewInputParameterError("missing input field type") } projectId, _ := data.GetString("project_id") userId := ownerId.GetUserId() diff --git a/pkg/keystone/models/domains.go b/pkg/keystone/models/domains.go index e069705d40..27d012160b 100644 --- a/pkg/keystone/models/domains.go +++ b/pkg/keystone/models/domains.go @@ -286,7 +286,7 @@ func (domain *SDomain) ValidatePurgeCondition(ctx context.Context) error { } groupCnt, _ := domain.GetGroupCount() if groupCnt > 0 { - return httperrors.NewInvalidStatusError("group is in use by group") + return httperrors.NewInvalidStatusError("domain is in use by group") } projCnt, _ := domain.GetProjectCount() if projCnt > 0 { diff --git a/pkg/keystone/models/identity_provider.go b/pkg/keystone/models/identity_provider.go index 07a4755d2a..4c5da7003b 100644 --- a/pkg/keystone/models/identity_provider.go +++ b/pkg/keystone/models/identity_provider.go @@ -344,7 +344,7 @@ func (ident *SIdentityProvider) PerformConfig(ctx context.Context, userCred mccl action := input.Action changed, err := saveConfigs(userCred, action, ident, opts, nil, nil, api.SensitiveDomainConfigMap) if err != nil { - return nil, httperrors.NewInternalServerError("saveConfig fail %s", err) + return nil, httperrors.NewInternalServerError("saveConfigs fail %s", err) } if changed { ident.MarkDisconnected(ctx, userCred, fmt.Errorf("change config")) diff --git a/pkg/keystone/models/services.go b/pkg/keystone/models/services.go index 5de30e4374..0c545160b9 100644 --- a/pkg/keystone/models/services.go +++ b/pkg/keystone/models/services.go @@ -207,7 +207,7 @@ func (service *SService) PerformConfig(ctx context.Context, userCred mcclient.To changed, err = saveConfigs(userCred, action, service, opts, nil, api.MergeServiceConfigOptions(api.CommonWhitelistOptionMap, api.ServiceBlacklistOptionMap), nil) } if err != nil { - return nil, httperrors.NewInternalServerError("saveConfig fail %s", err) + return nil, httperrors.NewInternalServerError("saveConfigs fail %s", err) } if changed { diff := SService{ConfigVersion: 1}