Skip to content

A continuation of HomeBox the inventory and organization system built for the Home User

fix: go backend linting

Matthew Kilgore99bd77386bdc
diff --git a/backend/app/api/handlers/v1/v1_ctrl_actions.go b/backend/app/api/handlers/v1/v1_ctrl_actions.go
index 9098637c..e58f1479 100644
--- a/backend/app/api/handlers/v1/v1_ctrl_actions.go
+++ b/backend/app/api/handlers/v1/v1_ctrl_actions.go
@@ -99,7 +99,7 @@ func (ctrl *V1Controller) HandleCreateMissingThumbnails() errchain.HandlerFunc {
// WipeInventoryOptions represents the options for wiping inventory
type WipeInventoryOptions struct {
- WipeTags bool `json:"wipeTags"`
+ WipeTags bool `json:"wipeTags"`
WipeLocations bool `json:"wipeLocations"`
WipeMaintenance bool `json:"wipeMaintenance"`
}
@@ -132,7 +132,7 @@ func (ctrl *V1Controller) HandleWipeInventory() errchain.HandlerFunc {
if err := server.Decode(r, &options); err != nil {
// If no body provided, use default (false for all)
options = WipeInventoryOptions{
- WipeTags: false,
+ WipeTags: false,
WipeLocations: false,
WipeMaintenance: false,
}
diff --git a/backend/internal/core/services/reporting/import.go b/backend/internal/core/services/reporting/import.go
index 9e5ca6e2..d25b15e7 100644
--- a/backend/internal/core/services/reporting/import.go
+++ b/backend/internal/core/services/reporting/import.go
@@ -51,7 +51,7 @@ func readRawCsv(r io.Reader) ([][]string, error) {
// We read up to 4KB which should be more than enough for any header row
firstLineBuffer := make([]byte, separatorDetectionBufferSize)
n, err := io.ReadFull(r, firstLineBuffer)
- if err != nil && err != io.ErrUnexpectedEOF && err != io.EOF {
+ if err != nil && !errors.Is(err, io.ErrUnexpectedEOF) && !errors.Is(err, io.EOF) {
return nil, err
}
firstLineBuffer = firstLineBuffer[:n]
diff --git a/backend/internal/data/repo/repo_group.go b/backend/internal/data/repo/repo_group.go
index 4a1ff642..ab8ad60c 100644
--- a/backend/internal/data/repo/repo_group.go
+++ b/backend/internal/data/repo/repo_group.go
@@ -13,9 +13,9 @@ import (
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/group"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/groupinvitationtoken"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/item"
- "github.com/sysadminsmedia/homebox/backend/internal/data/ent/tag"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/location"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/notifier"
+ "github.com/sysadminsmedia/homebox/backend/internal/data/ent/tag"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/user"
)
@@ -84,7 +84,7 @@ type (
TotalUsers int `json:"totalUsers"`
TotalItems int `json:"totalItems"`
TotalLocations int `json:"totalLocations"`
- TotalTags int `json:"totalTags"`
+ TotalTags int `json:"totalTags"`
TotalItemPrice float64 `json:"totalItemPrice"`
TotalWithWarranty int `json:"totalWithWarranty"`
}
diff --git a/backend/internal/data/repo/repo_item_attachments.go b/backend/internal/data/repo/repo_item_attachments.go
index 3ca5f72b..b8dd6466 100644
--- a/backend/internal/data/repo/repo_item_attachments.go
+++ b/backend/internal/data/repo/repo_item_attachments.go
@@ -757,20 +757,20 @@ func (r *AttachmentRepo) UploadFile(ctx context.Context, itemGroup *ent.Group, d
// Use a buffer to store content for blake3 key derivation and storage
// While buffering, we compute MD5 and blake3 hashes in parallel for efficiency
buf := new(bytes.Buffer)
-
+
// Create hash writers
blake3Hasher := blake3.New()
md5Hasher := md5.New()
-
+
// Use MultiWriter to write to buffer and both hashers simultaneously
multiWriter := io.MultiWriter(buf, blake3Hasher, md5Hasher)
-
+
_, err := io.Copy(multiWriter, doc.Content)
if err != nil {
log.Err(err).Msg("failed to read file content")
return UploadResult{}, err
}
-
+
// Now the buffer contains all the data, and streaming hashes are computed
contentBytes := buf.Bytes()
@@ -790,7 +790,7 @@ func (r *AttachmentRepo) UploadFile(ctx context.Context, itemGroup *ent.Group, d
log.Err(err).Msg("failed to close bucket")
}
}(bucket)
-
+
contentType := http.DetectContentType(contentBytes[:min(512, len(contentBytes))])
options := &blob.WriterOptions{
ContentType: contentType,
diff --git a/backend/internal/data/repo/repo_item_templates.go b/backend/internal/data/repo/repo_item_templates.go
index 6eae7ca8..18a4250d 100644
--- a/backend/internal/data/repo/repo_item_templates.go
+++ b/backend/internal/data/repo/repo_item_templates.go
@@ -54,7 +54,7 @@ type (
// Default location and tags
DefaultLocationID uuid.UUID `json:"defaultLocationId,omitempty" extensions:"x-nullable"`
- DefaultTagIDs *[]uuid.UUID `json:"defaultTagIds,omitempty" extensions:"x-nullable"`
+ DefaultTagIDs *[]uuid.UUID `json:"defaultTagIds,omitempty" extensions:"x-nullable"`
// Metadata flags
IncludeWarrantyFields bool `json:"includeWarrantyFields"`
@@ -83,7 +83,7 @@ type (
// Default location and tags
DefaultLocationID uuid.UUID `json:"defaultLocationId,omitempty" extensions:"x-nullable"`
- DefaultTagIDs *[]uuid.UUID `json:"defaultTagIds,omitempty" extensions:"x-nullable"`
+ DefaultTagIDs *[]uuid.UUID `json:"defaultTagIds,omitempty" extensions:"x-nullable"`
// Metadata flags
IncludeWarrantyFields bool `json:"includeWarrantyFields"`
@@ -122,7 +122,7 @@ type (
// Default location and tags
DefaultLocation *TemplateLocationSummary `json:"defaultLocation"`
- DefaultTags []TemplateTagSummary `json:"defaultTags"`
+ DefaultTags []TemplateTagSummary `json:"defaultTags"`
// Metadata flags
IncludeWarrantyFields bool `json:"includeWarrantyFields"`
diff --git a/backend/internal/data/repo/repo_items.go b/backend/internal/data/repo/repo_items.go
index dc529ffd..d283bf6e 100644
--- a/backend/internal/data/repo/repo_items.go
+++ b/backend/internal/data/repo/repo_items.go
@@ -13,10 +13,10 @@ import (
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/group"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/item"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/itemfield"
- "github.com/sysadminsmedia/homebox/backend/internal/data/ent/tag"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/location"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/maintenanceentry"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/predicate"
+ "github.com/sysadminsmedia/homebox/backend/internal/data/ent/tag"
"github.com/sysadminsmedia/homebox/backend/internal/data/types"
)
@@ -125,7 +125,7 @@ type (
Quantity *int `json:"quantity,omitempty" extensions:"x-nullable,x-omitempty"`
ImportRef *string `json:"-,omitempty" extensions:"x-nullable,x-omitempty"`
LocationID uuid.UUID `json:"locationId" extensions:"x-nullable,x-omitempty"`
- TagIDs []uuid.UUID `json:"tagIds" extensions:"x-nullable,x-omitempty"`
+ TagIDs []uuid.UUID `json:"tagIds" extensions:"x-nullable,x-omitempty"`
}
ItemSummary struct {
diff --git a/backend/internal/data/repo/repo_items_test.go b/backend/internal/data/repo/repo_items_test.go
index a371938d..3c12c67a 100644
--- a/backend/internal/data/repo/repo_items_test.go
+++ b/backend/internal/data/repo/repo_items_test.go
@@ -550,4 +550,3 @@ func TestItemsRepository_WipeInventory_OnlyItems(t *testing.T) {
_ = tRepos.Tags.DeleteByGroup(context.Background(), tGroup.ID, tag.ID)
_ = tRepos.Locations.delete(context.Background(), loc.ID)
}
-
diff --git a/backend/internal/data/repo/repo_labels.go b/backend/internal/data/repo/repo_labels.go
index 43d19a30..450110cc 100644
--- a/backend/internal/data/repo/repo_labels.go
+++ b/backend/internal/data/repo/repo_labels.go
@@ -8,8 +8,8 @@ import (
"github.com/sysadminsmedia/homebox/backend/internal/core/services/reporting/eventbus"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/group"
- "github.com/sysadminsmedia/homebox/backend/internal/data/ent/tag"
"github.com/sysadminsmedia/homebox/backend/internal/data/ent/predicate"
+ "github.com/sysadminsmedia/homebox/backend/internal/data/ent/tag"
)
type TagRepository struct {
diff --git a/backend/internal/data/repo/repo_wipe_integration_test.go b/backend/internal/data/repo/repo_wipe_integration_test.go
index 3db4e42f..8498d9a5 100644
--- a/backend/internal/data/repo/repo_wipe_integration_test.go
+++ b/backend/internal/data/repo/repo_wipe_integration_test.go
@@ -46,7 +46,7 @@ func TestWipeInventory_Integration(t *testing.T) {
Name: "Test Laptop",
Description: "Work laptop",
LocationID: loc1.ID,
- TagIDs: []uuid.UUID{tag1.ID},
+ TagIDs: []uuid.UUID{tag1.ID},
})
require.NoError(t, err)
@@ -54,7 +54,7 @@ func TestWipeInventory_Integration(t *testing.T) {
Name: "Test Drill",
Description: "Power drill",
LocationID: loc2.ID,
- TagIDs: []uuid.UUID{tag2.ID},
+ TagIDs: []uuid.UUID{tag2.ID},
})
require.NoError(t, err)
@@ -62,7 +62,7 @@ func TestWipeInventory_Integration(t *testing.T) {
Name: "Test Monitor",
Description: "Computer monitor",
LocationID: loc1.ID,
- TagIDs: []uuid.UUID{tag1.ID},
+ TagIDs: []uuid.UUID{tag1.ID},
})
require.NoError(t, err)
@@ -153,7 +153,7 @@ func TestWipeInventory_SelectiveWipe(t *testing.T) {
Name: "Test Computer",
Description: "Desktop computer",
LocationID: loc.ID,
- TagIDs: []uuid.UUID{tag.ID},
+ TagIDs: []uuid.UUID{tag.ID},
})
require.NoError(t, err)
diff --git a/backend/internal/sys/otel/otel.go b/backend/internal/sys/otel/otel.go
index 85f7f5d2..1b9350fc 100644
--- a/backend/internal/sys/otel/otel.go
+++ b/backend/internal/sys/otel/otel.go
@@ -100,11 +100,12 @@ func NewProvider(ctx context.Context, cfg *config.OTelConfig, buildVersion strin
// Configure sampler
var sampler sdktrace.Sampler
- if cfg.SampleRate >= 1.0 {
+ switch {
+ case cfg.SampleRate >= 1.0:
sampler = sdktrace.AlwaysSample()
- } else if cfg.SampleRate <= 0 {
+ case cfg.SampleRate <= 0:
sampler = sdktrace.NeverSample()
- } else {
+ default:
sampler = sdktrace.TraceIDRatioBased(cfg.SampleRate)
}
diff --git a/backend/internal/sys/otel/proxy.go b/backend/internal/sys/otel/proxy.go
index 969f80b9..f78a666c 100644
--- a/backend/internal/sys/otel/proxy.go
+++ b/backend/internal/sys/otel/proxy.go
@@ -75,7 +75,12 @@ func (p *Provider) ProxyHandler() http.HandlerFunc {
http.Error(w, "Failed to read request body", http.StatusBadRequest)
return
}
- defer r.Body.Close()
+ defer func(Body io.ReadCloser) {
+ err := Body.Close()
+ if err != nil {
+ log.Error().Err(err).Msg("failed to close telemetry payload body")
+ }
+ }(r.Body)
var payload TelemetryPayload
if err := json.Unmarshal(body, &payload); err != nil {