Refactor code to use 'any' type instead of 'interface{}' for improved type safety and readability; update related tests and configurations

Author: Ravi Atluri

.golangci.yml

@@ -109,7 +109,7 @@ formatters:
         - default
         - blank
         - dot
-        - alias
+        - prefix(github.com/gojekfarm)
       custom-order: true
 
 run:

Makefile

@@ -8,20 +8,15 @@ GO_BUILD_DIRS := $(ALL_GO_MOD_DIRS)
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 BIN_DIR := $(PROJECT_DIR)/.bin
 
-fmt:
-	@$(call run-go-mod-dir,go fmt ./...,"go fmt")
-
-gofmt:
-	@$(call run-go-mod-dir,go fmt ./...,"gofmt -s -w")
+fmt: golangci-lint
+	@$(call run-go-mod-dir,$(GOLANGCI_LINT) fmt,".bin/golangci-lint fmt")
 
 vet:
 	@$(call run-go-mod-dir,go vet ./...,"go vet")
 
 lint: golangci-lint
 	$(GOLANGCI_LINT) run --timeout=10m -v
 
-imports: gci
-	@$(call run-go-mod-dir,$(GCI) -w -local github.com/gojekfarm ./ | { grep -v -e 'skip file .*' || true; },".bin/gci")
 
 .PHONY: tidy
 tidy:
@@ -51,7 +46,7 @@ test-html: test-cov gocov-html
 	@open coverage.html
 
 .PHONY: check
-check: fmt vet imports lint
+check: fmt vet lint
 	@git diff --quiet || test $$(git diff --name-only | grep -v -e 'go.mod$$' -e 'go.sum$$' | wc -l) -eq 0 || ( echo "The following changes (result of code generators and code checks) have been detected:" && git --no-pager diff && false ) # fail if Git working tree is dirty
 
 # ========= Helpers ===========
@@ -60,10 +55,6 @@ GOLANGCI_LINT = $(BIN_DIR)/golangci-lint
 golangci-lint:
 	$(call go-get-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest)
 
-GCI = $(BIN_DIR)/gci
-gci:
-	$(call go-get-tool,$(GCI),github.com/daixiang0/[email protected])
-
 GOCOV = $(BIN_DIR)/gocov
 gocov:
 	$(call go-get-tool,$(GOCOV),github.com/axw/gocov/[email protected])

examples/xload/main.go

@@ -87,7 +87,7 @@ func main() {
 	_ = f.Close()
 }
 
