forked from TrueCloudLab/frostfs-node
[#772] node: Apply gofumpt
Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
This commit is contained in:
parent
00aa6d9749
commit
79088baa06
136 changed files with 293 additions and 239 deletions
|
@ -21,8 +21,10 @@ var (
|
|||
errInvalidVerb = malformedRequestError("session token verb is invalid")
|
||||
)
|
||||
|
||||
const accessDeniedACLReasonFmt = "access to operation %s is denied by basic ACL check"
|
||||
const accessDeniedEACLReasonFmt = "access to operation %s is denied by extended ACL check: %v"
|
||||
const (
|
||||
accessDeniedACLReasonFmt = "access to operation %s is denied by basic ACL check"
|
||||
accessDeniedEACLReasonFmt = "access to operation %s is denied by extended ACL check: %v"
|
||||
)
|
||||
|
||||
func basicACLErr(info RequestInfo) error {
|
||||
errAccessDenied := &apistatus.ObjectAccessDenied{}
|
||||
|
|
|
@ -80,7 +80,8 @@ func New(next object.ServiceServer,
|
|||
irf InnerRingFetcher,
|
||||
acl ACLChecker,
|
||||
cs container.Source,
|
||||
opts ...Option) Service {
|
||||
opts ...Option,
|
||||
) Service {
|
||||
cfg := &cfg{
|
||||
log: &logger.Logger{Logger: zap.L()},
|
||||
next: next,
|
||||
|
@ -168,7 +169,8 @@ func (b Service) Put() (object.PutObjectStream, error) {
|
|||
|
||||
func (b Service) Head(
|
||||
ctx context.Context,
|
||||
request *objectV2.HeadRequest) (*objectV2.HeadResponse, error) {
|
||||
request *objectV2.HeadRequest,
|
||||
) (*objectV2.HeadResponse, error) {
|
||||
cnr, err := getContainerIDFromRequest(request)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
@ -276,7 +278,8 @@ func (b Service) Search(request *objectV2.SearchRequest, stream object.SearchStr
|
|||
|
||||
func (b Service) Delete(
|
||||
ctx context.Context,
|
||||
request *objectV2.DeleteRequest) (*objectV2.DeleteResponse, error) {
|
||||
request *objectV2.DeleteRequest,
|
||||
) (*objectV2.DeleteResponse, error) {
|
||||
cnr, err := getContainerIDFromRequest(request)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
@ -384,7 +387,8 @@ func (b Service) GetRange(request *objectV2.GetRangeRequest, stream object.GetOb
|
|||
|
||||
func (b Service) GetRangeHash(
|
||||
ctx context.Context,
|
||||
request *objectV2.GetRangeHashRequest) (*objectV2.GetRangeHashResponse, error) {
|
||||
request *objectV2.GetRangeHashRequest,
|
||||
) (*objectV2.GetRangeHashResponse, error) {
|
||||
cnr, err := getContainerIDFromRequest(request)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
|
@ -69,7 +69,8 @@ func New(gs *getsvc.Service,
|
|||
ps *putsvc.Service,
|
||||
ni NetworkInfo,
|
||||
ks *util.KeyStorage,
|
||||
opts ...Option) *Service {
|
||||
opts ...Option,
|
||||
) *Service {
|
||||
c := &cfg{
|
||||
log: &logger.Logger{Logger: zap.L()},
|
||||
header: &headSvcWrapper{s: gs},
|
||||
|
|
|
@ -29,7 +29,8 @@ func newAssembler(
|
|||
addr oid.Address,
|
||||
splitInfo *objectSDK.SplitInfo,
|
||||
rng *objectSDK.Range,
|
||||
objGetter objectGetter) *assembler {
|
||||
objGetter objectGetter,
|
||||
) *assembler {
|
||||
return &assembler{
|
||||
addr: addr,
|
||||
rng: rng,
|
||||
|
|
|
@ -23,6 +23,7 @@ func (s *Service) GetRange(ctx context.Context, prm RangePrm) error {
|
|||
rng: prm.rng,
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Service) GetRangeHash(ctx context.Context, prm RangeHashPrm) (*RangeHashRes, error) {
|
||||
hashes := make([][]byte, 0, len(prm.rngs))
|
||||
|
||||
|
|
|
@ -233,8 +233,7 @@ func (whe *writeHeaderError) Error() string {
|
|||
return "write header error"
|
||||
}
|
||||
|
||||
type writeHeaderErrorObjectWriter struct {
|
||||
}
|
||||
type writeHeaderErrorObjectWriter struct{}
|
||||
|
||||
func (w *writeHeaderErrorObjectWriter) WriteHeader(_ context.Context, _ *objectSDK.Object) error {
|
||||
return &writeHeaderError{}
|
||||
|
@ -250,8 +249,7 @@ func (whe *writePayloadError) Error() string {
|
|||
return "write payload error"
|
||||
}
|
||||
|
||||
type writePayloadErrorObjectWriter struct {
|
||||
}
|
||||
type writePayloadErrorObjectWriter struct{}
|
||||
|
||||
func (w *writePayloadErrorObjectWriter) WriteHeader(_ context.Context, _ *objectSDK.Object) error {
|
||||
return nil
|
||||
|
@ -261,8 +259,7 @@ func (w *writePayloadErrorObjectWriter) WriteChunk(_ context.Context, _ []byte)
|
|||
return &writePayloadError{}
|
||||
}
|
||||
|
||||
type testKeyStorage struct {
|
||||
}
|
||||
type testKeyStorage struct{}
|
||||
|
||||
func (ks *testKeyStorage) GetKey(_ *util.SessionInfo) (*ecdsa.PrivateKey, error) {
|
||||
return &ecdsa.PrivateKey{}, nil
|
||||
|
@ -1289,7 +1286,6 @@ func TestGetRemoteSmall(t *testing.T) {
|
|||
err := svc.GetRange(ctx, p)
|
||||
require.ErrorAs(t, err, new(*apistatus.ObjectOutOfRange))
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
t.Run("right child", func(t *testing.T) {
|
||||
|
|
|
@ -10,7 +10,8 @@ import (
|
|||
// VerifyResponseKeyV2 checks if response is signed with expected key. Returns client.ErrWrongPublicKey if not.
|
||||
func VerifyResponseKeyV2(expectedKey []byte, resp interface {
|
||||
GetVerificationHeader() *session.ResponseVerificationHeader
|
||||
}) error {
|
||||
},
|
||||
) error {
|
||||
if !bytes.Equal(resp.GetVerificationHeader().GetBodySignature().GetKey(), expectedKey) {
|
||||
return client.ErrWrongPublicKey
|
||||
}
|
||||
|
|
|
@ -72,7 +72,8 @@ func NewService(ks *objutil.KeyStorage,
|
|||
nk netmap.AnnouncedKeys,
|
||||
nst netmap.State,
|
||||
ir InnerRing,
|
||||
opts ...Option) *Service {
|
||||
opts ...Option,
|
||||
) *Service {
|
||||
c := &cfg{
|
||||
remotePool: util.NewPseudoWorkerPool(),
|
||||
localPool: util.NewPseudoWorkerPool(),
|
||||
|
|
|
@ -201,7 +201,8 @@ func (s *Service) getPutSinglePlacementOptions(obj *objectSDK.Object, copiesNumb
|
|||
}
|
||||
|
||||
func (s *Service) saveToPlacementNode(ctx context.Context, nodeDesc *nodeDesc, obj *objectSDK.Object,
|
||||
signer *putSingleRequestSigner, meta object.ContentMeta) error {
|
||||
signer *putSingleRequestSigner, meta object.ContentMeta,
|
||||
) error {
|
||||
if nodeDesc.local {
|
||||
return s.saveLocal(ctx, obj, meta)
|
||||
}
|
||||
|
@ -229,7 +230,8 @@ func (s *Service) redirectPutSingleRequest(ctx context.Context,
|
|||
signer *putSingleRequestSigner,
|
||||
obj *objectSDK.Object,
|
||||
info client.NodeInfo,
|
||||
c client.MultiAddressClient) error {
|
||||
c client.MultiAddressClient,
|
||||
) error {
|
||||
ctx, span := tracing.StartSpanFromContext(ctx, "putService.redirectPutSingleRequest")
|
||||
defer span.End()
|
||||
|
||||
|
|
|
@ -62,7 +62,8 @@ func New(e *engine.StorageEngine,
|
|||
tg *util.TraverserGenerator,
|
||||
ns netmap.Source,
|
||||
ks *util.KeyStorage,
|
||||
opts ...Option) *Service {
|
||||
opts ...Option,
|
||||
) *Service {
|
||||
c := &cfg{
|
||||
log: &logger.Logger{Logger: zap.L()},
|
||||
clientConstructor: &clientConstructorWrapper{
|
||||
|
|
|
@ -109,7 +109,8 @@ func (p *CommonPrm) ForgetTokens() {
|
|||
|
||||
func CommonPrmFromV2(req interface {
|
||||
GetMetaHeader() *session.RequestMetaHeader
|
||||
}) (*CommonPrm, error) {
|
||||
},
|
||||
) (*CommonPrm, error) {
|
||||
meta := req.GetMetaHeader()
|
||||
ttl := meta.GetTTL()
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue