Add gosimple linter (#9590)

.golangci.yml

@@ -73,6 +73,7 @@ linters:
     - structcheck
     - unconvert
     - gofmt
+    - gosimple
     # Stretch Goal
     #- maligned
   fast: false

client/agent_endpoint.go

@@ -135,10 +135,7 @@ func (a *Agent) monitor(conn io.ReadWriteCloser) {
 			cancel()
 			return
 		}
-		select {
-		case <-ctx.Done():
-			return
-		}
+		<-ctx.Done()
 	}()
 
 	logCh := monitor.Start()

client/allocdir/fs_linux.go

@@ -55,8 +55,7 @@ func createSecretDir(dir string) error {
 			return nil
 		}
 
-		var flags uintptr
-		flags = syscall.MS_NOEXEC
+		flags := uintptr(syscall.MS_NOEXEC)
 		options := fmt.Sprintf("size=%dm", secretDirTmpfsSize)
 		if err := syscall.Mount("tmpfs", dir, "tmpfs", flags, options); err != nil {
 			return os.NewSyscallError("mount", err)

client/allocrunner/health_hook.go

@@ -215,7 +215,7 @@ func (h *allocHealthWatcherHook) watchHealth(ctx context.Context, deadline time.
 		// Allocation has stopped so no need to set health
 		return
 
-	case <-time.After(deadline.Sub(time.Now())):
+	case <-time.After(time.Until(deadline)):
 		// Time is up! Fallthrough to set unhealthy.
 		h.logger.Trace("deadline reached; setting unhealthy", "deadline", deadline)
 

client/allocrunner/taskrunner/plugin_supervisor_hook.go

@@ -161,7 +161,7 @@ func (h *csiPluginSupervisorHook) Poststart(_ context.Context, _ *interfaces.Tas
 // Deeper fingerprinting of the plugin is implemented by the csimanager.
 func (h *csiPluginSupervisorHook) ensureSupervisorLoop(ctx context.Context) {
 	h.runningLock.Lock()
-	if h.running == true {
+	if h.running {
 		h.runningLock.Unlock()
 		return
 	}

client/client.go

@@ -1613,7 +1613,7 @@ func (c *Client) getHeartbeatRetryIntv(err error) time.Duration {
 	}
 
 	// Determine how much time we have left to heartbeat
-	left := last.Add(ttl).Sub(time.Now())
+	left := time.Until(last.Add(ttl))
 
 	// Logic for retrying is:
 	// * Do not retry faster than once a second

client/devicemanager/instance.go

@@ -406,8 +406,6 @@ func (i *instanceManager) handleFingerprintError() {
 
 	// Cancel the context so we cleanup all goroutines
 	i.cancel()
-
-	return
 }
 
 // handleFingerprint stores the new devices and triggers the fingerprint output

client/dynamicplugins/registry.go

@@ -373,9 +373,7 @@ func (p *pluginEventBroadcaster) run() {
 		case msg := <-p.publishCh:
 			p.subscriptionsLock.RLock()
 			for msgCh := range p.subscriptions {
-				select {
-				case msgCh <- msg:
-				}
+				msgCh <- msg
 			}
 			p.subscriptionsLock.RUnlock()
 		}

client/enterprise_client_oss.go

@@ -12,6 +12,4 @@ func newEnterpriseClient(logger hclog.Logger) *EnterpriseClient {
 }
 
 // SetFeatures is used for enterprise builds to configure enterprise features
-func (ec *EnterpriseClient) SetFeatures(features uint64) {
-	return
-}
+func (ec *EnterpriseClient) SetFeatures(features uint64) {}

client/fingerprint/structs.go

@@ -30,7 +30,7 @@ type FingerprintResponse struct {
 func (f *FingerprintResponse) AddAttribute(name, value string) {
 	// initialize Attributes if it has not been already
 	if f.Attributes == nil {
-		f.Attributes = make(map[string]string, 0)
+		f.Attributes = make(map[string]string)
 	}
 
 	f.Attributes[name] = value
@@ -41,7 +41,7 @@ func (f *FingerprintResponse) AddAttribute(name, value string) {
 func (f *FingerprintResponse) RemoveAttribute(name string) {
 	// initialize Attributes if it has not been already
 	if f.Attributes == nil {
-		f.Attributes = make(map[string]string, 0)
+		f.Attributes = make(map[string]string)
 	}
 
 	f.Attributes[name] = ""
@@ -51,7 +51,7 @@ func (f *FingerprintResponse) RemoveAttribute(name string) {
 func (f *FingerprintResponse) AddLink(name, value string) {
 	// initialize Links if it has not been already
 	if f.Links == nil {
-		f.Links = make(map[string]string, 0)
+		f.Links = make(map[string]string)
 	}
 
 	f.Links[name] = value
@@ -62,7 +62,7 @@ func (f *FingerprintResponse) AddLink(name, value string) {
 func (f *FingerprintResponse) RemoveLink(name string) {
 	// initialize Links if it has not been already
 	if f.Links == nil {
-		f.Links = make(map[string]string, 0)
+		f.Links = make(map[string]string)
 	}
 
 	f.Links[name] = ""

client/logmon/logging/rotator.go

@@ -295,7 +295,7 @@ func (f *FileRotator) purgeOldFiles() {
 
 			// Sorting the file indexes so that we can purge the older files and keep
 			// only the number of files as configured by the user
-			sort.Sort(sort.IntSlice(fIndexes))
+			sort.Ints(fIndexes)
 			toDelete := fIndexes[0 : len(fIndexes)-f.MaxFiles]
 			for _, fIndex := range toDelete {
 				fname := filepath.Join(f.path, fmt.Sprintf("%s.%d", f.baseFileName, fIndex))

client/logmon/logmon.go

@@ -253,7 +253,6 @@ func (l *logRotatorWrapper) start(openFn func() (io.ReadCloser, error)) {
 			reader.Close()
 		}
 	}()
-	return
 }
 
 // Close closes the rotator and the process writer to ensure that the Wait

client/pluginmanager/group.go

@@ -65,14 +65,12 @@ func (m *PluginGroup) WaitForFirstFingerprint(ctx context.Context) (<-chan struc
 		go func() {
 			defer wg.Done()
 			logger.Debug("waiting on plugin manager initial fingerprint")
+			<-manager.WaitForFirstFingerprint(ctx)
 			select {
-			case <-manager.WaitForFirstFingerprint(ctx):
-				select {
-				case <-ctx.Done():
-					logger.Warn("timeout waiting for plugin manager to be ready")
-				default:
-					logger.Debug("finished plugin manager initial fingerprint")
-				}
+			case <-ctx.Done():
+				logger.Warn("timeout waiting for plugin manager to be ready")
+			default:
+				logger.Debug("finished plugin manager initial fingerprint")
 			}
 		}()
 	}

client/rpc.go

@@ -114,7 +114,7 @@ TRY:
 	case <-time.After(lib.RandomStagger(c.config.RPCHoldTimeout / structs.JitterFraction)):
 		// If we are going to retry a blocking query we need to update the time to block so it finishes by our deadline.
 		if info, ok := args.(structs.RPCInfo); ok && info.TimeToBlock() > 0 {
-			newBlockTime := deadline.Sub(time.Now())
+			newBlockTime := time.Until(deadline)
 			// We can get below 0 here on slow computers because we slept for jitter so at least try to get an immediate response
 			if newBlockTime < 0 {
 				newBlockTime = 0

client/state/08types.go

@@ -108,10 +108,7 @@ func (t *taskRunnerState08) Upgrade(allocID, taskName string) (*state.LocalState
 
 	// The docker driver prefixed the handle with 'DOCKER:'
 	// Strip so that it can be unmarshalled
-	data := t.HandleID
-	if strings.HasPrefix(data, "DOCKER:") {
-		data = data[7:]
-	}
+	data := strings.TrimPrefix(t.HandleID, "DOCKER:")
 
 	// The pre09 driver handle ID is given to the driver. It is unmarshalled
 	// here to check for errors

client/structs/structs.go

@@ -331,7 +331,7 @@ type HealthCheckIntervalResponse struct {
 func (h *HealthCheckResponse) AddDriverInfo(name string, driverInfo *structs.DriverInfo) {
 	// initialize Drivers if it has not been already
 	if h.Drivers == nil {
-		h.Drivers = make(map[string]*structs.DriverInfo, 0)
+		h.Drivers = make(map[string]*structs.DriverInfo)
 	}
 
 	h.Drivers[name] = driverInfo

client/vaultclient/vaultclient.go

@@ -479,7 +479,7 @@ func (c *vaultClient) run() {
 				// Compute the duration after which the item
 				// needs renewal and set the renewalCh to fire
 				// at that time.
-				renewalDuration := renewalTime.Sub(time.Now())
+				renewalDuration := time.Until(renewalTime)
 				renewalCh = time.After(renewalDuration)
 			} else {
 				// If the renewals of multiple items are too

command/acl_policy_list.go

@@ -111,7 +111,7 @@ func formatPolicies(policies []*api.ACLPolicyListStub) string {
 	}
 
 	output := make([]string, 0, len(policies)+1)
-	output = append(output, fmt.Sprintf("Name|Description"))
+	output = append(output, "Name|Description")
 	for _, p := range policies {
 		output = append(output, fmt.Sprintf("%s|%s", p.Name, p.Description))
 	}

command/acl_token_list.go

@@ -108,7 +108,7 @@ func formatTokens(tokens []*api.ACLTokenListStub) string {
 	}
 
 	output := make([]string, 0, len(tokens)+1)
-	output = append(output, fmt.Sprintf("Name|Type|Global|Accessor ID"))
+	output = append(output, "Name|Type|Global|Accessor ID")
 	for _, p := range tokens {
 		output = append(output, fmt.Sprintf("%s|%s|%t|%s", p.Name, p.Type, p.Global, p.AccessorID))
 	}

command/agent/command.go

@@ -882,7 +882,7 @@ func (c *Command) handleReload() {
 	c.Ui.Output("Reloading configuration...")
 	newConf := c.readConfig()
 	if newConf == nil {
-		c.Ui.Error(fmt.Sprintf("Failed to reload configs"))
+		c.Ui.Error("Failed to reload configs")
 		return
 	}
 

command/agent/http.go

@@ -400,7 +400,6 @@ func (s *HTTPServer) handleUI(h http.Handler) http.Handler {
 		header := w.Header()
 		header.Add("Content-Security-Policy", "default-src 'none'; connect-src *; img-src 'self' data:; script-src 'self'; style-src 'self' 'unsafe-inline'; form-action 'none'; frame-ancestors 'none'")
 		h.ServeHTTP(w, req)
-		return
 	})
 }
 
@@ -448,7 +447,7 @@ func (s *HTTPServer) wrap(handler func(resp http.ResponseWriter, req *http.Reque
 		reqURL := req.URL.String()
 		start := time.Now()
 		defer func() {
-			s.logger.Debug("request complete", "method", req.Method, "path", reqURL, "duration", time.Now().Sub(start))
+			s.logger.Debug("request complete", "method", req.Method, "path", reqURL, "duration", time.Since(start))
 		}()
 		obj, err := s.auditHandler(handler)(resp, req)
 
@@ -524,7 +523,7 @@ func (s *HTTPServer) wrapNonJSON(handler func(resp http.ResponseWriter, req *htt
 		reqURL := req.URL.String()
 		start := time.Now()
 		defer func() {
-			s.logger.Debug("request complete", "method", req.Method, "path", reqURL, "duration", time.Now().Sub(start))
+			s.logger.Debug("request complete", "method", req.Method, "path", reqURL, "duration", time.Since(start))
 		}()
 		obj, err := s.auditNonJSONHandler(handler)(resp, req)
 
@@ -595,7 +594,7 @@ func setMeta(resp http.ResponseWriter, m *structs.QueryMeta) {
 // setHeaders is used to set canonical response header fields
 func setHeaders(resp http.ResponseWriter, headers map[string]string) {
 	for field, value := range headers {
-		resp.Header().Set(http.CanonicalHeaderKey(field), value)
+		resp.Header().Set(field, value)
 	}
 }
 

command/agent_info.go

@@ -79,7 +79,7 @@ func (c *AgentInfoCommand) Run(args []string) int {
 
 	for _, key := range statsKeys {
 		c.Ui.Output(key)
-		statsData, _ := info.Stats[key]
+		statsData := info.Stats[key]
 		statsDataKeys := make([]string, len(statsData))
 		i := 0
 		for key := range statsData {

command/agent_monitor.go

@@ -97,7 +97,7 @@ func (c *MonitorCommand) Run(args []string) int {
 
 	// Query the node info and lookup prefix
 	if len(nodeID) == 1 {
-		c.Ui.Error(fmt.Sprintf("Node identifier must contain at least two characters."))
+		c.Ui.Error("Node identifier must contain at least two characters.")
 		return 1
 	}
 

command/alloc_exec.go

@@ -168,7 +168,7 @@ func (l *AllocExecCommand) Run(args []string) int {
 
 	// Query the allocation info
 	if len(allocID) == 1 {
-		l.Ui.Error(fmt.Sprintf("Alloc ID must contain at least two characters."))
+		l.Ui.Error("Alloc ID must contain at least two characters.")
 		return 1
 	}
 

command/alloc_fs.go

@@ -178,7 +178,7 @@ func (f *AllocFSCommand) Run(args []string) int {
 	}
 	// Query the allocation info
 	if len(allocID) == 1 {
-		f.Ui.Error(fmt.Sprintf("Alloc ID must contain at least two characters."))
+		f.Ui.Error("Alloc ID must contain at least two characters.")
 		return 1
 	}
 

command/alloc_logs.go

@@ -158,7 +158,7 @@ func (l *AllocLogsCommand) Run(args []string) int {
 	}
 	// Query the allocation info
 	if len(allocID) == 1 {
-		l.Ui.Error(fmt.Sprintf("Alloc ID must contain at least two characters."))
+		l.Ui.Error("Alloc ID must contain at least two characters.")
 		return 1
 	}
 

command/alloc_restart.go

@@ -68,7 +68,7 @@ func (c *AllocRestartCommand) Run(args []string) int {
 
 	// Query the allocation info
 	if len(allocID) == 1 {
-		c.Ui.Error(fmt.Sprintf("Alloc ID must contain at least two characters."))
+		c.Ui.Error("Alloc ID must contain at least two characters.")
 		return 1
 	}
 

command/alloc_signal.go

@@ -73,7 +73,7 @@ func (c *AllocSignalCommand) Run(args []string) int {
 
 	// Query the allocation info
 	if len(allocID) == 1 {
-		c.Ui.Error(fmt.Sprintf("Alloc ID must contain at least two characters."))
+		c.Ui.Error("Alloc ID must contain at least two characters.")
 		return 1
 	}
 

command/alloc_status.go

@@ -149,7 +149,7 @@ func (c *AllocStatusCommand) Run(args []string) int {
 
 	// Query the allocation info
 	if len(allocID) == 1 {
-		c.Ui.Error(fmt.Sprintf("Identifier must contain at least two characters."))
+		c.Ui.Error("Identifier must contain at least two characters.")
 		return 1
 	}
 

command/alloc_stop.go

@@ -76,7 +76,7 @@ func (c *AllocStopCommand) Run(args []string) int {
 
 	// Query the allocation info
 	if len(allocID) == 1 {
-		c.Ui.Error(fmt.Sprintf("Alloc ID must contain at least two characters."))
+		c.Ui.Error("Alloc ID must contain at least two characters.")
 		return 1
 	}
 

command/eval_status.go

@@ -139,7 +139,7 @@ func (c *EvalStatusCommand) Run(args []string) int {
 
 	// Query the allocation info
 	if len(evalID) == 1 {
-		c.Ui.Error(fmt.Sprintf("Identifier must contain at least two characters."))
+		c.Ui.Error("Identifier must contain at least two characters.")
 		return 1
 	}
 

command/job_plan.go

@@ -255,7 +255,7 @@ func (c *JobPlanCommand) addPreemptions(resp *api.JobPlanResponse) {
 	c.Ui.Output(c.Colorize().Color("[bold][yellow]Preemptions:\n[reset]"))
 	if len(resp.Annotations.PreemptedAllocs) < preemptionDisplayThreshold {
 		var allocs []string
-		allocs = append(allocs, fmt.Sprintf("Alloc ID|Job ID|Task Group"))
+		allocs = append(allocs, "Alloc ID|Job ID|Task Group")
 		for _, alloc := range resp.Annotations.PreemptedAllocs {
 			allocs = append(allocs, fmt.Sprintf("%s|%s|%s", alloc.ID, alloc.JobID, alloc.TaskGroup))
 		}
@@ -284,15 +284,15 @@ func (c *JobPlanCommand) addPreemptions(resp *api.JobPlanResponse) {
 	// Show counts grouped by job ID if its less than a threshold
 	var output []string
 	if numJobs < preemptionDisplayThreshold {
-		output = append(output, fmt.Sprintf("Job ID|Namespace|Job Type|Preemptions"))
+		output = append(output, "Job ID|Namespace|Job Type|Preemptions")
 		for jobType, jobCounts := range allocDetails {
 			for jobId, count := range jobCounts {
 				output = append(output, fmt.Sprintf("%s|%s|%s|%d", jobId.id, jobId.namespace, jobType, count))
 			}
 		}
 	} else {
 		// Show counts grouped by job type
-		output = append(output, fmt.Sprintf("Job Type|Preemptions"))
+		output = append(output, "Job Type|Preemptions")
 		for jobType, jobCounts := range allocDetails {
 			total := 0
 			for _, count := range jobCounts {

command/job_status.go

@@ -188,7 +188,7 @@ func (c *JobStatusCommand) Run(args []string) int {
 
 	if periodic && !parameterized {
 		if *job.Stop {
-			basic = append(basic, fmt.Sprintf("Next Periodic Launch|none (job stopped)"))
+			basic = append(basic, "Next Periodic Launch|none (job stopped)")
 		} else {
 			location, err := job.Periodic.GetLocation()
 			if err == nil {

command/node_config.go

@@ -97,7 +97,7 @@ func (c *NodeConfigCommand) Run(args []string) int {
 			c.Ui.Error(fmt.Sprintf("Error updating server list: %s", err))
 			return 1
 		}
-		c.Ui.Output(fmt.Sprint("Updated server list"))
+		c.Ui.Output("Updated server list")
 		return 0
 	}