add goimports to golangci-lint to sort imports (#63)

* add goimports to golangci-lint to sort imports --------- Co-authored-by: Naveen <[email protected]>
slatedb · Jan 24, 2025 · f333b92 · f333b92
1 parent dc27d2f
commit f333b92
Show file tree

Hide file tree

Showing 56 changed files with 216 additions and 116 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,6 @@
+linters:
+  enable:
+    - goimports
+linters-settings:
+  goimports:
+    local-prefixes: github.com/slatedb/slatedb-go
diff --git a/Makefile b/Makefile
@@ -2,12 +2,16 @@ LINT = $(GOPATH)/bin/golangci-lint
 LINT_VERSION = v1.61.0
 
 $(LINT): ## Download Go linter
-        curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin $(LINT_VERSION)
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin $(LINT_VERSION)
 
 .PHONY: lint
 lint: $(LINT) ## Run Go linter
 	$(LINT) run -v ./...
 
+format_imports:
+	go install golang.org/x/tools/cmd/goimports@latest
+	goimports -l -w .
+
 fmt:
 	go fmt ./...
 
@@ -20,7 +24,7 @@ flatbuf:
 	go fmt ./internal/flatbuf/*.go
 
 .PHONY: build
-build: flatbuf fmt vet
+build: flatbuf fmt vet format_imports
 	go build -v -o bin/slatedb -race ./cmd
 
 test_coverage:

diff --git a/README.md b/README.md
@@ -72,11 +72,11 @@ SlateDB is licensed under the Apache License, Version 2.0.
 
 1. Why is there a Go port instead of using Go binding ?
 
-    We wanted developers using this library in Go to be able to easily understand and modify(if needed) the internals without having to learn a new language.
+   We wanted developers using this library in Go to be able to easily understand and modify(if needed) the internals without having to learn a new language.
 
-    Go developers will also have an option to use Go binding(when it is ready) if they can use cgo/ffi.
+   Go developers will also have an option to use Go binding(when it is ready) if they can use cgo/ffi.
 
 
 2. Is there a risk of a drift between the inner workings of the Rust and Go implementation?
 
-    We will try to keep it close to the Rust implementation.
+   We will try to keep it close to the Rust implementation.
diff --git a/cmd/main.go b/cmd/main.go
@@ -6,8 +6,9 @@ import (
 	"log/slog"
 	"time"
 
-	"github.com/slatedb/slatedb-go/slatedb"
 	"github.com/thanos-io/objstore"
+
+	"github.com/slatedb/slatedb-go/slatedb"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/slatedb/slatedb-go
 
-go 1.23.1
+go 1.23
 
 require (
 	github.com/gammazero/deque v0.2.1

diff --git a/internal/assert/assert.go b/internal/assert/assert.go
@@ -3,9 +3,11 @@ package assert
 import (
 	"context"
 	"fmt"
-	"github.com/slatedb/slatedb-go/internal/iter"
-	assert2 "github.com/stretchr/testify/assert"
 	"testing"
+
+	assert2 "github.com/stretchr/testify/assert"
+
+	"github.com/slatedb/slatedb-go/internal/iter"
 )
 
 func True(condition bool, errMsg string, arg ...any) {

diff --git a/internal/compress/compression.go b/internal/compress/compression.go
@@ -4,11 +4,13 @@ import (
 	"bytes"
 	"compress/zlib"
 	"errors"
+	"io"
+
 	"github.com/golang/snappy"
 	"github.com/klauspost/compress/zstd"
 	"github.com/pierrec/lz4/v4"
+
 	"github.com/slatedb/slatedb-go/internal/flatbuf"
-	"io"
 )
 
 const (

diff --git a/internal/flatbuf/manifest_generated.go b/internal/flatbuf/manifest_generated.go
diff --git a/internal/iter/entry.go b/internal/iter/entry.go
@@ -2,6 +2,7 @@ package iter
 
 import (
 	"context"
+
 	"github.com/slatedb/slatedb-go/internal/types"
 )
 

diff --git a/internal/iter/entry_test.go b/internal/iter/entry_test.go
@@ -2,9 +2,11 @@ package iter_test
 
 import (
 	"context"
-	"github.com/slatedb/slatedb-go/internal/iter"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/slatedb/slatedb-go/internal/iter"
 )
 
 func TestNewEntryIterator(t *testing.T) {

diff --git a/internal/iter/merge.go b/internal/iter/merge.go
@@ -5,6 +5,7 @@ import (
 	"cmp"
 	"container/heap"
 	"context"
+
 	"github.com/slatedb/slatedb-go/internal/types"
 )
 

diff --git a/internal/iter/merge_test.go b/internal/iter/merge_test.go
@@ -2,10 +2,12 @@ package iter_test
 
 import (
 	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
 	assert2 "github.com/slatedb/slatedb-go/internal/assert"
 	"github.com/slatedb/slatedb-go/internal/iter"
-	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestMergeUniqueIteratorPrecedence(t *testing.T) {

diff --git a/internal/sstable/blob.go b/internal/sstable/blob.go
@@ -2,6 +2,7 @@ package sstable
 
 import (
 	"errors"
+
 	"github.com/slatedb/slatedb-go/slatedb/common"
 )
 

diff --git a/internal/sstable/block/block.go b/internal/sstable/block/block.go
@@ -6,11 +6,12 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"hash/crc32"
+
 	"github.com/slatedb/slatedb-go/internal/assert"
 	"github.com/slatedb/slatedb-go/internal/compress"
 	"github.com/slatedb/slatedb-go/internal/types"
 	"github.com/slatedb/slatedb-go/slatedb/common"
-	"hash/crc32"
 )
 
 var (

diff --git a/internal/sstable/block/block_test.go b/internal/sstable/block/block_test.go
@@ -4,15 +4,17 @@ import (
 	"bytes"
 	"context"
 	"encoding/binary"
+	"hash/crc32"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	assert2 "github.com/slatedb/slatedb-go/internal/assert"
 	"github.com/slatedb/slatedb-go/internal/compress"
 	"github.com/slatedb/slatedb-go/internal/sstable/block"
 	"github.com/slatedb/slatedb-go/internal/types"
 	"github.com/slatedb/slatedb-go/slatedb/common"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"hash/crc32"
-	"testing"
 )
 
 func TestNewBuilder(t *testing.T) {

diff --git a/internal/sstable/block/iterator.go b/internal/sstable/block/iterator.go
@@ -5,8 +5,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/slatedb/slatedb-go/internal/types"
 	"sort"
+
+	"github.com/slatedb/slatedb-go/internal/types"
 )
 
 // Iterator iterates through KeyValue pairs present in the Block.

diff --git a/internal/sstable/block/row.go b/internal/sstable/block/row.go
@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
+	"math"
+	"time"
+
 	"github.com/slatedb/slatedb-go/internal/assert"
 	"github.com/slatedb/slatedb-go/internal/types"
 	"github.com/slatedb/slatedb-go/slatedb/common"
-	"math"
-	"time"
 )
 
 var v0RowCodec v0Codec

diff --git a/internal/sstable/block/row_test.go b/internal/sstable/block/row_test.go
@@ -2,13 +2,15 @@ package block
 
 import (
 	"bytes"
+	"testing"
+	"time"
+
 	"github.com/kapetan-io/tackle/random"
-	"github.com/slatedb/slatedb-go/internal/compress"
-	"github.com/slatedb/slatedb-go/internal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
-	"time"
+
+	"github.com/slatedb/slatedb-go/internal/compress"
+	"github.com/slatedb/slatedb-go/internal/types"
 )
 
 func TestRowFlags(t *testing.T) {

diff --git a/internal/sstable/bloom/bloom.go b/internal/sstable/bloom/bloom.go
@@ -3,10 +3,11 @@ package bloom
 import (
 	"encoding/binary"
 	"errors"
-	"github.com/slatedb/slatedb-go/internal/compress"
-	"github.com/slatedb/slatedb-go/slatedb/common"
 	"hash/crc32"
 	"hash/fnv"
+
+	"github.com/slatedb/slatedb-go/internal/compress"
+	"github.com/slatedb/slatedb-go/slatedb/common"
 )
 
 type Filter struct {

diff --git a/internal/sstable/bloom/bloom_test.go b/internal/sstable/bloom/bloom_test.go
@@ -3,11 +3,13 @@ package bloom
 import (
 	"encoding/binary"
 	"fmt"
-	"github.com/slatedb/slatedb-go/internal/compress"
-	"github.com/slatedb/slatedb-go/slatedb/common"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
+
+	"github.com/slatedb/slatedb-go/internal/compress"
+	"github.com/slatedb/slatedb-go/slatedb/common"
 )
 
 func TestFilterBuilder_Build(t *testing.T) {

diff --git a/internal/sstable/builder.go b/internal/sstable/builder.go
@@ -3,8 +3,10 @@ package sstable
 import (
 	"bytes"
 	"encoding/binary"
+
 	"github.com/gammazero/deque"
 	"github.com/samber/mo"
+
 	"github.com/slatedb/slatedb-go/internal/assert"
 	"github.com/slatedb/slatedb-go/internal/compress"
 	"github.com/slatedb/slatedb-go/internal/flatbuf"

diff --git a/internal/sstable/builder_test.go b/internal/sstable/builder_test.go
@@ -2,15 +2,17 @@ package sstable_test
 
 import (
 	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	assert2 "github.com/slatedb/slatedb-go/internal/assert"
 	"github.com/slatedb/slatedb-go/internal/compress"
 	"github.com/slatedb/slatedb-go/internal/sstable"
 	"github.com/slatedb/slatedb-go/internal/sstable/block"
 	"github.com/slatedb/slatedb-go/internal/types"
 	"github.com/slatedb/slatedb-go/slatedb/common"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestBuilder(t *testing.T) {

diff --git a/internal/sstable/decode.go b/internal/sstable/decode.go
@@ -3,7 +3,9 @@ package sstable
 import (
 	"encoding/binary"
 	"fmt"
+
 	"github.com/samber/mo"
+
 	"github.com/slatedb/slatedb-go/internal/compress"
 	"github.com/slatedb/slatedb-go/internal/sstable/block"
 	"github.com/slatedb/slatedb-go/internal/sstable/bloom"

diff --git a/internal/sstable/flatbuf.go b/internal/sstable/flatbuf.go
@@ -3,11 +3,13 @@ package sstable
 import (
 	"bytes"
 	"encoding/binary"
-	"github.com/google/flatbuffers/go"
+	"hash/crc32"
+
+	flatbuffers "github.com/google/flatbuffers/go"
+
 	"github.com/slatedb/slatedb-go/internal/compress"
 	"github.com/slatedb/slatedb-go/internal/flatbuf"
 	"github.com/slatedb/slatedb-go/slatedb/common"
-	"hash/crc32"
 )
 
 type Index struct {

diff --git a/internal/sstable/iterator.go b/internal/sstable/iterator.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+
 	"github.com/slatedb/slatedb-go/internal/sstable/block"
 	"github.com/slatedb/slatedb-go/internal/types"
 	"github.com/slatedb/slatedb-go/slatedb/common"

diff --git a/internal/sstable/pretty.go b/internal/sstable/pretty.go
@@ -3,8 +3,9 @@ package sstable
 import (
 	"bytes"
 	"fmt"
-	"github.com/slatedb/slatedb-go/internal/sstable/block"
 	"strings"
+
+	"github.com/slatedb/slatedb-go/internal/sstable/block"
 )
 
 // PrettyPrint returns a string representation of the SSTable in a human-readable format

diff --git a/internal/sstable/pretty_test.go b/internal/sstable/pretty_test.go
@@ -1,9 +1,11 @@
 package sstable
 
 import (
-	"github.com/slatedb/slatedb-go/internal/compress"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/slatedb/slatedb-go/internal/compress"
 )
 
 func TestPrettyPrint(t *testing.T) {

diff --git a/internal/sstable/sstable.go b/internal/sstable/sstable.go
@@ -2,6 +2,7 @@ package sstable
 
 import (
 	"bytes"
+
 	"github.com/slatedb/slatedb-go/internal/compress"
 )
 

diff --git a/internal/sstable/sstable_test.go b/internal/sstable/sstable_test.go
@@ -2,11 +2,13 @@ package sstable_test
 
 import (
 	"bytes"
-	"github.com/slatedb/slatedb-go/internal/compress"
-	"github.com/slatedb/slatedb-go/internal/sstable"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"testing"
+
+	"github.com/slatedb/slatedb-go/internal/compress"
+	"github.com/slatedb/slatedb-go/internal/sstable"
 )
 
 func TestInfoClone(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ package iter @@
     import (
     	"context"
     	"github.com/slatedb/slatedb-go/internal/types"
     )
@@ Expand Down @@