chore(deps): update golangci/golangci-lint docker tag to v2 #87

Merged
renovate merged 4 commits from renovate/golangci-golangci-lint-2.x into main 2025-04-18 16:13:23 +02:00
7 changed files with 38 additions and 31 deletions
Showing only changes of commit 4060ec09c4 - Show all commits

View file

@ -378,7 +378,7 @@ linters:
# - "default": report only the default slog logger # - "default": report only the default slog logger
# https://github.com/go-simpler/sloglint?tab=readme-ov-file#no-global # https://github.com/go-simpler/sloglint?tab=readme-ov-file#no-global
# Default: "" # Default: ""
no-global: all no-global: ""
# Enforce using methods that accept a context. # Enforce using methods that accept a context.
# Values: # Values:
# - "": disabled # - "": disabled

View file

@ -1,7 +1,6 @@
package apiv1 package apiv1
import ( import (
"log"
"net/http" "net/http"
"github.com/go-chi/render" "github.com/go-chi/render"
@ -34,6 +33,6 @@ func errRender(err error) render.Renderer {
func renderResponse(w http.ResponseWriter, r *http.Request, v render.Renderer) { func renderResponse(w http.ResponseWriter, r *http.Request, v render.Renderer) {
if err := render.Render(w, r, v); err != nil { if err := render.Render(w, r, v); err != nil {
log.Fatal(err) panic(err)
} }
} }

View file

@ -40,7 +40,10 @@ func (c *Context) Download() error {
} }
return err return err
} }
defer resp.Close() if err = resp.Close(); err != nil {
return err
}
if resp.StatusCode == http.StatusNotFound { if resp.StatusCode == http.StatusNotFound {
return ErrInvalidURL return ErrInvalidURL
} }
@ -50,19 +53,19 @@ func (c *Context) Download() error {
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
return errors.New(resp.RawResponse.Status) return errors.New(resp.RawResponse.Status)
} }
resp.Close()
resp, err = req.Get(c.Link, nil) resp, err = req.Get(c.Link, nil)
if err != nil { if err != nil {
return err return err
} }
defer resp.Close()
var filesize int64 var filesize int64
if resp.RawResponse.ContentLength > -1 { if resp.RawResponse.ContentLength > -1 {
filesize = resp.RawResponse.ContentLength filesize = resp.RawResponse.ContentLength
} }
destFile, err := os.OpenFile(c.Filename, os.O_CREATE|os.O_WRONLY, 0644) destFile, err := os.OpenFile(c.Filename, os.O_CREATE|os.O_WRONLY, 0600)
if err != nil { if err != nil {
return err return err
} }

View file

@ -58,7 +58,10 @@ func TestDownload(t *testing.T) {
t.Run("CertificateError", func(t *testing.T) { t.Run("CertificateError", func(t *testing.T) {
// This test assumes a self-signed certificate or similar issue. This is hard to simulate in a unit test. // This test assumes a self-signed certificate or similar issue. This is hard to simulate in a unit test.
ctx := downloader.NewContext("test_cert_error.txt", "https://self-signed.badssl.com/") // Example URL that can be used ctx := downloader.NewContext(
"test_cert_error.txt",
"https://self-signed.badssl.com/", // Example URL that can be used
)
if err := ctx.Download(); err == nil || err.Error() != "certificate from unknown authority" { if err := ctx.Download(); err == nil || err.Error() != "certificate from unknown authority" {
t.Errorf("expected certificate from unknown authority error, got %v", err) t.Errorf("expected certificate from unknown authority error, got %v", err)

View file

@ -1,7 +1,7 @@
package exporter package exporter
import ( import (
"log" "log/slog"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
) )
@ -95,7 +95,7 @@ func (m *Metrics) collectCurrentlyCachedMetric() {
func (m *Metrics) collectDatabaseTimestampMetric() { func (m *Metrics) collectDatabaseTimestampMetric() {
timestamp, err := m.exporter.database.Timestamp() timestamp, err := m.exporter.database.Timestamp()
if err != nil { if err != nil {
log.Printf("failed to read file timestamp: %v", err) slog.Warn("failed to read file timestamp", "error", err)
return return
} }

30
main.go
View file

@ -1,7 +1,7 @@
package main package main
import ( import (
"log" "log/slog"
"net/http" "net/http"
"os" "os"
"os/signal" "os/signal"
@ -24,7 +24,7 @@ func main() {
cli := cmd.CLI{} cli := cmd.CLI{}
config, err := cli.Parse() config, err := cli.Parse()
if err != nil { if err != nil {
log.Fatal(err) panic(err)
} }
handleGracefulShutdown() handleGracefulShutdown()
@ -38,15 +38,16 @@ func main() {
ctx := downloader.NewContext(config.DataFile, config.DataURL) ctx := downloader.NewContext(config.DataFile, config.DataURL)
if !ctx.FileExists() { if !ctx.FileExists() {
if downloadErr := ctx.Download(); downloadErr != nil { if downloadErr := ctx.Download(); downloadErr != nil {
log.Fatal(downloadErr) panic(err)
} }
log.Printf("saved file to %s\n", ctx.Filename) slog.Info("saved file", "path", ctx.Filename)
} }
cache := cache.NewCache(config.CacheTTL) cache := cache.NewCache(config.CacheTTL)
db, err := database.NewDatabase(config) db, err := database.NewDatabase(config)
if err != nil { if err != nil {
log.Fatal("database creation failed", err) slog.Error("database creation failed")
panic(err)
} }
if config.EnableExporter { if config.EnableExporter {
@ -66,23 +67,24 @@ func main() {
} }
} }
}() }()
log.Println("prometheus exporter refreshes metric data every", config.ExporterInterval) slog.Info("prometheus exporter refreshes metric data", "interval", config.ExporterInterval)
go func() { go func() {
err = exporter.Start() err = exporter.Start()
if err != nil { if err != nil {
log.Panic(err) panic(err)
} }
}() }()
log.Println("prometheus exporter started at", config.ExporterAddress) slog.Info("prometheus exporter started", "address", config.ExporterAddress)
} }
log.Println("importing data from file", config.DataFile) slog.Info("importing data from file", "path", config.DataFile)
err = csvimporter.ImportCSV(config.DataFile, db) err = csvimporter.ImportCSV(config.DataFile, db)
if err != nil { if err != nil {
log.Fatal("data Import from file failed", err) slog.Error("data import from file failed")
panic(err)
} }
log.Println("imported data from file successful") slog.Info("imported data from file successfully")
lh := apiv1.NewLocationHandler(cache, db) lh := apiv1.NewLocationHandler(cache, db)
r.Mount("/api/v1", apiv1.NewRouter(lh)) r.Mount("/api/v1", apiv1.NewRouter(lh))
@ -93,9 +95,9 @@ func main() {
ReadHeaderTimeout: config.ReadHeaderTimeout, ReadHeaderTimeout: config.ReadHeaderTimeout,
} }
log.Println("starting server at", server.Addr) slog.Info("starting server", "address", server.Addr)
if err = server.ListenAndServe(); err != nil { if err = server.ListenAndServe(); err != nil {
log.Panic(err) panic(err)
} }
} }
@ -106,7 +108,7 @@ func handleGracefulShutdown() {
go func() { go func() {
sig := <-signals sig := <-signals
log.Printf("caught signal: %+v", sig) slog.Info("caught signal", "signal", sig)
os.Exit(0) os.Exit(0)
}() }()
} }