[#282] apistatus: Support OUT_OF_RANGE error

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-06-29 20:24:56 +03:00 committed by LeL
parent 27fe9c19a7
commit df6538c68c
5 changed files with 47 additions and 0 deletions

View file

@ -684,6 +684,7 @@ func (x *ObjectRangeReader) close(ignoreEOF bool) (*ResObjectRange, error) {
// - *apistatus.ObjectNotFound; // - *apistatus.ObjectNotFound;
// - *apistatus.ObjectAccessDenied; // - *apistatus.ObjectAccessDenied;
// - *apistatus.ObjectAlreadyRemoved; // - *apistatus.ObjectAlreadyRemoved;
// - *apistatus.ObjectOutOfRange;
// - *apistatus.SessionTokenExpired. // - *apistatus.SessionTokenExpired.
func (x *ObjectRangeReader) Close() (*ResObjectRange, error) { func (x *ObjectRangeReader) Close() (*ResObjectRange, error) {
return x.close(true) return x.close(true)

View file

@ -152,6 +152,7 @@ func (x ResObjectHash) Checksums() [][]byte {
// - *apistatus.ContainerNotFound; // - *apistatus.ContainerNotFound;
// - *apistatus.ObjectNotFound; // - *apistatus.ObjectNotFound;
// - *apistatus.ObjectAccessDenied; // - *apistatus.ObjectAccessDenied;
// - *apistatus.ObjectOutOfRange;
// - *apistatus.SessionTokenExpired. // - *apistatus.SessionTokenExpired.
func (c *Client) ObjectHash(ctx context.Context, prm PrmObjectHash) (*ResObjectHash, error) { func (c *Client) ObjectHash(ctx context.Context, prm PrmObjectHash) (*ResObjectHash, error) {
switch { switch {

View file

@ -165,3 +165,34 @@ func (x ObjectAlreadyRemoved) ToStatusV2() *status.Status {
x.v2.SetMessage("object already removed") x.v2.SetMessage("object already removed")
return &x.v2 return &x.v2
} }
// ObjectOutOfRange describes status of the failure because of the incorrect
// provided object ranges.
// Instances provide Status and StatusV2 interfaces.
type ObjectOutOfRange struct {
v2 status.Status
}
func (x ObjectOutOfRange) Error() string {
return errMessageStatusV2(
globalizeCodeV2(object.StatusOutOfRange, object.GlobalizeFail),
x.v2.Message(),
)
}
// implements local interface defined in FromStatusV2 func.
func (x *ObjectOutOfRange) fromStatusV2(st *status.Status) {
x.v2 = *st
}
// ToStatusV2 implements StatusV2 interface method.
// If the value was returned by FromStatusV2, returns the source message.
// Otherwise, returns message with
// * code: OUT_OF_RANGE;
// * string message: "out of range";
// * details: empty.
func (x ObjectOutOfRange) ToStatusV2() *status.Status {
x.v2.SetCode(globalizeCodeV2(object.StatusOutOfRange, object.GlobalizeFail))
x.v2.SetMessage("out of range")
return &x.v2
}

View file

@ -71,6 +71,8 @@ func FromStatusV2(st *status.Status) Status {
decoder = new(ObjectNotFound) decoder = new(ObjectNotFound)
case object.StatusAlreadyRemoved: case object.StatusAlreadyRemoved:
decoder = new(ObjectAlreadyRemoved) decoder = new(ObjectAlreadyRemoved)
case object.StatusOutOfRange:
decoder = new(ObjectOutOfRange)
} }
case container.LocalizeFailStatus(&code): case container.LocalizeFailStatus(&code):
//nolint:exhaustive //nolint:exhaustive

View file

@ -95,6 +95,12 @@ func TestToStatusV2(t *testing.T) {
}), }),
codeV2: 2052, codeV2: 2052,
}, },
{
status: (statusConstructor)(func() apistatus.Status {
return new(apistatus.ObjectOutOfRange)
}),
codeV2: 2053,
},
{ {
status: (statusConstructor)(func() apistatus.Status { status: (statusConstructor)(func() apistatus.Status {
return new(apistatus.ContainerNotFound) return new(apistatus.ContainerNotFound)
@ -230,6 +236,12 @@ func TestFromStatusV2(t *testing.T) {
}), }),
codeV2: 2052, codeV2: 2052,
}, },
{
status: statusConstructor(func() apistatus.Status {
return new(apistatus.ObjectOutOfRange)
}),
codeV2: 2053,
},
{ {
status: (statusConstructor)(func() apistatus.Status { status: (statusConstructor)(func() apistatus.Status {
return new(apistatus.ContainerNotFound) return new(apistatus.ContainerNotFound)