forked from TrueCloudLab/frostfs-sdk-go
[#140] apistatus: Support session errors
Define `SessionTokenNotFound`/`SessionTokenExpired` types for `TOKEN_NOT_FOUND`/`TOKEN_EXPIRED` codes. Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
parent
c627648798
commit
12aa7ae144
3 changed files with 99 additions and 0 deletions
66
client/status/session.go
Normal file
66
client/status/session.go
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
package apistatus
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/nspcc-dev/neofs-api-go/v2/session"
|
||||||
|
"github.com/nspcc-dev/neofs-api-go/v2/status"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SessionTokenNotFound describes status of the failure because of the missing session token.
|
||||||
|
// Instances provide Status and StatusV2 interfaces.
|
||||||
|
type SessionTokenNotFound struct {
|
||||||
|
v2 status.Status
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x SessionTokenNotFound) Error() string {
|
||||||
|
return errMessageStatusV2(
|
||||||
|
globalizeCodeV2(session.StatusTokenNotFound, session.GlobalizeFail),
|
||||||
|
x.v2.Message(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// implements local interface defined in FromStatusV2 func.
|
||||||
|
func (x *SessionTokenNotFound) 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: TOKEN_NOT_FOUND;
|
||||||
|
// * string message: "session token not found";
|
||||||
|
// * details: empty.
|
||||||
|
func (x SessionTokenNotFound) ToStatusV2() *status.Status {
|
||||||
|
x.v2.SetCode(globalizeCodeV2(session.StatusTokenNotFound, session.GlobalizeFail))
|
||||||
|
x.v2.SetMessage("session token not found")
|
||||||
|
return &x.v2
|
||||||
|
}
|
||||||
|
|
||||||
|
// SessionTokenExpired describes status of the failure because of the expired session token.
|
||||||
|
// Instances provide Status and StatusV2 interfaces.
|
||||||
|
type SessionTokenExpired struct {
|
||||||
|
v2 status.Status
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x SessionTokenExpired) Error() string {
|
||||||
|
return errMessageStatusV2(
|
||||||
|
globalizeCodeV2(session.StatusTokenExpired, session.GlobalizeFail),
|
||||||
|
x.v2.Message(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// implements local interface defined in FromStatusV2 func.
|
||||||
|
func (x *SessionTokenExpired) 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: TOKEN_EXPIRED;
|
||||||
|
// * string message: "expired session token";
|
||||||
|
// * details: empty.
|
||||||
|
func (x SessionTokenExpired) ToStatusV2() *status.Status {
|
||||||
|
x.v2.SetCode(globalizeCodeV2(session.StatusTokenExpired, session.GlobalizeFail))
|
||||||
|
x.v2.SetMessage("expired session token")
|
||||||
|
return &x.v2
|
||||||
|
}
|
|
@ -5,6 +5,7 @@ import (
|
||||||
|
|
||||||
"github.com/nspcc-dev/neofs-api-go/v2/container"
|
"github.com/nspcc-dev/neofs-api-go/v2/container"
|
||||||
"github.com/nspcc-dev/neofs-api-go/v2/object"
|
"github.com/nspcc-dev/neofs-api-go/v2/object"
|
||||||
|
"github.com/nspcc-dev/neofs-api-go/v2/session"
|
||||||
"github.com/nspcc-dev/neofs-api-go/v2/status"
|
"github.com/nspcc-dev/neofs-api-go/v2/status"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -74,6 +75,14 @@ func FromStatusV2(st *status.Status) Status {
|
||||||
case container.StatusNotFound:
|
case container.StatusNotFound:
|
||||||
decoder = new(ContainerNotFound)
|
decoder = new(ContainerNotFound)
|
||||||
}
|
}
|
||||||
|
case session.LocalizeFailStatus(&code):
|
||||||
|
//nolint:exhaustive
|
||||||
|
switch code {
|
||||||
|
case session.StatusTokenNotFound:
|
||||||
|
decoder = new(SessionTokenNotFound)
|
||||||
|
case session.StatusTokenExpired:
|
||||||
|
decoder = new(SessionTokenExpired)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if decoder == nil {
|
if decoder == nil {
|
||||||
|
|
|
@ -99,6 +99,18 @@ func TestToStatusV2(t *testing.T) {
|
||||||
}),
|
}),
|
||||||
codeV2: 3072,
|
codeV2: 3072,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
status: (statusConstructor)(func() apistatus.Status {
|
||||||
|
return new(apistatus.SessionTokenNotFound)
|
||||||
|
}),
|
||||||
|
codeV2: 4096,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
status: (statusConstructor)(func() apistatus.Status {
|
||||||
|
return new(apistatus.SessionTokenExpired)
|
||||||
|
}),
|
||||||
|
codeV2: 4097,
|
||||||
|
},
|
||||||
} {
|
} {
|
||||||
var st apistatus.Status
|
var st apistatus.Status
|
||||||
|
|
||||||
|
@ -217,6 +229,18 @@ func TestFromStatusV2(t *testing.T) {
|
||||||
}),
|
}),
|
||||||
codeV2: 3072,
|
codeV2: 3072,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
status: (statusConstructor)(func() apistatus.Status {
|
||||||
|
return new(apistatus.SessionTokenNotFound)
|
||||||
|
}),
|
||||||
|
codeV2: 4096,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
status: (statusConstructor)(func() apistatus.Status {
|
||||||
|
return new(apistatus.SessionTokenExpired)
|
||||||
|
}),
|
||||||
|
codeV2: 4097,
|
||||||
|
},
|
||||||
} {
|
} {
|
||||||
var st apistatus.Status
|
var st apistatus.Status
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue