kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

ci: run linter in ./api package (#19513)

Browse Source
This commit is contained in:
Luiz Aoqui
2023-12-19 15:59:47 -05:00
committed by GitHub
parent 95766aaa1b
commit e4e70b086a
14 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
GNUmakefile
View File

@@ -161,6 +161,9 @@ check: ## Lint the source code
@echo "==> Linting source code..." @echo "==> Linting source code..."
@golangci-lint run @golangci-lint run
@echo "==> Linting ./api source code..."
@cd ./api && golangci-lint run --config ../.golangci.yml
@echo "==> Linting hclog statements..." @echo "==> Linting hclog statements..."
@hclogvet . @hclogvet .

2
api/agent.go
View File

@@ -310,7 +310,7 @@ func (a *Agent) Monitor(stopCh <-chan struct{}, q *QueryOptions) (<-chan *Stream
} }
r.setQueryOptions(q) r.setQueryOptions(q)
_, resp, err := requireOK(a.client.doRequest(r)) _, resp, err := requireOK(a.client.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
errCh <- err errCh <- err
return nil, errCh return nil, errCh

4
api/allocations_exec.go
View File

@@ -109,11 +109,11 @@ func (s *execSession) startConnection() (*websocket.Conn, error) {
var conn *websocket.Conn var conn *websocket.Conn
if nodeClient != nil { if nodeClient != nil {
conn, _, _ = nodeClient.websocket(reqPath, q) conn, _, _ = nodeClient.websocket(reqPath, q) //nolint:bodyclose // gorilla/websocket Dialer.DialContext() does not require the body to be closed.
} }
if conn == nil { if conn == nil {
conn, _, err = s.client.websocket(reqPath, q) conn, _, err = s.client.websocket(reqPath, q) //nolint:bodyclose // gorilla/websocket Dialer.DialContext() does not require the body to be closed.
if err != nil { if err != nil {
return nil, err return nil, err
} }

12
api/api.go
View File

@@ -932,7 +932,7 @@ func (c *Client) rawQuery(endpoint string, q *QueryOptions) (io.ReadCloser, erro
return nil, err return nil, err
} }
r.setQueryOptions(q) r.setQueryOptions(q)
_, resp, err := requireOK(c.doRequest(r)) _, resp, err := requireOK(c.doRequest(r)) //nolint:bodyclose // Closing the body is the caller's responsibility.
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1036,7 +1036,7 @@ func (c *Client) query(endpoint string, out any, q *QueryOptions) (*QueryMeta, e
return nil, err return nil, err
} }
r.setQueryOptions(q) r.setQueryOptions(q)
rtt, resp, err := requireOK(c.doRequest(r)) rtt, resp, err := requireOK(c.doRequest(r)) //nolint:bodyclose // Closing the body is the caller's responsibility.
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1061,7 +1061,7 @@ func (c *Client) putQuery(endpoint string, in, out any, q *QueryOptions) (*Query
} }
r.setQueryOptions(q) r.setQueryOptions(q)
r.obj = in r.obj = in
rtt, resp, err := requireOK(c.doRequest(r)) rtt, resp, err := requireOK(c.doRequest(r)) //nolint:bodyclose // Closing the body is the caller's responsibility.
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1092,7 +1092,7 @@ func (c *Client) postQuery(endpoint string, in, out any, q *QueryOptions) (*Quer
} }
r.setQueryOptions(q) r.setQueryOptions(q)
r.obj = in r.obj = in
rtt, resp, err := requireOK(c.doRequest(r)) rtt, resp, err := requireOK(c.doRequest(r)) //nolint:bodyclose // Closing the body is the caller's responsibility.
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1125,7 +1125,7 @@ func (c *Client) write(verb, endpoint string, in, out any, q *WriteOptions) (*Wr
} }
r.setWriteOptions(q) r.setWriteOptions(q)
r.obj = in r.obj = in
rtt, resp, err := requireOK(c.doRequest(r)) rtt, resp, err := requireOK(c.doRequest(r)) //nolint:bodyclose // Closing the body is the caller's responsibility.
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -1151,7 +1151,7 @@ func (c *Client) delete(endpoint string, in, out any, q *WriteOptions) (*WriteMe
} }
r.setWriteOptions(q) r.setWriteOptions(q)
r.obj = in r.obj = in
rtt, resp, err := requireOK(c.doRequest(r)) rtt, resp, err := requireOK(c.doRequest(r)) //nolint:bodyclose // Closing the body is the caller's responsibility.
if err != nil { if err != nil {
return nil, err return nil, err
} }

