sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant error checks

Browse Source
This commit is contained in:
Benedikt Kulmann
2020-08-20 15:01:40 +02:00
parent 95b929a6a6
commit c5ce80b666
1 changed files with 15 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/service/v0/validator.go
+15 -48
View File
@@ -46,17 +46,11 @@ func validateSaveBundle(req *proto.SaveBundleRequest) error {
} }
func validateGetBundle(req *proto.GetBundleRequest) error { func validateGetBundle(req *proto.GetBundleRequest) error {
if err := validation.Validate(&req.BundleId, requireAccountID...); err != nil { return validation.Validate(&req.BundleId, requireAccountID...)
return err
}
return nil
} }
func validateListBundles(req *proto.ListBundlesRequest) error { func validateListBundles(req *proto.ListBundlesRequest) error {
if err := validation.Validate(&req.AccountUuid, requireAccountID...); err != nil { return validation.Validate(&req.AccountUuid, requireAccountID...)
return err
}
return nil
} }
func validateAddSettingToBundle(req *proto.AddSettingToBundleRequest) error { func validateAddSettingToBundle(req *proto.AddSettingToBundleRequest) error {
@@ -67,14 +61,11 @@ func validateAddSettingToBundle(req *proto.AddSettingToBundleRequest) error {
} }
func validateRemoveSettingFromBundle(req *proto.RemoveSettingFromBundleRequest) error { func validateRemoveSettingFromBundle(req *proto.RemoveSettingFromBundleRequest) error {
if err := validation.ValidateStruct( return validation.ValidateStruct(
req, req,
validation.Field(&req.BundleId, is.UUID), validation.Field(&req.BundleId, is.UUID),
validation.Field(&req.SettingId, is.UUID), validation.Field(&req.SettingId, is.UUID),
); err != nil { )
return err
}
return nil
} }
func validateSaveValue(req *proto.SaveValueRequest) error { func validateSaveValue(req *proto.SaveValueRequest) error {
@@ -97,56 +88,38 @@ func validateSaveValue(req *proto.SaveValueRequest) error {
} }
func validateGetValue(req *proto.GetValueRequest) error { func validateGetValue(req *proto.GetValueRequest) error {
if err := validation.Validate(req.Id, is.UUID); err != nil { return validation.Validate(req.Id, is.UUID)
return err
}
return nil
} }
func validateListValues(req *proto.ListValuesRequest) error { func validateListValues(req *proto.ListValuesRequest) error {
if err := validation.ValidateStruct( return validation.ValidateStruct(
req, req,
validation.Field(&req.BundleId, validation.When(req.BundleId != "", is.UUID)), validation.Field(&req.BundleId, validation.When(req.BundleId != "", is.UUID)),
validation.Field(&req.AccountUuid, validation.When(req.AccountUuid != "", validation.Match(regexForAccountUUID))), validation.Field(&req.AccountUuid, validation.When(req.AccountUuid != "", validation.Match(regexForAccountUUID))),
); err != nil { )
return err
}
return nil
} }
func validateListRoles(req *proto.ListBundlesRequest) error { func validateListRoles(req *proto.ListBundlesRequest) error {
if err := validation.Validate(&req.AccountUuid, requireAccountID...); err != nil { return validation.Validate(&req.AccountUuid, requireAccountID...)
return err
}
return nil
} }
func validateListRoleAssignments(req *proto.ListRoleAssignmentsRequest) error { func validateListRoleAssignments(req *proto.ListRoleAssignmentsRequest) error {
if err := validation.Validate(req.AccountUuid, requireAccountID...); err != nil { return validation.Validate(req.AccountUuid, requireAccountID...)
return err
}
return nil
} }
func validateAssignRoleToUser(req *proto.AssignRoleToUserRequest) error { func validateAssignRoleToUser(req *proto.AssignRoleToUserRequest) error {
if err := validation.ValidateStruct( return validation.ValidateStruct(
req, req,
validation.Field(&req.AccountUuid, requireAccountID...), validation.Field(&req.AccountUuid, requireAccountID...),
validation.Field(&req.RoleId, is.UUID), validation.Field(&req.RoleId, is.UUID),
); err != nil { )
return err
}
return nil
} }
func validateRemoveRoleFromUser(req *proto.RemoveRoleFromUserRequest) error { func validateRemoveRoleFromUser(req *proto.RemoveRoleFromUserRequest) error {
if err := validation.ValidateStruct( return validation.ValidateStruct(
req, req,
validation.Field(&req.Id, is.UUID), validation.Field(&req.Id, is.UUID),
); err != nil { )
return err
}
return nil
} }
// validateResource is an internal helper for validating the content of a resource. // validateResource is an internal helper for validating the content of a resource.
@@ -154,10 +127,7 @@ func validateResource(resource *proto.Resource) error {
if err := validation.Validate(&resource, validation.Required); err != nil { if err := validation.Validate(&resource, validation.Required); err != nil {
return err return err
} }
if err := validation.Validate(&resource, validation.NotIn(proto.Resource_TYPE_UNKNOWN)); err != nil { return validation.Validate(&resource, validation.NotIn(proto.Resource_TYPE_UNKNOWN))
return err
}
return nil
} }
// validateSetting is an internal helper for validating the content of a setting. // validateSetting is an internal helper for validating the content of a setting.
@@ -170,8 +140,5 @@ func validateSetting(setting *proto.Setting) error {
); err != nil { ); err != nil {
return err return err
} }
if err := validateResource(setting.Resource); err != nil { return validateResource(setting.Resource)
return err
}
return nil
} }