-func prettyPrint(v interface{}) {
+func prettyPrint(v any) {
 	out, _ := json.MarshalIndent(v, "", "  ")
 	println(string(out))
 }

generic/slice/filter_test.go

@@ -22,15 +22,15 @@ func TestFilter(t *testing.T) {
 	}{
 		{
 			name:  "EvenIntegers",
-			elems: []interface{}{1, 2, 3, 4, 5, 6, 7},
+			elems: []any{1, 2, 3, 4, 5, 6, 7},
 			predicate: func(i any) bool {
 				return i.(int)%2 == 0
 			},
 			want: []any{2, 4, 6},
 		},
 		{
 			name: "ValidStructs",
-			elems: []interface{}{
+			elems: []any{
 				testStruct{ID: 1, Valid: true},
 				testStruct{ID: 2},
 				testStruct{ID: 3, Valid: true},

generic/slice/find_test.go

@@ -22,7 +22,7 @@ func TestFind(t *testing.T) {
 	}{
 		{
 			name: "StructWithID2",
-			elems: []interface{}{
+			elems: []any{
 				testStruct{ID: 1},
 				testStruct{ID: 2},
 				testStruct{ID: 3},
@@ -36,7 +36,7 @@ func TestFind(t *testing.T) {
 		},
 		{
 			name: "PointerToStructWithID3",
-			elems: []interface{}{
+			elems: []any{
 				&testStruct{ID: 1},
 				&testStruct{ID: 2},
 				&testStruct{ID: 3},
@@ -50,7 +50,7 @@ func TestFind(t *testing.T) {
 		},
 		{
 			name: "NoStructWithMatchingID",
-			elems: []interface{}{
+			elems: []any{
 				testStruct{ID: 1},
 				testStruct{ID: 2},
 				testStruct{ID: 3},
@@ -62,7 +62,7 @@ func TestFind(t *testing.T) {
 		},
 		{
 			name: "NoPointerStructWithMatchingID",
-			elems: []interface{}{
+			elems: []any{
 				&testStruct{ID: 1},
 				&testStruct{ID: 2},
 				&testStruct{ID: 4},

generic/slice/map_test.go

@@ -27,15 +27,15 @@ func TestMap(t *testing.T) {
 	}{
 		{
 			name:  "DoubleIntegers",
-			elems: []interface{}{1, 2, 3, 4, 5, 6},
+			elems: []any{1, 2, 3, 4, 5, 6},
 			mapper: func(i any) any {
 				return i.(int) * 2
 			},
 			want: []any{2, 4, 6, 8, 10, 12},
 		},
 		{
 			name:  "MapStructs",
-			elems: []interface{}{testStructA{Value: 2}, testStructA{Value: 4}, testStructA{Value: 6}},
+			elems: []any{testStructA{Value: 2}, testStructA{Value: 4}, testStructA{Value: 6}},
 			mapper: func(i any) any {
 				return testStructB{Value: i.(testStructA).Value * 2}
 			},
@@ -75,7 +75,7 @@ func TestMapConcurrentWithContext(t *testing.T) {
 		{
 			name:  "DoubleIntegers",
 			ctx:   context.Background(),
-			elems: []interface{}{1, 2, 3, 4, 5, 6},
+			elems: []any{1, 2, 3, 4, 5, 6},
 			mapper: func(_ context.Context, i any) any {
 				return i.(int) * 2
 			},
@@ -84,7 +84,7 @@ func TestMapConcurrentWithContext(t *testing.T) {
 		{
 			name:  "MapStructs",
 			ctx:   context.Background(),
-			elems: []interface{}{testStructA{Value: 2}, testStructA{Value: 4}, testStructA{Value: 6}},
+			elems: []any{testStructA{Value: 2}, testStructA{Value: 4}, testStructA{Value: 6}},
 			mapper: func(_ context.Context, i any) any {
 				return testStructB{Value: i.(testStructA).Value * 2}
 			},
@@ -93,7 +93,7 @@ func TestMapConcurrentWithContext(t *testing.T) {
 		{
 			name:  "SlowMapper",
 			ctx:   tCtx,
-			elems: []interface{}{1, 2, 4, 8, 16, 32},
+			elems: []any{1, 2, 4, 8, 16, 32},
 			mapper: func(_ context.Context, i any) any {
 				ii := i.(int)
 				time.Sleep(time.Duration(ii) * time.Second)
@@ -104,7 +104,7 @@ func TestMapConcurrentWithContext(t *testing.T) {
 		{
 			name:  "AlreadyCancelledContext",
 			ctx:   cCtx,
-			elems: []interface{}{1, 2, 4, 8, 16, 32},
+			elems: []any{1, 2, 4, 8, 16, 32},
 			mapper: func(_ context.Context, i any) any {
 				return i.(int) * 2
 			},
@@ -128,15 +128,15 @@ func TestMapConcurrent(t *testing.T) {
 	}{
 		{
 			name:  "DoubleIntegers",
-			elems: []interface{}{1, 2, 3, 4, 5, 6},
+			elems: []any{1, 2, 3, 4, 5, 6},
 			mapper: func(i any) any {
 				return i.(int) * 2
 			},
 			want: []any{2, 4, 6, 8, 10, 12},
 		},
 		{
 			name:  "MapStructs",
-			elems: []interface{}{testStructA{Value: 2}, testStructA{Value: 4}, testStructA{Value: 6}},
+			elems: []any{testStructA{Value: 2}, testStructA{Value: 4}, testStructA{Value: 6}},
 			mapper: func(i any) any {
 				return testStructB{Value: i.(testStructA).Value * 2}
 			},

xkafka/middleware/retry/example_test.go

@@ -2,9 +2,8 @@ package retry_test
 
 import (
 	"context"
-	"time"
-
 	"log/slog"
+	"time"
 
 	"github.com/gojekfarm/xtools/xkafka"
 	"github.com/gojekfarm/xtools/xkafka/middleware/retry"

xkafka/middleware/slog/slog.go

@@ -3,9 +3,8 @@ package slog
 
 import (
 	"context"
-	"time"
-
 	"log/slog"
+	"time"
 
 	"github.com/gojekfarm/xtools/xkafka"
 )

xkafka/middleware/slog/slog_test.go

@@ -2,10 +2,10 @@ package slog
 
 import (
 	"context"
+	"log/slog"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"log/slog"
 
 	"github.com/gojekfarm/xtools/xkafka"
 )

xkafka/options.go

@@ -12,7 +12,7 @@ func (b Brokers) setConsumerConfig(o *consumerConfig) { o.brokers = b }
 func (b Brokers) setProducerConfig(o *producerConfig) { o.brokers = b }
 
 // ConfigMap allows setting kafka configuration.
-type ConfigMap map[string]interface{}
+type ConfigMap map[string]any
 
 func (cm ConfigMap) setConsumerConfig(o *consumerConfig) {
 	for k, v := range cm {