fix: fixed linter issues

Makefile

@@ -10,14 +10,19 @@ VERSION ?= "0.0.0-dev-$(shell git rev-parse --short HEAD)"
 BUILD_DIR ?= $(CURDIR)
 GO_LINKER_FLAGS=-ldflags "-s -w" -ldflags "-X main.version=$(VERSION)"
 
-.PHONY: all build
-
+.PHONY: all
 all: test build
 
+.PHONY: build
 build:
 	@echo "$(OK_COLOR)==> Building (v${VERSION}) ... $(NO_COLOR)"
 	@CGO_ENABLED=0 go build $(GO_LINKER_FLAGS) -o "$(BUILD_DIR)/${NAME}"
 
+.PHONY: test
 test:
 	@echo "$(OK_COLOR)==> Running tests$(NO_COLOR)"
 	@CGO_ENABLED=0 go test -cover -coverprofile=coverage.txt -covermode=atomic ./...
+
+.PHONY: lint
+lint:
+	golangci-lint run --config=./.github/linters/.golangci.yml --fix

pkg/loader/loader.go

@@ -21,7 +21,7 @@ var (
 // Loader is the interface for posts loader
 type Loader interface {
 	// Load loads posts and saves them one by one in the storage
-	Load(storage storage.Storage) error
+	Load(s storage.Storage) error
 }
 
 // New returns new loader instance by type

pkg/loader/loader_file.go

@@ -23,7 +23,7 @@ func NewFileLoader(path string, f formatter.Formatter, logger *slog.Logger) (*Fi
 }
 
 // Load loads posts and saves them one by one in the storage
-func (l *FileLoader) Load(storage storage.Storage) error {
+func (l *FileLoader) Load(s storage.Storage) error {
 	if err := filepath.Walk(l.path, func(path string, f os.FileInfo, err error) error {
 		if err != nil {
 			return err
@@ -37,7 +37,7 @@ func (l *FileLoader) Load(storage storage.Storage) error {
 			}
 
 			l.logger.Debug("Saving post to storage", slog.String("path", post.Path), slog.String("title", post.Title))
-			err = storage.Save(post)
+			err = s.Save(post)
 			if err != nil {
 				return err
 			}
@@ -47,5 +47,5 @@ func (l *FileLoader) Load(storage storage.Storage) error {
 		return err
 	}
 
-	return storage.Finalize()
+	return s.Finalize()
 }

pkg/server/handler/feed.go

@@ -14,8 +14,8 @@ type Feed struct {
 }
 
 // NewFeed creates new Feed instance
-func NewFeed(storage storage.Storage, renderer renderer.Renderer) *Feed {
-	return &Feed{storage, renderer}
+func NewFeed(s storage.Storage, r renderer.Renderer) *Feed {
+	return &Feed{s, r}
 }
 
 // Atom is the HTTP handler for Atom feed

pkg/server/handler/posts.go

@@ -18,8 +18,8 @@ type Posts struct {
 }
 
 // NewPosts creates new Posts instance
-func NewPosts(storage storage.Storage, renderer renderer.Renderer) *Posts {
-	return &Posts{storage, renderer}
+func NewPosts(s storage.Storage, r renderer.Renderer) *Posts {
+	return &Posts{s, r}
 }
 
 // Front is the HTTP handler for the front page with post list
@@ -72,7 +72,6 @@ func (h *Posts) Post(w http.ResponseWriter, r *http.Request) {
 	}
 
 	h.renderer.Render(w, http.StatusOK, renderer.NewData(r, "post.tpl", renderer.D{"post": post}))
-
 }
 
 func (h *Posts) getPageFromURL(r *http.Request) int {

pkg/server/renderer/html.go

@@ -91,9 +91,9 @@ func (r *HTML) initTemplates() error {
 func (r *HTML) getPartials(templatesPath, theme, uiAbout string) ([]string, error) {
 	var partials []string
 
-	walkFn := func(path string, f os.FileInfo, err error) error {
-		if nil == err && !f.IsDir() && !strings.HasSuffix(path, "about.tpl") {
-			partials = append(partials, path)
+	walkFn := func(fPath string, f os.FileInfo, err error) error {
+		if nil == err && !f.IsDir() && !strings.HasSuffix(fPath, "about.tpl") {
+			partials = append(partials, fPath)
 		}
 		return err
 	}

pkg/server/renderer/renderer.go

@@ -6,7 +6,7 @@ import (
 )
 
 // D is the syntax-sugar type for map
-type D map[string]interface{}
+type D map[string]any
 
 // Data is the container type for renderer data
 type Data struct {
@@ -30,7 +30,7 @@ func NewData(r *http.Request, template string, data D) *Data {
 }
 
 // Set sets named value to the data container
-func (d *Data) Set(key string, value interface{}) *Data {
+func (d *Data) Set(key string, value any) *Data {
 	d.m.Lock()
 	defer d.m.Unlock()
 

pkg/server/web/serve.go

@@ -59,14 +59,14 @@ func ServeStatic(r chi.Router, cfgHTTP HTTPConfig, theme string) {
 }
 
 // ListenAndServe launches web server that listens to HTTP(S) requests
-func ListenAndServe(ctx context.Context, handler chi.Router, cfgSSL SSLConfig, cfgHTTP HTTPConfig, logger *slog.Logger) error {
+func ListenAndServe(ctx context.Context, router chi.Router, cfgSSL SSLConfig, cfgHTTP HTTPConfig, logger *slog.Logger) error {
 	if !cfgSSL.Enabled {
 		server := &http.Server{
 			ReadTimeout:       10 * time.Second,
 			ReadHeaderTimeout: 10 * time.Second,
 			WriteTimeout:      10 * time.Second,
 			Addr:              fmt.Sprintf(":%d", cfgHTTP.Port),
-			Handler:           handler,
+			Handler:           router,
 		}
 
 		logger.Info("Running HTTP server...", slog.String("address", server.Addr))
@@ -87,7 +87,7 @@ func ListenAndServe(ctx context.Context, handler chi.Router, cfgSSL SSLConfig, c
 		ReadHeaderTimeout: 10 * time.Second,
 		WriteTimeout:      10 * time.Second,
 		Addr:              fmt.Sprintf(":%d", cfgSSL.Port),
-		Handler:           handler,
+		Handler:           router,
 		TLSConfig: &tls.Config{
 			MinVersion: tls.VersionTLS12,
 			GetCertificate: func(info *tls.ClientHelloInfo) (*tls.Certificate, error) {

pkg/storage/storage_boltdb_test.go

@@ -16,14 +16,20 @@ import (
 	"github.com/vgarvardt/rklotz/pkg/model"
 )
 
-func getRandomHash(length int) string {
+func getRandomHash(t *testing.T, length int) string {
+	t.Helper()
+
 	hasher := md5.New()
-	hasher.Write([]byte(time.Now().Format(time.RFC3339Nano)))
+	_, err := hasher.Write([]byte(time.Now().Format(time.RFC3339Nano)))
+	require.NoError(t, err)
+
 	return hex.EncodeToString(hasher.Sum(nil))[:length]
 }
 
-func getFilePath() string {
-	return fmt.Sprintf("/tmp/rklotz-test.%s.db", getRandomHash(5))
+func getFilePath(t *testing.T) string {
+	t.Helper()
+
+	return fmt.Sprintf("/tmp/rklotz-test.%s.db", getRandomHash(t, 5))
 }
 
 func fileExists(path string) bool {
@@ -32,7 +38,7 @@ func fileExists(path string) bool {
 }
 
 func TestNewBoltDBStorage(t *testing.T) {
-	dbFilePath := getFilePath()
+	dbFilePath := getFilePath(t)
 	storage, err := NewBoltDBStorage(dbFilePath, 10)
 	require.NoError(t, err)
 	assert.Equal(t, dbFilePath, storage.path)
@@ -46,7 +52,7 @@ func TestNewBoltDBStorage(t *testing.T) {
 }
 
 func TestBoltDBStorage_Finalize(t *testing.T) {
-	dbFilePath := getFilePath()
+	dbFilePath := getFilePath(t)
 	storage, err := NewBoltDBStorage(dbFilePath, 10)
 	require.NoError(t, err)
 	defer func() {
@@ -94,7 +100,7 @@ func loadTestPosts(t *testing.T, storage Storage) {
 }
 
 func TestBoltDBStorage_FindByPath(t *testing.T) {
-	dbFilePath := getFilePath()
+	dbFilePath := getFilePath(t)
 	storage, err := NewBoltDBStorage(dbFilePath, 10)
 	require.NoError(t, err)
 	defer func() {
@@ -119,7 +125,7 @@ func TestBoltDBStorage_FindByPath(t *testing.T) {
 }
 
 func TestBoltDBStorage_ListAll_10(t *testing.T) {
-	dbFilePath := getFilePath()
+	dbFilePath := getFilePath(t)
 	storage, err := NewBoltDBStorage(dbFilePath, 10)
 	require.NoError(t, err)
 	defer func() {
@@ -143,7 +149,7 @@ func TestBoltDBStorage_ListAll_10(t *testing.T) {
 }
 
 func TestBoltDBStorage_ListAll_1(t *testing.T) {
-	dbFilePath := getFilePath()
+	dbFilePath := getFilePath(t)
 	storage, err := NewBoltDBStorage(dbFilePath, 1)
 	require.NoError(t, err)
 	defer func() {
@@ -170,7 +176,7 @@ func TestBoltDBStorage_ListAll_1(t *testing.T) {
 }
 
 func TestBoltDBStorage_ListTag_10(t *testing.T) {
-	dbFilePath := getFilePath()
+	dbFilePath := getFilePath(t)
 	storage, err := NewBoltDBStorage(dbFilePath, 10)
 	require.NoError(t, err)
 	defer func() {
@@ -196,7 +202,7 @@ func TestBoltDBStorage_ListTag_10(t *testing.T) {
 }
 
 func TestBoltDBStorage_ListTag_1(t *testing.T) {
-	dbFilePath := getFilePath()
+	dbFilePath := getFilePath(t)
 	storage, err := NewBoltDBStorage(dbFilePath, 1)
 	require.NoError(t, err)
 	defer func() {
@@ -225,7 +231,7 @@ func TestBoltDBStorage_ListTag_1(t *testing.T) {
 }
 
 func TestBoltDBStorage_ListTag_ErrorNotFound(t *testing.T) {
-	dbFilePath := getFilePath()
+	dbFilePath := getFilePath(t)
 	storage, err := NewBoltDBStorage(dbFilePath, 1)
 	require.NoError(t, err)
 	defer func() {
@@ -235,7 +241,7 @@ func TestBoltDBStorage_ListTag_ErrorNotFound(t *testing.T) {
 
 	loadTestPosts(t, storage)
 
-	tag := getRandomHash(10)
+	tag := getRandomHash(t, 10)
 	_, err = storage.ListTag(tag, 0)
 	require.Error(t, err)
 	assert.Equal(t, ErrorNotFound, err)

pkg/storage/storage_memory.go

@@ -73,14 +73,14 @@ func (s *MemoryStorage) Save(post *model.Post) error {
 func (s *MemoryStorage) Finalize() error {
 	s.postsList = make([]*model.Post, s.postsCount)
 	i := 0
-	s.posts.Range(func(path, post interface{}) bool {
+	s.posts.Range(func(path, post any) bool {
 		s.postsList[i] = post.(*model.Post)
 		i++
 		return true
 	})
 	sort.Sort(sort.Reverse(s.postsList))
 
-	s.tagsList.Range(func(tag, tagSlice interface{}) bool {
+	s.tagsList.Range(func(tag, tagSlice any) bool {
 		sort.Sort(sort.Reverse(tagSlice.(postSlice)))
 		return true
 	})

pkg/storage/storage_memory_test.go

@@ -140,7 +140,7 @@ func TestMemoryStorage_ListTag_ErrorNotFound(t *testing.T) {
 
 	loadTestPosts(t, storage)
 
-	tag := getRandomHash(10)
+	tag := getRandomHash(t, 10)
 	_, err = storage.ListTag(tag, 0)
 	require.Error(t, err)
 	assert.Equal(t, ErrorNotFound, err)

pkg/storage/storage_test.go

@@ -8,11 +8,14 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestNewStorage(t *testing.T) {
 	hasher := md5.New()
-	hasher.Write([]byte(time.Now().Format(time.RFC3339Nano)))
+	_, err := hasher.Write([]byte(time.Now().Format(time.RFC3339Nano)))
+	require.NoError(t, err)
+
 	dbFilePath := fmt.Sprintf("/tmp/rklotz-test.%s.db", hex.EncodeToString(hasher.Sum(nil))[:5])
 
 	boltDBStorage, err := NewStorage("boltdb://"+dbFilePath, 10)