Remove double lint-rule exclusion.

Author: dgottlieb

cli/data.go

@@ -742,12 +742,12 @@ func (c *viamClient) tabularData(dest string, request *datapb.ExportTabularDataR
 			ctx, cancel := context.WithCancel(context.Background())
 
 			defer func() {
-				writer.Flush()   //nolint:errcheck,gosec
-				dataFile.Close() //nolint:errcheck,gosec
+				writer.Flush()   //nolint:errcheck
+				dataFile.Close() //nolint:errcheck
 				cancel()
 
 				if exportErr != nil {
-					os.Remove(dataFile.Name()) //nolint:errcheck,gosec
+					os.Remove(dataFile.Name()) //nolint:errcheck
 				}
 			}()
 

cli/module_build.go

@@ -235,7 +235,7 @@ func (c *viamClient) moduleBuildListAction(cCtx *cli.Context, args moduleBuildLi
 			job.StartTime.AsTime().Format(time.RFC3339))
 	}
 	// the table is not printed to stdout until the tabwriter is flushed
-	//nolint: errcheck,gosec
+	//nolint:errcheck
 	w.Flush()
 	return nil
 }
@@ -700,7 +700,7 @@ func (c *viamClient) loadGitignorePatterns(repoPath string) (gitignore.Matcher,
 			return nil, errors.Wrap(err, "failed to open .gitignore file")
 		}
 		defer func() {
-			//nolint:errcheck,gosec // Ignore close error for read-only file
+			//nolint:errcheck
 			file.Close()
 		}()
 

components/board/genericlinux/buses/i2c.go

@@ -16,7 +16,6 @@ import (
 
 func init() {
 	if _, err := host.Init(); err != nil {
-		//nolint:gosec
 		fmtnolint.Println("Error initializing host:", err)
 	}
 }

etc/.golangci.yaml

@@ -60,6 +60,7 @@ linters:
     - testpackage
     - thelper # false positives
     - tparallel # there are valid reasons to have top-level t.Parallel() but serial subtests
+    - unparam # not useful
     - varnamelen
     - wrapcheck
     - wsl
@@ -81,6 +82,7 @@ linters-settings:
       - composites
   gosec:
     excludes:
+      - G104 # Unhandled errors. These are already linted on, no need to double lint.
       - G115 # TODO(go1.23): maybe reenable
   revive:
     # Unfortunately configuring a single rules disables all other rules, even
@@ -120,6 +122,14 @@ linters-settings:
       - ifElseChain
   gomoddirectives:
     replace-allow-list: [github.com/hashicorp/go-getter]
+  stylecheck:
+    checks:
+      - all
+      - "-ST1005" # Low value complaint. Can remove when gosimple rewrites code in place instead of failing.
+  gosimple:
+    checks:
+      - all
+      - "-S1002" # Low value complaint. Can remove when gosimple rewrites code in place instead of failing.
 issues:
   exclude-rules:
     - path: _test\.go$

ftdc/custom_format.go

@@ -63,7 +63,6 @@ func writeSchema(schema *schema, output io.Writer) error {
 func writeDatum(time int64, prev, curr []float32, output io.Writer) error {
 	numPts := len(curr)
 	if len(prev) != 0 && numPts != len(prev) {
-		//nolint:stylecheck
 		return fmt.Errorf("Bad input sizes. Prev: %v Curr: %v", len(prev), len(curr))
 	}
 
@@ -234,7 +233,7 @@ func flattenMap(mValue reflect.Value) ([]string, []float32, error) {
 			}
 			numbers = append(numbers, subNumbers...)
 		case isNumeric(value.Kind()):
-			//nolint:stylecheck
+
 			return nil, nil, fmt.Errorf("A numeric type was forgotten to be included. Kind: %v", value.Kind())
 		default:
 			// Getting the keys for a structure will ignore these types. Such as the antagonistic
@@ -298,7 +297,7 @@ func flattenStruct(value reflect.Value) ([]string, []float32, error) {
 
 			numbers = append(numbers, subNumbers...)
 		case isNumeric(rField.Kind()):
-			//nolint:stylecheck
+
 			return nil, nil, fmt.Errorf("A numeric type was forgotten to be included. Kind: %v", rField.Kind())
 		default:
 			// Getting the keys for a structure will ignore these types. Such as the antagonistic
@@ -599,7 +598,6 @@ func readDiffBits(reader *bufio.Reader, schema *schema) ([]int, error) {
 // is the post-hydration list and consequently matches the `schema.fieldOrder` size.
 func readData(reader *bufio.Reader, schema *schema, diffedFields []int, prevValues []float32) ([]float32, error) {
 	if prevValues != nil && len(prevValues) != len(schema.fieldOrder) {
-		//nolint
 		return nil, fmt.Errorf("Parser error. Mismatched `prevValues` and schema size. PrevValues: %d Schema: %d",
 			len(prevValues), len(schema.fieldOrder))
 	}

module/module.go

@@ -194,7 +194,7 @@ func NewModule(ctx context.Context, address string, logger logging.Logger) (*Mod
 		if err != nil {
 			return nil, err
 		}
-		//nolint: errcheck, gosec
+		//nolint:errcheck
 		trace.SetProvider(
 			ctx,
 			sdktrace.WithResource(

motionplan/armplanning/api.go

@@ -247,7 +247,7 @@ func ValidatePlan(
 	if len(worldStateOverride.Obstacles()) > 0 && validateErrorOnce.Load() == false {
 		logger.Info("Validate plan returning collision")
 		validateErrorOnce.Store(true)
-		return errors.New("Will collide.")
+		return errors.New("will collide")
 	}
 
 	return nil

motionplan/armplanning/cmd-plan/cmd-plan.go

@@ -131,7 +131,7 @@ func realMain() error {
 	}
 
 	spansExporter := perf.NewOtelDevelopmentExporter()
-	//nolint: errcheck, gosec
+	//nolint:errcheck
 	trace.SetProvider(ctx, sdktrace.WithResource(otelresource.Empty()))
 	trace.AddExporters(spansExporter)
 

referenceframe/frame_system.go

@@ -83,7 +83,6 @@ func NewFrameSystem(name string, parts []*FrameSystemPart, additionalTransforms
 			strs[idx] = part.FrameConfig.Name()
 		}
 
-		//nolint
 		return nil, fmt.Errorf("Cannot construct frame system. Some parts are not linked to the world frame. Parts: %v",
 			strs)
 	}

referenceframe/worldstate.go

@@ -96,13 +96,8 @@ func (ws *WorldState) Merge(geomsInFrame *GeometriesInFrame) *WorldState {
 		ret.obstacleNames[name] = true
 	}
 
-	for _, geomInFrame := range ws.obstacles {
-		ret.obstacles = append(ret.obstacles, geomInFrame)
-	}
-
-	for _, transform := range ws.transforms {
-		ret.transforms = append(ret.transforms, transform)
-	}
+	ret.obstacles = append(ret.obstacles, ws.obstacles...)
+	ret.transforms = append(ret.transforms, ws.transforms...)
 
 	if len(geomsInFrame.Geometries()) > 0 {
 		// Avoid adding a bag of empty geometries. Such that `len(worldState.Obstacles())` returns 0