Pre-commit and Makefile improvements #68

Merged
fyrchik merged 1 commit from fyrchik/frostfs-api-go:gitlint into master 2024-09-04 19:51:16 +00:00
9 changed files with 36 additions and 28 deletions

View file

@ -18,6 +18,15 @@ repos:
- id: end-of-file-fixer
exclude: ".key$"
- repo: local
hooks:
- id: gofumpt
name: gofumpt
entry: make fumpt
pass_filenames: false
types: [go]
language: system
- repo: local
hooks:
- id: go-unit-tests

View file

@ -3,7 +3,7 @@ SHELL = bash
VERSION ?= $(shell git describe --tags --match "v*" --abbrev=8 --dirty --always)
.PHONY: dep fmts fmt imports protoc test lint version help
.PHONY: dep fmts fumpt imports protoc test lint version help
# Pull go dependencies
dep:
@ -18,14 +18,7 @@ dep:
go test ./... && echo OK
# Run all code formatters
fmts: fmt imports
# Reformat code
fmt:
@echo "⇒ Processing gofmt check"
@for f in `find . -type f -name '*.go' -not -path './vendor/*' -not -name '*.pb.go' -prune`; do \
gofmt -s -w $$f; \
done
fmts: fumpt imports
# Reformat imports
imports:
@ -34,6 +27,11 @@ imports:
goimports -w $$f; \
done
# Run gofumpt
fumpt:
@echo "⇒ Processing gofumpt check"
@gofumpt -l -w .
# Regenerate code for proto files
protoc:
@GOPRIVATE=github.com/TrueCloudLab go mod vendor

View file

@ -10,7 +10,7 @@ import (
func TestSetNotification(t *testing.T) {
o := new(Object)
var ni = NotificationInfo{
ni := NotificationInfo{
epoch: 10,
topic: "test",
}

View file

@ -318,8 +318,7 @@ type PutSingleRequest struct {
session.RequestHeaders
}
type PutSingleResponseBody struct {
}
type PutSingleResponseBody struct{}
type PutSingleResponse struct {
body *PutSingleResponseBody

View file

@ -632,7 +632,8 @@ func (r *ResponseMetaHeader) SetStatus(v *status.Status) {
func SetStatus(msg interface {
GetMetaHeader() *ResponseMetaHeader
SetMetaHeader(*ResponseMetaHeader)
}, st *status.Status) {
}, st *status.Status,
) {
meta := msg.GetMetaHeader()
if meta == nil {
meta = new(ResponseMetaHeader)

View file

@ -43,7 +43,8 @@ func (c *RequestHeaders) SetVerificationHeader(v *RequestVerificationHeader) {
func (c *RequestHeaders) ToMessage(m interface {
SetMetaHeader(*session.RequestMetaHeader)
SetVerifyHeader(*session.RequestVerificationHeader)
}) {
},
) {
m.SetMetaHeader(c.metaHeader.ToGRPCMessage().(*session.RequestMetaHeader))
m.SetVerifyHeader(c.verifyHeader.ToGRPCMessage().(*session.RequestVerificationHeader))
}
@ -51,7 +52,8 @@ func (c *RequestHeaders) ToMessage(m interface {
func (c *RequestHeaders) FromMessage(m interface {
GetMetaHeader() *session.RequestMetaHeader
GetVerifyHeader() *session.RequestVerificationHeader
}) error {
},
) error {
metaHdr := m.GetMetaHeader()
if metaHdr == nil {
c.metaHeader = nil
@ -122,7 +124,8 @@ func (c *ResponseHeaders) SetVerificationHeader(v *ResponseVerificationHeader) {
func (c *ResponseHeaders) ToMessage(m interface {
SetMetaHeader(*session.ResponseMetaHeader)
SetVerifyHeader(*session.ResponseVerificationHeader)
}) {
},
) {
m.SetMetaHeader(c.metaHeader.ToGRPCMessage().(*session.ResponseMetaHeader))
m.SetVerifyHeader(c.verifyHeader.ToGRPCMessage().(*session.ResponseVerificationHeader))
}
@ -130,7 +133,8 @@ func (c *ResponseHeaders) ToMessage(m interface {
func (c *ResponseHeaders) FromMessage(m interface {
GetMetaHeader() *session.ResponseMetaHeader
GetVerifyHeader() *session.ResponseVerificationHeader
}) error {
},
) error {
metaHdr := m.GetMetaHeader()
if metaHdr == nil {
c.metaHeader = nil

View file

@ -50,9 +50,7 @@ func (s *stablePrimitives) stableMarshal(buf []byte, wrongField bool) ([]byte, e
buf = make([]byte, s.stableSize())
}
var (
i, offset, fieldNum int
)
var i, offset, fieldNum int
fieldNum = 1
if wrongField {

View file

@ -205,22 +205,22 @@ type marshalerDesc struct {
var marshalers = map[protoreflect.Kind]marshalerDesc{
protoreflect.BoolKind: {Prefix: "Bool"},
protoreflect.EnumKind: {Prefix: "Enum"},
//protoreflect.Int32Kind: "",
//protoreflect.Sint32Kind: "",
// protoreflect.Int32Kind: "",
// protoreflect.Sint32Kind: "",
protoreflect.Uint32Kind: {Prefix: "UInt32", RepeatedDouble: true},
protoreflect.Int64Kind: {Prefix: "Int64", RepeatedDouble: true},
//protoreflect.Sint64Kind: "",
// protoreflect.Sint64Kind: "",
protoreflect.Uint64Kind: {Prefix: "UInt64", RepeatedDouble: true},
//protoreflect.Sfixed32Kind: "",
// protoreflect.Sfixed32Kind: "",
protoreflect.Fixed32Kind: {Prefix: "Fixed32", RepeatedDouble: true},
//protoreflect.FloatKind: "",
//protoreflect.Sfixed64Kind: "",
// protoreflect.FloatKind: "",
// protoreflect.Sfixed64Kind: "",
protoreflect.Fixed64Kind: {Prefix: "Fixed64", RepeatedDouble: true},
protoreflect.DoubleKind: {Prefix: "Float64"},
protoreflect.StringKind: {Prefix: "String"},
protoreflect.BytesKind: {Prefix: "Bytes"},
protoreflect.MessageKind: {Prefix: "NestedStructure"},
//protoreflect.GroupKind: "",
// protoreflect.GroupKind: "",
}
func sortFields(fs []*protogen.Field) []*protogen.Field {

View file

@ -109,5 +109,4 @@ func TestVerifyNeonWallet(t *testing.T) {
}
require.True(t, VerifyMessage(nil, sm))
}
}