diff options
author | Will Chandler <wchandler@gitlab.com> | 2022-09-30 21:40:24 +0300 |
---|---|---|
committer | Will Chandler <wchandler@gitlab.com> | 2022-09-30 23:09:00 +0300 |
commit | 76563783e6c7468a43397e0de5849ce7e534da78 (patch) | |
tree | 8c210a808b208af68f227ee8969f317c4be7f3fd | |
parent | 4c15523cf680c107c5aa2b8268674cd0345a6b78 (diff) |
golangci-lint: Restore default revive lintswc/fix-revive-lints
With 7e87131ed (golangci-lint: Allow `testing.T` as first parameter,
2022-08-10) we set `context-as-argument` the sole argument to
`revive:rules`. This causes golangci-lint to disable all revive lints
that were previously enabled by default.
Re-enable the default revive lints by explicitly listing them in our
config. This triggers a large number of lint errors, resolve these as
well in this commit.
51 files changed, 140 insertions, 105 deletions
diff --git a/.golangci.yml b/.golangci.yml index f97d22a09..d6dd53f25 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -85,11 +85,37 @@ linters-settings: - ^os.Setenv$ - ^os.Unsetenv$ revive: + # Specifying any rule explicitly will disable the default-enabled rules. + # Manually specify the defaults along with `context-as-argument`. rules: + - name: blank-imports + disabled: false - name: context-as-argument arguments: # The context should always be first, except in our testing packages. allowTypesBefore: "*testing.T,*testing.B,testing.TB" + - name: dot-imports + disabled: false + - name: error-naming + disabled: false + - name: error-return + disabled: false + - name: error-strings + disabled: false + - name: exported + disabled: false + - name: increment-decrement + disabled: false + - name: indent-error-flow + disabled: false + - name: package-comments + disabled: false + - name: receiver-naming + disabled: false + - name: range + disabled: false + - name: var-naming + disabled: false stylecheck: # ST1000 checks for missing package comments. We don't use these for most # packages, so let's disable this check. diff --git a/client/pool_options.go b/client/pool_options.go index decb2a812..a8139c1f2 100644 --- a/client/pool_options.go +++ b/client/pool_options.go @@ -7,7 +7,7 @@ type poolOptions struct { dialOptions []grpc.DialOption } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. type PoolOption func(*poolOptions) func applyPoolOptions(options []PoolOption) *poolOptions { diff --git a/internal/cgroups/noop.go b/internal/cgroups/noop.go index 4dfc491d4..afb5b5342 100644 --- a/internal/cgroups/noop.go +++ b/internal/cgroups/noop.go @@ -9,17 +9,17 @@ import ( // NoopManager is a cgroups manager that does nothing type NoopManager struct{} -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (cg *NoopManager) Setup() error { return nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (cg *NoopManager) AddCommand(cmd *command.Command, repo repository.GitRepo) (string, error) { return "", nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (cg *NoopManager) Cleanup() error { return nil } diff --git a/internal/cgroups/v1_linux.go b/internal/cgroups/v1_linux.go index 819abbbe8..9a08ca867 100644 --- a/internal/cgroups/v1_linux.go +++ b/internal/cgroups/v1_linux.go @@ -56,7 +56,7 @@ func newV1Manager(cfg cgroupscfg.Config, pid int) *CGroupV1Manager { } } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (cg *CGroupV1Manager) Setup() error { var parentResources specs.LinuxResources @@ -200,7 +200,7 @@ func (cg *CGroupV1Manager) Describe(ch chan<- *prometheus.Desc) { prometheus.DescribeByCollect(cg, ch) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (cg *CGroupV1Manager) Cleanup() error { processCgroupPath := cg.currentProcessCgroup() diff --git a/internal/command/stats.go b/internal/command/stats.go index 6e1be4eb4..4ae7a582e 100644 --- a/internal/command/stats.go +++ b/internal/command/stats.go @@ -9,13 +9,13 @@ import ( type requestStatsKey struct{} -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. type Stats struct { registry map[string]int sync.Mutex } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (stats *Stats) RecordSum(key string, value int) { stats.Lock() defer stats.Unlock() @@ -27,7 +27,7 @@ func (stats *Stats) RecordSum(key string, value int) { stats.registry[key] = value } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (stats *Stats) RecordMax(key string, value int) { stats.Lock() defer stats.Unlock() @@ -41,7 +41,7 @@ func (stats *Stats) RecordMax(key string, value int) { stats.registry[key] = value } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (stats *Stats) Fields() logrus.Fields { stats.Lock() defer stats.Unlock() @@ -53,13 +53,13 @@ func (stats *Stats) Fields() logrus.Fields { return f } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func StatsFromContext(ctx context.Context) *Stats { stats, _ := ctx.Value(requestStatsKey{}).(*Stats) return stats } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func InitContextStats(ctx context.Context) context.Context { return context.WithValue(ctx, requestStatsKey{}, &Stats{ registry: make(map[string]int), diff --git a/internal/git/stats/packfile_negotiation.go b/internal/git/stats/packfile_negotiation.go index ca152d70e..d537c7596 100644 --- a/internal/git/stats/packfile_negotiation.go +++ b/internal/git/stats/packfile_negotiation.go @@ -11,7 +11,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/internal/helper/text" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. type PackfileNegotiation struct { // Total size of all pktlines' data PayloadSize int64 @@ -31,7 +31,7 @@ type PackfileNegotiation struct { Filter string } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func ParsePackfileNegotiation(body io.Reader) (PackfileNegotiation, error) { n := PackfileNegotiation{} return n, n.Parse(body) diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go index f1aebe07d..c45441b21 100644 --- a/internal/gitaly/config/config.go +++ b/internal/gitaly/config/config.go @@ -92,7 +92,7 @@ type Hooks struct { CustomHooksDir string `toml:"custom_hooks_dir" json:"custom_hooks_dir"` } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. type HTTPSettings struct { ReadTimeout int `toml:"read_timeout" json:"read_timeout"` User string `toml:"user" json:"user"` diff --git a/internal/gitaly/hook/check.go b/internal/gitaly/hook/check.go index 181a86240..edcd7ed05 100644 --- a/internal/gitaly/hook/check.go +++ b/internal/gitaly/hook/check.go @@ -6,7 +6,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/internal/gitlab" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *GitLabHookManager) Check(ctx context.Context) (*gitlab.CheckInfo, error) { return m.gitlabClient.Check(ctx) } diff --git a/internal/gitaly/hook/postreceive.go b/internal/gitaly/hook/postreceive.go index 2063b1adf..cc4394c85 100644 --- a/internal/gitaly/hook/postreceive.go +++ b/internal/gitaly/hook/postreceive.go @@ -116,7 +116,7 @@ func printAlert(m gitlab.PostReceiveMessage, w io.Writer) error { return nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *GitLabHookManager) PostReceiveHook(ctx context.Context, repo *gitalypb.Repository, pushOptions, env []string, stdin io.Reader, stdout, stderr io.Writer) error { payload, err := git.HooksPayloadFromEnv(env) if err != nil { diff --git a/internal/gitaly/hook/referencetransaction.go b/internal/gitaly/hook/referencetransaction.go index b7e76dcee..a63ece62b 100644 --- a/internal/gitaly/hook/referencetransaction.go +++ b/internal/gitaly/hook/referencetransaction.go @@ -16,7 +16,7 @@ import ( // reference without checking its current value. var forceDeletionPrefix = fmt.Sprintf("%[1]s %[1]s ", git.ObjectHashSHA1.ZeroOID.String()) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *GitLabHookManager) ReferenceTransactionHook(ctx context.Context, state ReferenceTransactionState, env []string, stdin io.Reader) error { payload, err := git.HooksPayloadFromEnv(env) if err != nil { diff --git a/internal/gitaly/hook/update.go b/internal/gitaly/hook/update.go index 8574622f0..7f287c328 100644 --- a/internal/gitaly/hook/update.go +++ b/internal/gitaly/hook/update.go @@ -11,7 +11,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *GitLabHookManager) UpdateHook(ctx context.Context, repo *gitalypb.Repository, ref, oldValue, newValue string, env []string, stdout, stderr io.Writer) error { payload, err := git.HooksPayloadFromEnv(env) if err != nil { diff --git a/internal/gitaly/service/operations/apply_patch.go b/internal/gitaly/service/operations/apply_patch.go index c86297abc..052001141 100644 --- a/internal/gitaly/service/operations/apply_patch.go +++ b/internal/gitaly/service/operations/apply_patch.go @@ -33,7 +33,7 @@ func (er gitError) Error() string { return er.ErrMsg + ": " + er.Err.Error() } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserApplyPatch(stream gitalypb.OperationService_UserApplyPatchServer) error { firstRequest, err := stream.Recv() if err != nil { diff --git a/internal/gitaly/service/operations/branches.go b/internal/gitaly/service/operations/branches.go index 83fc9a438..40cebfbc2 100644 --- a/internal/gitaly/service/operations/branches.go +++ b/internal/gitaly/service/operations/branches.go @@ -13,7 +13,7 @@ import ( "google.golang.org/grpc/status" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserCreateBranch(ctx context.Context, req *gitalypb.UserCreateBranchRequest) (*gitalypb.UserCreateBranchResponse, error) { if len(req.BranchName) == 0 { return nil, status.Errorf(codes.InvalidArgument, "Bad Request (empty branch name)") @@ -117,7 +117,7 @@ func validateUserUpdateBranchGo(req *gitalypb.UserUpdateBranchRequest) error { return nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserUpdateBranch(ctx context.Context, req *gitalypb.UserUpdateBranchRequest) (*gitalypb.UserUpdateBranchResponse, error) { // Validate the request if err := validateUserUpdateBranchGo(req); err != nil { diff --git a/internal/gitaly/service/operations/cherry_pick.go b/internal/gitaly/service/operations/cherry_pick.go index fa45958fe..981dc9030 100644 --- a/internal/gitaly/service/operations/cherry_pick.go +++ b/internal/gitaly/service/operations/cherry_pick.go @@ -16,7 +16,7 @@ import ( "google.golang.org/grpc/status" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserCherryPick(ctx context.Context, req *gitalypb.UserCherryPickRequest) (*gitalypb.UserCherryPickResponse, error) { if err := validateCherryPickOrRevertRequest(req); err != nil { return nil, status.Errorf(codes.InvalidArgument, "UserCherryPick: %v", err) diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index 8886340c7..94192a7c4 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -44,7 +44,7 @@ func validateMergeBranchRequest(request *gitalypb.UserMergeBranchRequest) error return nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserMergeBranch(stream gitalypb.OperationService_UserMergeBranchServer) error { ctx := stream.Context() @@ -243,7 +243,7 @@ func validateFFRequest(in *gitalypb.UserFFBranchRequest) error { return nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserFFBranch(ctx context.Context, in *gitalypb.UserFFBranchRequest) (*gitalypb.UserFFBranchResponse, error) { if err := validateFFRequest(in); err != nil { return nil, helper.ErrInvalidArgument(err) diff --git a/internal/gitaly/service/operations/rebase.go b/internal/gitaly/service/operations/rebase.go index b1bbc7448..1310055e5 100644 --- a/internal/gitaly/service/operations/rebase.go +++ b/internal/gitaly/service/operations/rebase.go @@ -14,7 +14,7 @@ import ( "google.golang.org/grpc/status" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserRebaseConfirmable(stream gitalypb.OperationService_UserRebaseConfirmableServer) error { firstRequest, err := stream.Recv() if err != nil { diff --git a/internal/gitaly/service/operations/revert.go b/internal/gitaly/service/operations/revert.go index 22c5c4527..6fd9ba7fe 100644 --- a/internal/gitaly/service/operations/revert.go +++ b/internal/gitaly/service/operations/revert.go @@ -14,7 +14,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserRevert(ctx context.Context, req *gitalypb.UserRevertRequest) (*gitalypb.UserRevertResponse, error) { if err := validateCherryPickOrRevertRequest(req); err != nil { return nil, helper.ErrInvalidArgument(err) diff --git a/internal/gitaly/service/operations/server.go b/internal/gitaly/service/operations/server.go index 3ff19f752..c880aa8da 100644 --- a/internal/gitaly/service/operations/server.go +++ b/internal/gitaly/service/operations/server.go @@ -18,7 +18,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. type Server struct { gitalypb.UnimplementedOperationServiceServer hookManager hook.Manager diff --git a/internal/gitaly/service/operations/submodules.go b/internal/gitaly/service/operations/submodules.go index dd8e3ee70..98cccb326 100644 --- a/internal/gitaly/service/operations/submodules.go +++ b/internal/gitaly/service/operations/submodules.go @@ -19,7 +19,7 @@ import ( const userUpdateSubmoduleName = "UserUpdateSubmodule" -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserUpdateSubmodule(ctx context.Context, req *gitalypb.UserUpdateSubmoduleRequest) (*gitalypb.UserUpdateSubmoduleResponse, error) { if err := validateUserUpdateSubmoduleRequest(req); err != nil { return nil, status.Errorf(codes.InvalidArgument, userUpdateSubmoduleName+": %v", err) diff --git a/internal/gitaly/service/operations/tags.go b/internal/gitaly/service/operations/tags.go index 4fb03d53a..67fc7746c 100644 --- a/internal/gitaly/service/operations/tags.go +++ b/internal/gitaly/service/operations/tags.go @@ -19,7 +19,7 @@ import ( "google.golang.org/grpc/status" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserDeleteTag(ctx context.Context, req *gitalypb.UserDeleteTagRequest) (*gitalypb.UserDeleteTagResponse, error) { if len(req.TagName) == 0 { return nil, status.Errorf(codes.InvalidArgument, "empty tag name") @@ -82,7 +82,7 @@ func validateUserCreateTag(req *gitalypb.UserCreateTagRequest) error { return nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) UserCreateTag(ctx context.Context, req *gitalypb.UserCreateTagRequest) (*gitalypb.UserCreateTagResponse, error) { if err := validateUserCreateTag(req); err != nil { return nil, helper.ErrInvalidArgumentf("validating request: %w", err) diff --git a/internal/gitaly/service/repository/midx.go b/internal/gitaly/service/repository/midx.go index 85c0f8809..e2d899474 100644 --- a/internal/gitaly/service/repository/midx.go +++ b/internal/gitaly/service/repository/midx.go @@ -22,7 +22,7 @@ import ( ) const ( - // This is unintentionally missing documentation. + //nolint:revive // This is unintentionally missing documentation. MidxRelPath = "objects/pack/multi-pack-index" ) diff --git a/internal/gitaly/service/smarthttp/server.go b/internal/gitaly/service/smarthttp/server.go index c22609c91..d9df03201 100644 --- a/internal/gitaly/service/smarthttp/server.go +++ b/internal/gitaly/service/smarthttp/server.go @@ -47,7 +47,7 @@ func NewServer( // ServerOpt is a self referential option for server type ServerOpt func(s *server) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func WithPackfileNegotiationMetrics(c *prometheus.CounterVec) ServerOpt { return func(s *server) { s.packfileNegotiationMetrics = c diff --git a/internal/gitaly/service/ssh/server.go b/internal/gitaly/service/ssh/server.go index cddf72d37..12bc965cd 100644 --- a/internal/gitaly/service/ssh/server.go +++ b/internal/gitaly/service/ssh/server.go @@ -68,7 +68,7 @@ func WithArchiveRequestTimeout(d time.Duration) ServerOpt { } } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func WithPackfileNegotiationMetrics(c *prometheus.CounterVec) ServerOpt { return func(s *server) { s.packfileNegotiationMetrics = c diff --git a/internal/gitaly/storage/locator.go b/internal/gitaly/storage/locator.go index acc41013f..a10885dcb 100644 --- a/internal/gitaly/storage/locator.go +++ b/internal/gitaly/storage/locator.go @@ -34,7 +34,7 @@ type Locator interface { StateDir(storageName string) (string, error) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. var ErrRelativePathEscapesRoot = errors.New("relative path escapes root directory") // ValidateRelativePath validates a relative path by joining it with rootDir and verifying the result diff --git a/internal/gitlab/client/gitlabnet.go b/internal/gitlab/client/gitlabnet.go index da4da1c93..61d72778d 100644 --- a/internal/gitlab/client/gitlabnet.go +++ b/internal/gitlab/client/gitlabnet.go @@ -24,10 +24,12 @@ const ( jwtIssuer = "gitlab-shell" ) +//nolint:revive // This is unintentionally missing documentation. type ErrorResponse struct { Message string `json:"message"` } +//nolint:revive // This is unintentionally missing documentation. type GitlabNetClient struct { httpClient *HTTPClient user string @@ -36,6 +38,7 @@ type GitlabNetClient struct { userAgent string } +//nolint:revive // This is unintentionally missing documentation. type APIError struct { Msg string } @@ -48,6 +51,7 @@ func (e *APIError) Error() string { return e.Msg } +//nolint:revive // This is unintentionally missing documentation. func NewGitlabNetClient( user, password, @@ -112,19 +116,22 @@ func parseError(resp *http.Response) error { if err := json.NewDecoder(resp.Body).Decode(parsedResponse); err != nil { return &APIError{fmt.Sprintf("Internal API error (%v)", resp.StatusCode)} - } else { - return &APIError{parsedResponse.Message} } + + return &APIError{parsedResponse.Message} } +//nolint:revive // This is unintentionally missing documentation. func (c *GitlabNetClient) Get(ctx context.Context, path string) (*http.Response, error) { return c.DoRequest(ctx, http.MethodGet, normalizePath(path), nil) } +//nolint:revive // This is unintentionally missing documentation. func (c *GitlabNetClient) Post(ctx context.Context, path string, data interface{}) (*http.Response, error) { return c.DoRequest(ctx, http.MethodPost, normalizePath(path), data) } +//nolint:revive // This is unintentionally missing documentation. func (c *GitlabNetClient) DoRequest(ctx context.Context, method, path string, data interface{}) (*http.Response, error) { request, err := newRequest(ctx, method, c.httpClient.Host, path, data) if err != nil { diff --git a/internal/gitlab/client/httpclient.go b/internal/gitlab/client/httpclient.go index dcf83b8c1..9333d4881 100644 --- a/internal/gitlab/client/httpclient.go +++ b/internal/gitlab/client/httpclient.go @@ -25,8 +25,10 @@ const ( defaultReadTimeoutSeconds = 300 ) +//nolint:revive // This is unintentionally missing documentation. var ErrCafileNotFound = errors.New("cafile not found") +//nolint:revive // This is unintentionally missing documentation. type HTTPClient struct { *http.Client Host string diff --git a/internal/helper/ticker.go b/internal/helper/ticker.go index 4009f951e..09a363dca 100644 --- a/internal/helper/ticker.go +++ b/internal/helper/ticker.go @@ -47,16 +47,16 @@ type ManualTicker struct { ResetFunc func() } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (mt *ManualTicker) C() <-chan time.Time { return mt.c } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (mt *ManualTicker) Stop() { mt.StopFunc() } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (mt *ManualTicker) Reset() { mt.ResetFunc() } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (mt *ManualTicker) Tick() { mt.c <- time.Now() } // NewManualTicker returns a Ticker that can be manually controlled. diff --git a/internal/praefect/config/config.go b/internal/praefect/config/config.go index 5af6eccdb..caf7128aa 100644 --- a/internal/praefect/config/config.go +++ b/internal/praefect/config/config.go @@ -41,7 +41,7 @@ const ( minimalSyncRunInterval = time.Minute ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. type Failover struct { Enabled bool `toml:"enabled,omitempty"` // ElectionStrategy is the strategy to use for electing primaries nodes. diff --git a/internal/praefect/config/node.go b/internal/praefect/config/node.go index 7ed25e955..47bd576ca 100644 --- a/internal/praefect/config/node.go +++ b/internal/praefect/config/node.go @@ -12,7 +12,7 @@ type Node struct { Token string `toml:"token,omitempty"` } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (n Node) MarshalJSON() ([]byte, error) { return json.Marshal(map[string]interface{}{ "storage": n.Storage, diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go index 5099a2391..ac1e844cf 100644 --- a/internal/praefect/coordinator.go +++ b/internal/praefect/coordinator.go @@ -235,12 +235,12 @@ func NewCoordinator( return coordinator } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (c *Coordinator) Describe(descs chan<- *prometheus.Desc) { prometheus.DescribeByCollect(c, descs) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (c *Coordinator) Collect(metrics chan<- prometheus.Metric) { c.votersMetric.Collect(metrics) c.txReplicationCountMetric.Collect(metrics) diff --git a/internal/praefect/datastore/assignment.go b/internal/praefect/datastore/assignment.go index 9cfda0aca..29bac728f 100644 --- a/internal/praefect/datastore/assignment.go +++ b/internal/praefect/datastore/assignment.go @@ -37,7 +37,7 @@ func NewAssignmentStore(db glsql.Querier, configuredStorages map[string][]string return AssignmentStore{db: db, configuredStorages: configuredStorages} } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s AssignmentStore) GetHostAssignments(ctx context.Context, virtualStorage string, repositoryID int64) ([]string, error) { configuredStorages, ok := s.configuredStorages[virtualStorage] if !ok { diff --git a/internal/praefect/datastore/collector.go b/internal/praefect/datastore/collector.go index 5e1fdbd8e..26872000f 100644 --- a/internal/praefect/datastore/collector.go +++ b/internal/praefect/datastore/collector.go @@ -49,12 +49,12 @@ func NewRepositoryStoreCollector( } } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (c *RepositoryStoreCollector) Describe(ch chan<- *prometheus.Desc) { ch <- descUnavailableRepositories } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (c *RepositoryStoreCollector) Collect(ch chan<- prometheus.Metric) { ctx, cancel := context.WithTimeout(context.TODO(), c.timeout) defer cancel() @@ -110,7 +110,7 @@ type QueueDepthCollector struct { db glsql.Querier } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (q *QueueDepthCollector) Describe(ch chan<- *prometheus.Desc) { ch <- descReplicationQueueDepth } diff --git a/internal/praefect/datastore/mock.go b/internal/praefect/datastore/mock.go index 4d9867ec2..d03c35a2e 100644 --- a/internal/praefect/datastore/mock.go +++ b/internal/praefect/datastore/mock.go @@ -9,7 +9,7 @@ type MockReplicationEventQueue struct { EnqueueFunc func(context.Context, ReplicationEvent) (ReplicationEvent, error) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *MockReplicationEventQueue) Enqueue(ctx context.Context, event ReplicationEvent) (ReplicationEvent, error) { return m.EnqueueFunc(ctx, event) } diff --git a/internal/praefect/datastore/queue.go b/internal/praefect/datastore/queue.go index 2943974ce..df894fcdc 100644 --- a/internal/praefect/datastore/queue.go +++ b/internal/praefect/datastore/queue.go @@ -66,7 +66,7 @@ type ReplicationJob struct { Params Params `json:"params"` } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (job *ReplicationJob) Scan(value interface{}) error { if value == nil { return nil @@ -80,7 +80,7 @@ func (job *ReplicationJob) Scan(value interface{}) error { return json.Unmarshal(d, job) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (job ReplicationJob) Value() (driver.Value, error) { data, err := json.Marshal(job) if err != nil { @@ -208,7 +208,7 @@ type PostgresReplicationEventQueue struct { qc glsql.Querier } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (rq PostgresReplicationEventQueue) Enqueue(ctx context.Context, event ReplicationEvent) (ReplicationEvent, error) { // When `Enqueue` method is called: // 1. Insertion of the new record into `replication_queue_lock` table, so we are ensured all events have @@ -241,7 +241,7 @@ func (rq PostgresReplicationEventQueue) Enqueue(ctx context.Context, event Repli return events[0], nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (rq PostgresReplicationEventQueue) Dequeue(ctx context.Context, virtualStorage, nodeStorage string, count int) ([]ReplicationEvent, error) { // When `Dequeue` method is called: // 1. Events with attempts left that are either in `ready` or `failed` state are candidates for dequeuing. @@ -322,7 +322,7 @@ func (rq PostgresReplicationEventQueue) Dequeue(ctx context.Context, virtualStor return res, nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (rq PostgresReplicationEventQueue) Acknowledge(ctx context.Context, state JobState, ids []uint64) ([]uint64, error) { // When `Acknowledge` method is called: // 1. The list of event `id`s and corresponding <lock>s retrieved from `replication_queue` table as passed in by the diff --git a/internal/praefect/datastore/repository_store.go b/internal/praefect/datastore/repository_store.go index d18f8c543..8ec1a03ea 100644 --- a/internal/praefect/datastore/repository_store.go +++ b/internal/praefect/datastore/repository_store.go @@ -213,7 +213,7 @@ func (rs *PostgresRepositoryStore) MarkStorageUnverified(ctx context.Context, vi return result.RowsAffected() } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (rs *PostgresRepositoryStore) GetGeneration(ctx context.Context, repositoryID int64, storage string) (int, error) { const q = ` SELECT generation @@ -234,7 +234,7 @@ AND storage = $2 return gen, nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (rs *PostgresRepositoryStore) IncrementGeneration(ctx context.Context, repositoryID int64, primary string, secondaries []string) error { const q = ` WITH updated_replicas AS ( @@ -288,7 +288,7 @@ SELECT return nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (rs *PostgresRepositoryStore) SetGeneration(ctx context.Context, repositoryID int64, storage, relativePath string, generation int) error { const q = ` WITH repository AS ( @@ -352,7 +352,7 @@ ON CONFLICT (virtual_storage, relative_path, storage) DO UPDATE return nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (rs *PostgresRepositoryStore) GetReplicatedGeneration(ctx context.Context, repositoryID int64, source, target string) (int, error) { const q = ` SELECT storage, generation @@ -487,7 +487,7 @@ FROM ( return nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (rs *PostgresRepositoryStore) DeleteRepository(ctx context.Context, virtualStorage, relativePath string) (string, []string, error) { var ( replicaPath string @@ -571,7 +571,7 @@ WHERE repository_id = (SELECT repository_id FROM repository) return nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (rs *PostgresRepositoryStore) RenameRepository(ctx context.Context, virtualStorage, relativePath, storage, newRelativePath string) error { const q = ` WITH repo AS ( @@ -657,7 +657,7 @@ func (rs *PostgresRepositoryStore) getConsistentStorages(ctx context.Context, qu return replicaPath, consistentStorages, nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (rs *PostgresRepositoryStore) RepositoryExists(ctx context.Context, virtualStorage, relativePath string) (bool, error) { const q = ` SELECT true diff --git a/internal/praefect/datastore/repository_store_mock.go b/internal/praefect/datastore/repository_store_mock.go index b2a9f60c9..5705cd9a2 100644 --- a/internal/praefect/datastore/repository_store_mock.go +++ b/internal/praefect/datastore/repository_store_mock.go @@ -28,7 +28,7 @@ type MockRepositoryStore struct { GetRepositoryMetadataByPathFunc func(ctx context.Context, virtualStorage, relativePath string) (RepositoryMetadata, error) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m MockRepositoryStore) GetGeneration(ctx context.Context, repositoryID int64, storage string) (int, error) { if m.GetGenerationFunc == nil { return GenerationUnknown, nil @@ -37,7 +37,7 @@ func (m MockRepositoryStore) GetGeneration(ctx context.Context, repositoryID int return m.GetGenerationFunc(ctx, repositoryID, storage) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m MockRepositoryStore) IncrementGeneration(ctx context.Context, repositoryID int64, primary string, secondaries []string) error { if m.IncrementGenerationFunc == nil { return nil @@ -46,7 +46,7 @@ func (m MockRepositoryStore) IncrementGeneration(ctx context.Context, repository return m.IncrementGenerationFunc(ctx, repositoryID, primary, secondaries) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m MockRepositoryStore) GetReplicatedGeneration(ctx context.Context, repositoryID int64, source, target string) (int, error) { if m.GetReplicatedGenerationFunc == nil { return GenerationUnknown, nil @@ -55,7 +55,7 @@ func (m MockRepositoryStore) GetReplicatedGeneration(ctx context.Context, reposi return m.GetReplicatedGenerationFunc(ctx, repositoryID, source, target) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m MockRepositoryStore) SetGeneration(ctx context.Context, repositoryID int64, storage, relativePath string, generation int) error { if m.SetGenerationFunc == nil { return nil @@ -82,7 +82,7 @@ func (m MockRepositoryStore) SetAuthoritativeReplica(ctx context.Context, virtua return m.SetAuthoritativeReplicaFunc(ctx, virtualStorage, relativePath, storage) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m MockRepositoryStore) DeleteRepository(ctx context.Context, virtualStorage, relativePath string) (string, []string, error) { if m.DeleteRepositoryFunc == nil { return "", nil, nil @@ -105,7 +105,7 @@ func (m MockRepositoryStore) RenameRepositoryInPlace(ctx context.Context, virtua return m.RenameRepositoryInPlaceFunc(ctx, virtualStorage, relativePath, newRelativePath) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m MockRepositoryStore) RenameRepository(ctx context.Context, virtualStorage, relativePath, storage, newRelativePath string) error { if m.RenameRepositoryFunc == nil { return nil @@ -141,7 +141,7 @@ func (m MockRepositoryStore) GetPartiallyAvailableRepositories(ctx context.Conte return m.GetPartiallyAvailableRepositoriesFunc(ctx, virtualStorage) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m MockRepositoryStore) DeleteInvalidRepository(ctx context.Context, repositoryID int64, storage string) error { if m.DeleteInvalidRepositoryFunc == nil { return nil @@ -150,7 +150,7 @@ func (m MockRepositoryStore) DeleteInvalidRepository(ctx context.Context, reposi return m.DeleteInvalidRepositoryFunc(ctx, repositoryID, storage) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m MockRepositoryStore) RepositoryExists(ctx context.Context, virtualStorage, relativePath string) (bool, error) { if m.RepositoryExistsFunc == nil { return true, nil diff --git a/internal/praefect/grpc-proxy/proxy/director.go b/internal/praefect/grpc-proxy/proxy/director.go index 97b5be7ba..b7aa280ab 100644 --- a/internal/praefect/grpc-proxy/proxy/director.go +++ b/internal/praefect/grpc-proxy/proxy/director.go @@ -58,12 +58,12 @@ func NewStreamParameters(primary Destination, secondaries []Destination, reqFina } } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *StreamParameters) Primary() Destination { return s.primary } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *StreamParameters) Secondaries() []Destination { return s.secondaries } diff --git a/internal/praefect/health_checker.go b/internal/praefect/health_checker.go index 36193812b..3135bf9dd 100644 --- a/internal/praefect/health_checker.go +++ b/internal/praefect/health_checker.go @@ -9,7 +9,7 @@ type HealthChecker interface { // StaticHealthChecker returns the nodes as always healthy. type StaticHealthChecker map[string][]string -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (healthyNodes StaticHealthChecker) HealthyNodes() map[string][]string { return healthyNodes } diff --git a/internal/praefect/metrics/prometheus.go b/internal/praefect/metrics/prometheus.go index f0bd9abee..6449a883f 100644 --- a/internal/praefect/metrics/prometheus.go +++ b/internal/praefect/metrics/prometheus.go @@ -54,7 +54,7 @@ func RegisterNodeLatency(conf gitalycfgprom.Config, registerer prometheus.Regist return nodeLatency, registerer.Register(nodeLatency) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. var MethodTypeCounter = promauto.NewCounterVec( prometheus.CounterOpts{ Namespace: "gitaly", @@ -63,7 +63,7 @@ var MethodTypeCounter = promauto.NewCounterVec( }, []string{"method_type"}, ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. var PrimaryGauge = promauto.NewGaugeVec( prometheus.GaugeOpts{ Namespace: "gitaly", @@ -72,7 +72,7 @@ var PrimaryGauge = promauto.NewGaugeVec( }, []string{"virtual_storage", "gitaly_storage"}, ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. var NodeLastHealthcheckGauge = promauto.NewGaugeVec( prometheus.GaugeOpts{ Namespace: "gitaly", diff --git a/internal/praefect/nodes/manager.go b/internal/praefect/nodes/manager.go index 422d98342..d4ae32c8c 100644 --- a/internal/praefect/nodes/manager.go +++ b/internal/praefect/nodes/manager.go @@ -33,7 +33,7 @@ type Shard struct { Secondaries []Node } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s Shard) GetNode(storage string) (Node, error) { if storage == s.Primary.GetStorage() { return s.Primary, nil @@ -262,7 +262,7 @@ func (n *Mgr) GetPrimary(ctx context.Context, virtualStorage string, _ int64) (s return shard.Primary.GetStorage(), nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (n *Mgr) GetSyncedNode(ctx context.Context, virtualStorageName, repoPath string) (Node, error) { _, upToDateStorages, err := n.csg.GetConsistentStorages(ctx, virtualStorageName, repoPath) if err != nil && !errors.As(err, new(commonerr.RepositoryNotFoundError)) { @@ -299,7 +299,7 @@ func (n *Mgr) GetSyncedNode(ctx context.Context, virtualStorageName, repoPath st return healthyStorages[rand.Intn(len(healthyStorages))], nil } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (n *Mgr) HealthyNodes() map[string][]string { healthy := make(map[string][]string, len(n.nodes)) for vs, nodes := range n.nodes { @@ -316,7 +316,7 @@ func (n *Mgr) HealthyNodes() map[string][]string { return healthy } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (n *Mgr) Nodes() map[string][]Node { return n.nodes } func newConnectionStatus(node config.Node, cc *grpc.ClientConn, l logrus.FieldLogger, latencyHist prommetrics.HistogramVec, errorTracker tracker.ErrorTracker) *nodeStatus { diff --git a/internal/praefect/nodes/mock.go b/internal/praefect/nodes/mock.go index d30ba9461..86564ff64 100644 --- a/internal/praefect/nodes/mock.go +++ b/internal/praefect/nodes/mock.go @@ -14,7 +14,7 @@ type MockManager struct { Storage string } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *MockManager) GetShard(_ context.Context, storage string) (Shard, error) { return m.GetShardFunc(storage) } @@ -58,17 +58,17 @@ type MockNode struct { Healthy bool } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *MockNode) GetStorage() string { return m.GetStorageMethod() } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *MockNode) IsHealthy() bool { return m.Healthy } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *MockNode) GetConnection() *grpc.ClientConn { return m.Conn } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *MockNode) GetAddress() string { return "" } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *MockNode) GetToken() string { return "" } diff --git a/internal/praefect/protoregistry/protoregistry.go b/internal/praefect/protoregistry/protoregistry.go index 2bfb77706..0399bf885 100644 --- a/internal/praefect/protoregistry/protoregistry.go +++ b/internal/praefect/protoregistry/protoregistry.go @@ -100,7 +100,7 @@ func (mi MethodInfo) AdditionalRepo(msg proto.Message) (*gitalypb.Repository, bo return repo, true, err } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (mi MethodInfo) FullMethodName() string { return mi.fullMethodName } diff --git a/internal/praefect/reconciler/reconciler.go b/internal/praefect/reconciler/reconciler.go index a04b1ecc0..1af241668 100644 --- a/internal/praefect/reconciler/reconciler.go +++ b/internal/praefect/reconciler/reconciler.go @@ -49,12 +49,12 @@ func NewReconciler(log logrus.FieldLogger, db glsql.Querier, hc praefect.HealthC return r } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (r *Reconciler) Describe(ch chan<- *prometheus.Desc) { prometheus.DescribeByCollect(r, ch) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (r *Reconciler) Collect(ch chan<- prometheus.Metric) { r.reconciliationSchedulingDuration.Collect(ch) } diff --git a/internal/praefect/replicator.go b/internal/praefect/replicator.go index d3d36c586..d7d66a95e 100644 --- a/internal/praefect/replicator.go +++ b/internal/praefect/replicator.go @@ -287,12 +287,12 @@ func NewReplMgr(log logrus.FieldLogger, storageNames map[string][]string, queue return r } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (r ReplMgr) Describe(ch chan<- *prometheus.Desc) { prometheus.DescribeByCollect(r, ch) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (r ReplMgr) Collect(ch chan<- prometheus.Metric) { r.replInFlightMetric.Collect(ch) } diff --git a/internal/praefect/router_per_repository.go b/internal/praefect/router_per_repository.go index 153bab616..e248f1c9b 100644 --- a/internal/praefect/router_per_repository.go +++ b/internal/praefect/router_per_repository.go @@ -135,7 +135,7 @@ func (r *PerRepositoryRouter) RouteStorageMutator(ctx context.Context, virtualSt return StorageMutatorRoute{}, errors.New("RouteStorageMutator is not implemented on PerRepositoryRouter") } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (r *PerRepositoryRouter) RouteRepositoryAccessor(ctx context.Context, virtualStorage, relativePath string, forcePrimary bool) (RepositoryAccessorRoute, error) { healthyNodes, err := r.healthyNodes(virtualStorage) if err != nil { @@ -208,7 +208,7 @@ func (r *PerRepositoryRouter) resolveAdditionalReplicaPath(ctx context.Context, return r.rs.GetReplicaPath(ctx, additionalRepositoryID) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (r *PerRepositoryRouter) RouteRepositoryMutator(ctx context.Context, virtualStorage, relativePath, additionalRelativePath string) (RepositoryMutatorRoute, error) { healthyNodes, err := r.healthyNodes(virtualStorage) if err != nil { diff --git a/internal/praefect/service/info/dataloss.go b/internal/praefect/service/info/dataloss.go index d5ae5c6b9..5957f1a11 100644 --- a/internal/praefect/service/info/dataloss.go +++ b/internal/praefect/service/info/dataloss.go @@ -6,7 +6,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) DatalossCheck(ctx context.Context, req *gitalypb.DatalossCheckRequest) (*gitalypb.DatalossCheckResponse, error) { repos, err := s.rs.GetPartiallyAvailableRepositories(ctx, req.GetVirtualStorage()) if err != nil { diff --git a/internal/praefect/service/info/replication_factor.go b/internal/praefect/service/info/replication_factor.go index ba4ac1b9d..3f861b727 100644 --- a/internal/praefect/service/info/replication_factor.go +++ b/internal/praefect/service/info/replication_factor.go @@ -10,7 +10,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) SetReplicationFactor(ctx context.Context, req *gitalypb.SetReplicationFactorRequest) (*gitalypb.SetReplicationFactorResponse, error) { resp, err := s.setReplicationFactor(ctx, req) if err != nil { diff --git a/internal/praefect/service/info/server.go b/internal/praefect/service/info/server.go index c8fffb6d1..ee86a85a4 100644 --- a/internal/praefect/service/info/server.go +++ b/internal/praefect/service/info/server.go @@ -60,7 +60,7 @@ func NewServer( } } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (s *Server) SetAuthoritativeStorage(ctx context.Context, req *gitalypb.SetAuthoritativeStorageRequest) (*gitalypb.SetAuthoritativeStorageResponse, error) { storages := s.conf.StorageNames()[req.VirtualStorage] if storages == nil { diff --git a/internal/praefect/service/transaction/server.go b/internal/praefect/service/transaction/server.go index 7d0af1999..d2b8ca837 100644 --- a/internal/praefect/service/transaction/server.go +++ b/internal/praefect/service/transaction/server.go @@ -10,13 +10,13 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/proto/go/gitalypb" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. type Server struct { gitalypb.UnimplementedRefTransactionServer txMgr *transactions.Manager } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func NewServer(txMgr *transactions.Manager) gitalypb.RefTransactionServer { return &Server{ txMgr: txMgr, diff --git a/internal/praefect/transactions/manager.go b/internal/praefect/transactions/manager.go index e05b2ed7f..57a81d7db 100644 --- a/internal/praefect/transactions/manager.go +++ b/internal/praefect/transactions/manager.go @@ -15,7 +15,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v15/internal/transaction/voting" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. var ErrNotFound = errors.New("transaction not found") // Manager handles reference transactions for Praefect. It is required in order @@ -63,12 +63,12 @@ func NewManager(cfg config.Config) *Manager { } } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (mgr *Manager) Describe(descs chan<- *prometheus.Desc) { prometheus.DescribeByCollect(mgr, descs) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (mgr *Manager) Collect(metrics chan<- prometheus.Metric) { mgr.counterMetric.Collect(metrics) mgr.delayMetric.Collect(metrics) diff --git a/internal/testhelper/promtest/counter.go b/internal/testhelper/promtest/counter.go index 1d29831e8..0d7a37f81 100644 --- a/internal/testhelper/promtest/counter.go +++ b/internal/testhelper/promtest/counter.go @@ -4,25 +4,25 @@ import ( "sync" ) -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. type MockCounter struct { m sync.RWMutex value float64 } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *MockCounter) Value() float64 { m.m.RLock() defer m.m.RUnlock() return m.value } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *MockCounter) Inc() { m.Add(1) } -//nolint: stylecheck // This is unintentionally missing documentation. +//nolint:revive // This is unintentionally missing documentation. func (m *MockCounter) Add(v float64) { m.m.Lock() defer m.m.Unlock() |