Merge pull request #280 from planetlabs/dependabot/github_actions/golangci/golangci-lint-action-8

Bump golangci/golangci-lint-action from 6 to 8

Author: tschaub

.github/workflows/test.yml

@@ -16,10 +16,9 @@ jobs:
       - uses: actions/setup-go@v5.3.0
         with:
           go-version: '1.24'
-      - uses: golangci/golangci-lint-action@v6
+      - uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.64.6
-          args: "--timeout=5m --out-${NO_FUTURE}format colored-line-number"
+          version: v2.1.6
 
   test:
     runs-on: ubuntu-latest

cmd/gpq/command/convert.go

@@ -144,7 +144,7 @@ func (c *ConvertCmd) Run() error {
 		if createErr != nil {
 			return NewCommandError("failed to open %q for writing: %w", outputSource, createErr)
 		}
-		defer o.Close()
+		defer func() { _ = o.Close() }()
 		output = o
 	}
 

cmd/gpq/command/convert_test.go

@@ -37,7 +37,7 @@ func (s *Suite) TestConvertGeoJSONToGeoParquetStdout() {
 
 	fileReader, err := file.NewParquetReader(bytes.NewReader(data))
 	s.Require().NoError(err)
-	defer fileReader.Close()
+	defer func() { _ = fileReader.Close() }()
 
 	s.Equal(int64(5), fileReader.NumRows())
 }
@@ -78,7 +78,7 @@ func (s *Suite) TestConvertGeoJSONStdinToGeoParquetStdout() {
 
 	fileReader, err := file.NewParquetReader(bytes.NewReader(data))
 	s.Require().NoError(err)
-	defer fileReader.Close()
+	defer func() { _ = fileReader.Close() }()
 
 	s.Equal(int64(1), fileReader.NumRows())
 }

cmd/gpq/command/describe.go