5
api/consul.go
View File

@@ -199,7 +199,6 @@ type ConsulMeshGateway struct {
func (c *ConsulMeshGateway) Canonicalize() { func (c *ConsulMeshGateway) Canonicalize() {
// Mode may be empty string, indicating behavior will defer to Consul // Mode may be empty string, indicating behavior will defer to Consul
// service-defaults config entry. // service-defaults config entry.
return
} }
func (c *ConsulMeshGateway) Copy() *ConsulMeshGateway { func (c *ConsulMeshGateway) Copy() *ConsulMeshGateway {
@@ -630,9 +629,7 @@ type ConsulMeshConfigEntry struct {
// nothing in here // nothing in here
} }
func (e *ConsulMeshConfigEntry) Canonicalize() { func (e *ConsulMeshConfigEntry) Canonicalize() {}
return
}
func (e *ConsulMeshConfigEntry) Copy() *ConsulMeshConfigEntry { func (e *ConsulMeshConfigEntry) Copy() *ConsulMeshConfigEntry {
if e == nil { if e == nil {

2
api/event_stream.go
View File

@@ -186,7 +186,7 @@ func (e *EventStream) Stream(ctx context.Context, topics map[Topic][]string, ind
} }
} }
_, resp, err := requireOK(e.client.doRequest(r)) _, resp, err := requireOK(e.client.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return nil, err return nil, err

2
api/internal/testutil/responsewriter.go
View File

@@ -53,7 +53,7 @@ func (r *ResponseRecorder) Header() http.Header {
func (r *ResponseRecorder) HeaderMap() http.Header { func (r *ResponseRecorder) HeaderMap() http.Header {
r.mu.Lock() r.mu.Lock()
defer r.mu.Unlock() defer r.mu.Unlock()
return r.rr.Result().Header return r.rr.Result().Header //nolint:bodyclose
} }
// Write to the underlying response buffer. Safe to call concurrent with Read. // Write to the underlying response buffer. Safe to call concurrent with Read.

4
api/internal/testutil/server.go
View File

@@ -373,7 +373,7 @@ func (s *TestServer) url(path string) string {
// requireOK checks the HTTP response code and ensures it is acceptable. // requireOK checks the HTTP response code and ensures it is acceptable.
func (s *TestServer) requireOK(resp *http.Response) error { func (s *TestServer) requireOK(resp *http.Response) error {
if resp.StatusCode != 200 { if resp.StatusCode != http.StatusOK {
return fmt.Errorf("bad status code: %d", resp.StatusCode) return fmt.Errorf("bad status code: %d", resp.StatusCode)
} }
return nil return nil
@@ -381,7 +381,7 @@ func (s *TestServer) requireOK(resp *http.Response) error {
// put performs a new HTTP PUT request. // put performs a new HTTP PUT request.
func (s *TestServer) put(path string, body io.Reader) *http.Response { func (s *TestServer) put(path string, body io.Reader) *http.Response {
req, err := http.NewRequest("PUT", s.url(path), body) req, err := http.NewRequest(http.MethodPut, s.url(path), body)
must.NoError(s.t, err) must.NoError(s.t, err)
resp, err := s.HTTPClient.Do(req) resp, err := s.HTTPClient.Do(req)

19
api/operator.go
View File

@@ -66,7 +66,7 @@ func (op *Operator) RaftGetConfiguration(q *QueryOptions) (*RaftConfiguration, e
return nil, err return nil, err
} }
r.setQueryOptions(q) r.setQueryOptions(q)
_, resp, err := requireOK(op.c.doRequest(r)) _, resp, err := requireOK(op.c.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -91,7 +91,7 @@ func (op *Operator) RaftRemovePeerByAddress(address string, q *WriteOptions) err
r.params.Set("address", address) r.params.Set("address", address)
_, resp, err := requireOK(op.c.doRequest(r)) _, resp, err := requireOK(op.c.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return err return err
} }
@@ -111,7 +111,7 @@ func (op *Operator) RaftRemovePeerByID(id string, q *WriteOptions) error {
r.params.Set("id", id) r.params.Set("id", id)
_, resp, err := requireOK(op.c.doRequest(r)) _, resp, err := requireOK(op.c.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return err return err
} }
@@ -131,7 +131,7 @@ func (op *Operator) RaftTransferLeadershipByAddress(address string, q *WriteOpti
r.params.Set("address", address) r.params.Set("address", address)
_, resp, err := requireOK(op.c.doRequest(r)) _, resp, err := requireOK(op.c.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return err return err
} }
@@ -151,7 +151,7 @@ func (op *Operator) RaftTransferLeadershipByID(id string, q *WriteOptions) error
r.params.Set("id", id) r.params.Set("id", id)
_, resp, err := requireOK(op.c.doRequest(r)) _, resp, err := requireOK(op.c.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return err return err
} }
@@ -262,18 +262,17 @@ func (op *Operator) Snapshot(q *QueryOptions) (io.ReadCloser, error) {
return nil, err return nil, err
} }
r.setQueryOptions(q) r.setQueryOptions(q)
_, resp, err := requireOK(op.c.doRequest(r)) _, resp, err := requireOK(op.c.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer resp.Body.Close()
digest := resp.Header.Get("Digest") digest := resp.Header.Get("Digest")
cr, err := newChecksumValidatingReader(resp.Body, digest) cr, err := newChecksumValidatingReader(resp.Body, digest)
if err != nil { if err != nil {
io.Copy(io.Discard, resp.Body) io.Copy(io.Discard, resp.Body)
resp.Body.Close()
return nil, err return nil, err
} }
@@ -355,7 +354,7 @@ func (op *Operator) ApplyLicense(license string, opts *ApplyLicenseOptions, q *W
r.setWriteOptions(q) r.setWriteOptions(q)
r.body = strings.NewReader(license) r.body = strings.NewReader(license)
rtt, resp, err := requireOK(op.c.doRequest(r)) rtt, resp, err := requireOK(op.c.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -375,7 +374,7 @@ func (op *Operator) LicenseGet(q *QueryOptions) (*LicenseReply, *QueryMeta, erro
req.setQueryOptions(q) req.setQueryOptions(q)
var reply LicenseReply var reply LicenseReply
rtt, resp, err := op.c.doRequest(req) rtt, resp, err := op.c.doRequest(req) //nolint:bodyclose
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }

4
api/retry.go
View File

@@ -39,7 +39,7 @@ func (c *Client) retryPut(ctx context.Context, endpoint string, in, out any, q *
var err error var err error
var wm *WriteMeta var wm *WriteMeta
attemptDelay := time.Duration(100 * time.Second) // Avoid a tick before starting attemptDelay := 100 * time.Second // Avoid a tick before starting
startTime := time.Now() startTime := time.Now()
t := time.NewTimer(attemptDelay) t := time.NewTimer(attemptDelay)
@@ -60,7 +60,7 @@ func (c *Client) retryPut(ctx context.Context, endpoint string, in, out any, q *
wm, err = c.put(endpoint, in, out, q) wm, err = c.put(endpoint, in, out, q)
// Maximum retry period is up, don't retry // Maximum retry period is up, don't retry
if c.config.retryOptions.maxToLastCall != 0 && time.Now().Sub(startTime) > c.config.retryOptions.maxToLastCall { if c.config.retryOptions.maxToLastCall != 0 && time.Since(startTime) > c.config.retryOptions.maxToLastCall {
break break
} }

3
api/search.go
View File

@@ -64,7 +64,8 @@ func (s *Search) FuzzySearch(text string, context contexts.Context, q *QueryOpti
// ID. // ID.
// //
// e.g. A Task-level service would have scope like, // e.g. A Task-level service would have scope like,
// ["<namespace>", "<job>", "<group>", "<task>"] //
// ["<namespace>", "<job>", "<group>", "<task>"]
type FuzzyMatch struct { type FuzzyMatch struct {
ID string // ID is UUID or Name of object ID string // ID is UUID or Name of object
Scope []string `json:",omitempty"` // IDs of parent objects Scope []string `json:",omitempty"` // IDs of parent objects

4
api/tasks.go
View File

@@ -195,7 +195,7 @@ func NewAffinity(lTarget string, operand string, rTarget string, weight int8) *A
LTarget: lTarget, LTarget: lTarget,
RTarget: rTarget, RTarget: rTarget,
Operand: operand, Operand: operand,
Weight: pointerOf(int8(weight)), Weight: pointerOf(weight),
} }
} }
@@ -301,7 +301,7 @@ func NewSpreadTarget(value string, percent uint8) *SpreadTarget {
func NewSpread(attribute string, weight int8, spreadTargets []*SpreadTarget) *Spread { func NewSpread(attribute string, weight int8, spreadTargets []*SpreadTarget) *Spread {
return &Spread{ return &Spread{
Attribute: attribute, Attribute: attribute,
Weight: pointerOf(int8(weight)), Weight: pointerOf(weight),
SpreadTarget: spreadTargets, SpreadTarget: spreadTargets,
} }
} }

19
api/variables.go
View File

@@ -235,8 +235,8 @@ func (vars *Variables) readInternal(endpoint string, out **Variable, q *QueryOpt
} }
r.setQueryOptions(q) r.setQueryOptions(q)
checkFn := requireStatusIn(http.StatusOK, http.StatusNotFound, http.StatusForbidden) checkFn := requireStatusIn(http.StatusOK, http.StatusNotFound, http.StatusForbidden) //nolint:bodyclose
rtt, resp, err := checkFn(vars.client.doRequest(r)) rtt, resp, err := checkFn(vars.client.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -284,12 +284,12 @@ func (vars *Variables) deleteInternal(path string, q *WriteOptions) (*WriteMeta,
} }
r.setWriteOptions(q) r.setWriteOptions(q)
checkFn := requireStatusIn(http.StatusOK, http.StatusNoContent) checkFn := requireStatusIn(http.StatusOK, http.StatusNoContent) //nolint:bodyclose
rtt, resp, err := checkFn(vars.client.doRequest(r)) rtt, resp, err := checkFn(vars.client.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer resp.Body.Close()
wm := &WriteMeta{RequestTime: rtt} wm := &WriteMeta{RequestTime: rtt}
_ = parseWriteMeta(resp, wm) _ = parseWriteMeta(resp, wm)
@@ -305,11 +305,12 @@ func (vars *Variables) deleteChecked(path string, checkIndex uint64, q *WriteOpt
return nil, err return nil, err
} }
r.setWriteOptions(q) r.setWriteOptions(q)
checkFn := requireStatusIn(http.StatusOK, http.StatusNoContent, http.StatusConflict) checkFn := requireStatusIn(http.StatusOK, http.StatusNoContent, http.StatusConflict) //nolint:bodyclose
rtt, resp, err := checkFn(vars.client.doRequest(r)) rtt, resp, err := checkFn(vars.client.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer resp.Body.Close()
wm := &WriteMeta{RequestTime: rtt} wm := &WriteMeta{RequestTime: rtt}
_ = parseWriteMeta(resp, wm) _ = parseWriteMeta(resp, wm)
@@ -341,8 +342,8 @@ func (vars *Variables) writeChecked(endpoint string, in *Variable, out *Variable
r.setWriteOptions(q) r.setWriteOptions(q)
r.obj = in r.obj = in
checkFn := requireStatusIn(http.StatusOK, http.StatusNoContent, http.StatusConflict) checkFn := requireStatusIn(http.StatusOK, http.StatusNoContent, http.StatusConflict) //nolint:bodyclose
rtt, resp, err := checkFn(vars.client.doRequest(r)) rtt, resp, err := checkFn(vars.client.doRequest(r)) //nolint:bodyclose
if err != nil { if err != nil {
return nil, err return nil, err

2
drivers/shared/executor/procstats/list_default.go
View File

@@ -32,7 +32,7 @@ func List(executorPID int) *set.Set[ProcessID] {
nextPPID := stack.Pop() nextPPID := stack.Pop()
result.Insert(ProcessID(nextPPID)) result.Insert(ProcessID(nextPPID))
p, err := process.NewProcessWithContext(ctx, int32(nextPPID)) p, err := process.NewProcessWithContext(ctx, nextPPID)
if err != nil { if err != nil {
continue continue
} }