Minor improvements and bugfixes (#90)

Author: lucasdillmann

api/go.mod

@@ -4,7 +4,7 @@ go 1.25.6
 
 require (
 	github.com/gin-gonic/gin v1.11.0
-	github.com/golang-jwt/jwt/v5 v5.3.0
+	github.com/golang-jwt/jwt/v5 v5.3.1
 	github.com/google/uuid v1.6.0
 	github.com/stretchr/testify v1.11.1
 	go.uber.org/mock v0.6.0
@@ -17,7 +17,7 @@ require (
 	github.com/bytedance/sonic/loader v0.5.0 // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
 	github.com/gin-contrib/sse v1.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect

api/host/logs_handler.go

@@ -22,7 +22,7 @@ const (
 )
 
 var (
-	lineCountRange    = valuerange.New(1, 10_000)
+	lineCountRange    = valuerange.New(1, 99_999)
 	allowedQualifiers = map[string]bool{
 		"access": true,
 		"error":  true,

certificate/letsencrypt/go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/go-acme/lego/v4 v4.31.0
 	github.com/google/uuid v1.6.0
 	github.com/json-iterator/go v1.1.13-0.20220915233716-71ac16282d12
-	github.com/nrdcg/oci-go-sdk/common/v1065 v1065.106.1
+	github.com/nrdcg/oci-go-sdk/common/v1065 v1065.107.0
 	go.uber.org/mock v0.6.0
 )
 
@@ -31,7 +31,7 @@ require (
 	github.com/alibabacloud-go/debug v1.0.1 // indirect
 	github.com/alibabacloud-go/tea v1.4.0 // indirect
 	github.com/alibabacloud-go/tea-utils/v2 v2.0.9 // indirect
-	github.com/aliyun/credentials-go v1.4.10 // indirect
+	github.com/aliyun/credentials-go v1.4.11 // indirect
 	github.com/aws/aws-sdk-go-v2/config v1.32.7 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect
@@ -46,7 +46,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 // indirect
 	github.com/aws/smithy-go v1.24.0 // indirect
 	github.com/aziontech/azionapi-go-sdk v0.144.0 // indirect
-	github.com/baidubce/bce-sdk-go v0.9.258 // indirect
+	github.com/baidubce/bce-sdk-go v0.9.259 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/boombuler/barcode v1.1.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -59,13 +59,13 @@ require (
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.13 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-acme/alidns-20150109/v4 v4.7.0 // indirect
-	github.com/go-acme/esa-20240910/v2 v2.46.1 // indirect
+	github.com/go-acme/esa-20240910/v2 v2.47.0 // indirect
 	github.com/go-acme/jdcloud-sdk-go v1.64.0 // indirect
-	github.com/go-acme/tencentclouddnspod v1.1.25 // indirect
-	github.com/go-acme/tencentedgdeone v1.1.48 // indirect
+	github.com/go-acme/tencentclouddnspod v1.3.24 // indirect
+	github.com/go-acme/tencentedgdeone v1.3.38 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
 	github.com/go-jose/go-jose/v4 v4.1.3 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
@@ -80,7 +80,7 @@ require (
 	github.com/gofrs/flock v0.13.0 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/go-querystring v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20251213031049-b05bdaca462f // indirect
@@ -90,7 +90,7 @@ require (
 	github.com/gophercloud/gophercloud v1.14.1 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
-	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.185 // indirect
+	github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.186 // indirect
 	github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df // indirect
 	github.com/infobloxopen/infoblox-go-client/v2 v2.11.0 // indirect
 	github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 // indirect
@@ -120,7 +120,7 @@ require (
 	github.com/nrdcg/mailinabox v0.3.0 // indirect
 	github.com/nrdcg/namesilo v0.5.0 // indirect
 	github.com/nrdcg/nodion v0.1.0 // indirect
-	github.com/nrdcg/oci-go-sdk/dns/v1065 v1065.106.1 // indirect
+	github.com/nrdcg/oci-go-sdk/dns/v1065 v1065.107.0 // indirect
 	github.com/nrdcg/porkbun v0.4.0 // indirect
 	github.com/nrdcg/vegadns v0.3.0 // indirect
 	github.com/nzdjb/go-metaname v1.0.0 // indirect
@@ -135,9 +135,9 @@ require (
 	github.com/regfish/regfish-dnsapi-go v0.1.1 // indirect
 	github.com/sacloud/api-client-go v0.3.5 // indirect
 	github.com/sacloud/go-http v0.1.9 // indirect
-	github.com/sacloud/iaas-api-go v1.24.2 // indirect
+	github.com/sacloud/iaas-api-go v1.25.0 // indirect
 	github.com/sacloud/packages-go v0.0.12 // indirect
-	github.com/sacloud/saclient-go v0.2.7 // indirect
+	github.com/sacloud/saclient-go v0.3.0 // indirect
 	github.com/sagikazarmark/locafero v0.12.0 // indirect
 	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.36 // indirect
 	github.com/selectel/domains-go v1.1.0 // indirect
@@ -155,18 +155,18 @@ require (
 	github.com/stretchr/objx v0.5.3 // indirect
 	github.com/stretchr/testify v1.11.1 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.37 // indirect
+	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.42 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
 	github.com/transip/gotransip/v6 v6.26.1 // indirect
 	github.com/ultradns/ultradns-go-sdk v1.8.1-20250722213956-faef419 // indirect
 	github.com/vinyldns/go-vinyldns v0.9.17 // indirect
 	github.com/volcengine/volc-sdk-golang v1.0.235 // indirect
 	github.com/vultr/govultr/v3 v3.26.1 // indirect
-	github.com/yandex-cloud/go-genproto v0.46.0 // indirect
-	github.com/yandex-cloud/go-sdk/services/dns v0.0.28 // indirect
-	github.com/yandex-cloud/go-sdk/v2 v2.43.0 // indirect
+	github.com/yandex-cloud/go-genproto v0.50.0 // indirect
+	github.com/yandex-cloud/go-sdk/services/dns v0.0.32 // indirect
+	github.com/yandex-cloud/go-sdk/v2 v2.49.0 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
-	go.mongodb.org/mongo-driver v1.17.7 // indirect
+	go.mongodb.org/mongo-driver v1.17.8 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
 	go.opentelemetry.io/otel v1.39.0 // indirect
@@ -185,9 +185,9 @@ require (
 	golang.org/x/text v0.33.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
 	golang.org/x/tools v0.41.0 // indirect
-	google.golang.org/api v0.262.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20260122232226-8e98ce8d340d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260122232226-8e98ce8d340d // indirect
+	google.golang.org/api v0.264.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
 	google.golang.org/grpc v1.78.0 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/ini.v1 v1.67.1 // indirect

core/nginx/log_reader.go

@@ -20,11 +20,7 @@ func newLogReader(configProvider *configuration.Configuration) *logReader {
 	}
 }
 
-func (r *logReader) read(
-	_ context.Context,
-	fileName string,
-	tailSize int,
-) ([]logline.LogLine, error) {
+func (r *logReader) read(_ context.Context, fileName string) ([]logline.LogLine, error) {
 	basePath, err := r.configProvider.Get("nginx-ignition.nginx.config-path")
 	if err != nil {
 		return nil, err
@@ -49,17 +45,5 @@ func (r *logReader) read(
 		})
 	}
 
-	if err = scanner.Err(); err != nil {
-		return nil, err
-	}
-
-	if len(lines) > tailSize {
-		lines = lines[len(lines)-tailSize:]
-	}
-
-	for i := 0; i < len(lines)/2; i++ {
-		lines[i], lines[len(lines)-1-i] = lines[len(lines)-1-i], lines[i]
-	}
-
-	return lines, nil
+	return lines, scanner.Err()
 }

core/nginx/log_reader_test.go

@@ -25,22 +25,13 @@ func Test_logReader(t *testing.T) {
 	reader := newLogReader(cfg)
 
 	t.Run("read", func(t *testing.T) {
-		t.Run("reads and reverses lines correctly", func(t *testing.T) {
-			lines, err := reader.read(t.Context(), "test.log", 10)
+		t.Run("reads lines correctly", func(t *testing.T) {
+			lines, err := reader.read(t.Context(), "test.log")
 			assert.NoError(t, err)
 			assert.Equal(t, []logline.LogLine{
-				{LineNumber: 2, Contents: "line3"},
-				{LineNumber: 1, Contents: "line2"},
 				{LineNumber: 0, Contents: "line1"},
-			}, lines)
-		})
-
-		t.Run("tails and reverses lines correctly", func(t *testing.T) {
-			lines, err := reader.read(t.Context(), "test.log", 2)
-			assert.NoError(t, err)
-			assert.Equal(t, []logline.LogLine{
-				{LineNumber: 2, Contents: "line3"},
 				{LineNumber: 1, Contents: "line2"},
+				{LineNumber: 2, Contents: "line3"},
 			}, lines)
 		})
 	})

core/nginx/service.go

@@ -137,25 +137,40 @@ func (s *service) GetHostLogs(
 	lines int,
 	search *LogSearch,
 ) ([]logline.LogLine, error) {
-	logLines, err := s.logReader.read(ctx, "host-"+hostID.String()+"."+qualifier+".log", lines)
-	if err != nil || search == nil {
-		return logLines, err
-	}
-
-	return logline.Search(logLines, search.Query, search.SurroundingLines)
+	return s.readLogs(ctx, lines, "host-"+hostID.String()+"."+qualifier+".log", search)
 }
 
 func (s *service) GetMainLogs(
 	ctx context.Context,
 	lines int,
 	search *LogSearch,
 ) ([]logline.LogLine, error) {
-	logLines, err := s.logReader.read(ctx, "main.log", lines)
-	if err != nil || search == nil {
-		return logLines, err
+	return s.readLogs(ctx, lines, "main.log", search)
+}
+
+func (s *service) readLogs(
+	ctx context.Context,
+	lines int,
+	fileName string,
+	search *LogSearch,
+) ([]logline.LogLine, error) {
+	output, err := s.logReader.read(ctx, fileName)
+	if err != nil {
+		return nil, err
+	}
+
+	if search != nil {
+		output, err = logline.Search(output, search.Query, search.SurroundingLines)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if len(output) > lines {
+		output = output[len(output)-lines:]
 	}
 
-	return logline.Search(logLines, search.Query, search.SurroundingLines)
+	return output, nil
 }
 
 func (s *service) rotateLogs(ctx context.Context) error {

core/nginx/service_test.go

@@ -37,12 +37,12 @@ func Test_service(t *testing.T) {
 			logReader: newLogReader(cfg),
 		}
 
-		t.Run("returns requested number of lines in reverse order", func(t *testing.T) {
+		t.Run("returns requested number of lines", func(t *testing.T) {
 			lines, err := nginxService.GetMainLogs(t.Context(), 2, nil)
 			assert.NoError(t, err)
 			assert.Equal(t, []logline.LogLine{
-				{LineNumber: 2, Contents: "line3"},
 				{LineNumber: 1, Contents: "line2"},
+				{LineNumber: 2, Contents: "line3"},
 			}, lines)
 		})
 	})

core/settings/validator.go

@@ -19,7 +19,7 @@ const (
 var (
 	timeoutRange           = valuerange.New(1, int(^uint(0)>>1))
 	intervalRange          = valuerange.New(1, int(^uint(0)>>1))
-	logLinesRange          = valuerange.New(0, 10000)
+	logLinesRange          = valuerange.New(0, 99_999)
 	workerProcessesRange   = valuerange.New(1, 100)
 	workerConnectionsRange = valuerange.New(32, 4096)
 	maximumBodySizeRange   = valuerange.New(1, int(^uint(0)>>1))

core/settings/validator_test.go

@@ -208,7 +208,7 @@ func Test_validator(t *testing.T) {
 
 		t.Run("log rotation maximum lines above range fails", func(t *testing.T) {
 			s := newSettings()
-			s.LogRotation.MaximumLines = 10001
+			s.LogRotation.MaximumLines = 100000
 			settingsValidator := newValidator(bindingCommands)
 
 			err := settingsValidator.validate(t.Context(), s)

database/go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/JCoupalK/go-pgdump v1.1.1-0.20251117080142-ba155b05e5d3
 	github.com/golang-migrate/migrate/v4 v4.19.1
 	github.com/google/uuid v1.6.0
-	github.com/lib/pq v1.10.9
+	github.com/lib/pq v1.11.1
 	github.com/stretchr/testify v1.11.1
 	github.com/uptrace/bun v1.2.16
 	github.com/uptrace/bun/dialect/pgdialect v1.2.16
@@ -41,7 +41,7 @@ require (
 	golang.org/x/sys v0.40.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.67.6 // indirect
+	modernc.org/libc v1.67.7 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
 )