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

Add gocritic to golangci-lint config (#9556)

Browse Source
This commit is contained in:
Kris Hicks
2020-12-08 12:47:04 -08:00
committed by GitHub
parent dfcdc9c53d
commit 071f4c7596
17 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
command/agent/config.go
View File

@@ -1564,10 +1564,10 @@ func (a *ClientConfig) Merge(b *ClientConfig) *ClientConfig {
result.BridgeNetworkSubnet = b.BridgeNetworkSubnet
}
result.HostNetworks = a.HostNetworks
if len(b.HostNetworks) != 0 {
result.HostNetworks = append(a.HostNetworks, b.HostNetworks...)
} else {
result.HostNetworks = a.HostNetworks
result.HostNetworks = append(result.HostNetworks, b.HostNetworks...)
}
if b.BindWildcardDefaultHostNetwork {

3
command/agent/node_endpoint.go
View File

@@ -140,7 +140,8 @@ func (s *HTTPServer) nodeToggleDrain(resp http.ResponseWriter, req *http.Request
drainRequest.MarkEligible = true
}
} else {
if err := decodeBody(req, &drainRequest); err != nil {
err := decodeBody(req, &drainRequest)
if err != nil {
return nil, CodedError(400, err.Error())
}
}

5
command/agent/scaling_endpoint.go
View File

@@ -43,10 +43,7 @@ func (s *HTTPServer) scalingPoliciesListRequest(resp http.ResponseWriter, req *h
func (s *HTTPServer) ScalingPolicySpecificRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
path := strings.TrimPrefix(req.URL.Path, "/v1/scaling/policy/")
switch {
default:
return s.scalingPolicyCRUD(resp, req, path)
}
return s.scalingPolicyCRUD(resp, req, path)
}
func (s *HTTPServer) scalingPolicyCRUD(resp http.ResponseWriter, req *http.Request,

2
command/metrics.go
View File

@@ -122,7 +122,7 @@ func (c *OperatorMetricsCommand) Run(args []string) int {
return 1
}
resp := string(bs[:])
resp := string(bs)
c.Ui.Output(resp)
}

15
command/operator_debug.go
View File

@@ -634,7 +634,8 @@ func (c *OperatorDebugCommand) collectPprof(path, id string, client *api.Client)
return // only exit on 403
}
} else {
if err := c.writeBytes(path, "profile.prof", bs); err != nil {
err := c.writeBytes(path, "profile.prof", bs)
if err != nil {
c.Ui.Error(err.Error())
}
}
@@ -643,7 +644,8 @@ func (c *OperatorDebugCommand) collectPprof(path, id string, client *api.Client)
if err != nil {
c.Ui.Error(fmt.Sprintf("%s: Failed to retrieve pprof trace.prof, err: %v", path, err))
} else {
if err := c.writeBytes(path, "trace.prof", bs); err != nil {
err := c.writeBytes(path, "trace.prof", bs)
if err != nil {
c.Ui.Error(err.Error())
}
}
@@ -652,7 +654,8 @@ func (c *OperatorDebugCommand) collectPprof(path, id string, client *api.Client)
if err != nil {
c.Ui.Error(fmt.Sprintf("%s: Failed to retrieve pprof goroutine.prof, err: %v", path, err))
} else {
if err := c.writeBytes(path, "goroutine.prof", bs); err != nil {
err := c.writeBytes(path, "goroutine.prof", bs)
if err != nil {
c.Ui.Error(err.Error())
}
}
@@ -664,7 +667,8 @@ func (c *OperatorDebugCommand) collectPprof(path, id string, client *api.Client)
if err != nil {
c.Ui.Error(fmt.Sprintf("%s: Failed to retrieve pprof goroutine-debug1.txt, err: %v", path, err))
} else {
if err := c.writeBytes(path, "goroutine-debug1.txt", bs); err != nil {
err := c.writeBytes(path, "goroutine-debug1.txt", bs)
if err != nil {
c.Ui.Error(err.Error())
}
}
@@ -677,7 +681,8 @@ func (c *OperatorDebugCommand) collectPprof(path, id string, client *api.Client)
if err != nil {
c.Ui.Error(fmt.Sprintf("%s: Failed to retrieve pprof goroutine-debug2.txt, err: %v", path, err))
} else {
if err := c.writeBytes(path, "goroutine-debug2.txt", bs); err != nil {
err := c.writeBytes(path, "goroutine-debug2.txt", bs)
if err != nil {
c.Ui.Error(err.Error())
}
}