@@ -60,7 +60,7 @@ func (c *DescribeCmd) Run() error {
 	if fileErr != nil {
 		return fmt.Errorf("failed to read %q as parquet: %w", c.Input, fileErr)
 	}
-	defer fileReader.Close()
+	defer func() { _ = fileReader.Close() }()
 
 	if c.MetadataOnly {
 		value, err := geoparquet.GetMetadataValue(fileReader.MetaData().KeyValueMetadata())
@@ -294,9 +294,10 @@ func buildSchema(fileReader *file.Reader, name string, node schema.Node) *Descri
 	repetition := node.RepetitionType()
 	optional := false
 	repeated := false
-	if repetition == parquet.Repetitions.Optional {
+	switch repetition {
+	case parquet.Repetitions.Optional:
 		optional = true
-	} else if repetition == parquet.Repetitions.Repeated {
+	case parquet.Repetitions.Repeated:
 		repeated = true
 	}
 

cmd/gpq/command/extract.go

@@ -44,7 +44,7 @@ func (c *ExtractCmd) Run() error {
 		if createErr != nil {
 			return NewCommandError("failed to open %q for writing: %w", outputSource, createErr)
 		}
-		defer o.Close()
+		defer func() { _ = o.Close() }()
 		output = o
 	}
 
@@ -138,7 +138,7 @@ func (c *ExtractCmd) Run() error {
 	if err != nil {
 		return NewCommandError("trouble creating geoparquet record reader: %w", err)
 	}
-	defer recordReader.Close()
+	defer func() { _ = recordReader.Close() }()
 
 	// prepare output writer
 	recordWriter, rwErr := geoparquet.NewRecordWriter(&geoparquet.WriterConfig{
@@ -149,7 +149,7 @@ func (c *ExtractCmd) Run() error {
 	if rwErr != nil {
 		return NewCommandError("trouble getting record writer: %w", rwErr)
 	}
-	defer recordWriter.Close()
+	defer func() { _ = recordWriter.Close() }()
 
 	// read and write records in loop
 	for {

cmd/gpq/command/extract_test.go

@@ -19,7 +19,7 @@ func (s *Suite) TestExtractDropCols() {
 
 	fileReader, err := file.NewParquetReader(bytes.NewReader(data))
 	s.Require().NoError(err)
-	defer fileReader.Close()
+	defer func() { _ = fileReader.Close() }()
 
 	s.Equal(int64(5), fileReader.NumRows())
 
@@ -30,7 +30,7 @@ func (s *Suite) TestExtractDropCols() {
 		Reader: bytes.NewReader(data),
 	})
 	s.Require().NoError(err)
-	defer recordReader.Close()
+	defer func() { _ = recordReader.Close() }()
 
 	record, readErr := recordReader.Read()
 	s.Require().NoError(readErr)
@@ -48,7 +48,7 @@ func (s *Suite) TestExtractKeepOnlyCols() {
 
 	fileReader, err := file.NewParquetReader(bytes.NewReader(data))
 	s.Require().NoError(err)
-	defer fileReader.Close()
+	defer func() { _ = fileReader.Close() }()
 
 	s.Equal(int64(5), fileReader.NumRows())
 
@@ -59,7 +59,7 @@ func (s *Suite) TestExtractKeepOnlyCols() {
 		Reader: bytes.NewReader(data),
 	})
 	s.Require().NoError(err)
-	defer recordReader.Close()
+	defer func() { _ = recordReader.Close() }()
 
 	record, readErr := recordReader.Read()
 	s.Require().NoError(readErr)
@@ -80,7 +80,7 @@ func (s *Suite) TestExtractBbox110() {
 		Reader: bytes.NewReader(data),
 	})
 	s.Require().NoError(err)
-	defer recordReader.Close()
+	defer func() { _ = recordReader.Close() }()
 
 	// we expect only one row, namely Tanzania
 	s.Require().Equal(int64(1), recordReader.NumRows())
@@ -109,7 +109,7 @@ func (s *Suite) TestExtractBbox110Partitioned() {
 		Reader: bytes.NewReader(data),
 	})
 	s.Require().NoError(err)
-	defer recordReader.Close()
+	defer func() { _ = recordReader.Close() }()
 
 	// we expect only one row, namely Tanzania
 	s.Require().Equal(int64(1), recordReader.NumRows())
@@ -137,7 +137,7 @@ func (s *Suite) TestExtractBbox100() {
 		Reader: bytes.NewReader(data),
 	})
 	s.Require().NoError(err)
-	defer recordReader.Close()
+	defer func() { _ = recordReader.Close() }()
 
 	// we expect only one row, namely Tanzania
 	s.Require().Equal(int64(1), recordReader.NumRows())

cmd/gpq/command/validate.go

@@ -68,7 +68,7 @@ func (c *ValidateCmd) Run(ctx *kong.Context) error {
 	}
 
 	if !valid {
-		ctx.Kong.Exit(1)
+		ctx.Exit(1)
 	}
 	return nil
 }

cmd/wasm/main.go

@@ -68,7 +68,7 @@ var fromParquet = js.FuncOf(func(this js.Value, args []js.Value) any {
 	if readerErr != nil {
 		return returnFromError(readerErr)
 	}
-	defer reader.Close()
+	defer func() { _ = reader.Close() }()
 
 	metadata, metadataErr := geoparquet.GetMetadataValue(reader.MetaData().KeyValueMetadata())
 	if metadataErr != nil {

internal/geojson/featurereader.go

@@ -178,7 +178,7 @@ func (r *FeatureReader) Read() (*geo.Feature, error) {
 			}
 			_, stringId := valueToken.(string)
 			_, floatId := valueToken.(float64)
-			if !(stringId || floatId) {
+			if !stringId && !floatId {
 				return nil, fmt.Errorf("expected id to be a string or number, got: %v", valueToken)
 			}
 			feature.Id = valueToken

internal/geojson/geojson.go

@@ -32,7 +32,7 @@ func FromParquet(reader parquet.ReaderAtSeeker, writer io.Writer) error {
 	if rrErr != nil {
 		return rrErr
 	}
-	defer recordReader.Close()
+	defer func() { _ = recordReader.Close() }()
 
 	geoMetadata := recordReader.Metadata()