Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a bunch of not-checking-error lints

Browse source
This commit is contained in:
Eli Ribble 2026-05-04 20:29:02 +00:00
parent 114aec73ed
commit 5f3fcc2b3e
No known key found for this signature in database
14 changed files with 124 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

96
api/api.go
View file

@ -12,6 +12,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/config"
"github.com/Gleipnir-Technology/nidus-sync/db"
nhttp "github.com/Gleipnir-Technology/nidus-sync/http"
"github.com/Gleipnir-Technology/nidus-sync/lint"
"github.com/Gleipnir-Technology/nidus-sync/platform"
"github.com/Gleipnir-Technology/nidus-sync/platform/types"
"github.com/Gleipnir-Technology/nidus-sync/resource"
@ -68,7 +69,10 @@ func handleClientIos(w http.ResponseWriter, r *http.Request, u platform.User) {
var sinceStr string
err := r.ParseForm()
if err != nil {
renderShim(w, r, errRender(fmt.Errorf("Failed to parse GET form: %w", err)))
err = renderShim(w, r, errRender(fmt.Errorf("Failed to parse GET form: %w", err)))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
return
} else {
sinceStr = r.FormValue("since")
@ -80,14 +84,20 @@ func handleClientIos(w http.ResponseWriter, r *http.Request, u platform.User) {
} else {
since, err = parseTime(sinceStr)
if err != nil {
renderShim(w, r, errRender(fmt.Errorf("Failed to parse 'since' value: %w", err)))
err = renderShim(w, r, errRender(fmt.Errorf("Failed to parse 'since' value: %w", err)))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
return
}
}
csync, err := platform.ContentClientIos(r.Context(), u, since)
if err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
return
}
@ -102,7 +112,10 @@ func handleClientIos(w http.ResponseWriter, r *http.Request, u platform.User) {
Since: since_used,
}
if err := renderShim(w, r, response); err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
return
}
}
@ -110,7 +123,10 @@ func handleClientIos(w http.ResponseWriter, r *http.Request, u platform.User) {
func apiMosquitoSource(w http.ResponseWriter, r *http.Request, u platform.User) {
bounds, err := parseBounds(r)
if err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
return
}
@ -119,7 +135,10 @@ func apiMosquitoSource(w http.ResponseWriter, r *http.Request, u platform.User)
query.Limit = 100
sources, err := platform.MosquitoSourceQuery()
if err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
return
}
@ -128,14 +147,20 @@ func apiMosquitoSource(w http.ResponseWriter, r *http.Request, u platform.User)
data = append(data, NewResponseMosquitoSource(s))
}
if err := renderList(w, r, data); err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
}
}
func apiTrapData(w http.ResponseWriter, r *http.Request, u platform.User) {
bounds, err := parseBounds(r)
if err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
return
}
@ -144,7 +169,10 @@ func apiTrapData(w http.ResponseWriter, r *http.Request, u platform.User) {
query.Limit = 100
trap_data, err := platform.TrapDataQuery()
if err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
return
}
@ -153,14 +181,20 @@ func apiTrapData(w http.ResponseWriter, r *http.Request, u platform.User) {
data = append(data, NewResponseTrapDatum(td))
}
if err := renderList(w, r, data); err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
}
}
func apiServiceRequest(w http.ResponseWriter, r *http.Request, u platform.User) {
bounds, err := parseBounds(r)
if err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
return
}
query := db.NewGeoQuery()
@ -168,7 +202,10 @@ func apiServiceRequest(w http.ResponseWriter, r *http.Request, u platform.User)
query.Limit = 100
requests, err := platform.ServiceRequestQuery()
if err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
return
}
@ -177,7 +214,10 @@ func apiServiceRequest(w http.ResponseWriter, r *http.Request, u platform.User)
data = append(data, types.ServiceRequestFromModel(sr))
}
if err := renderList(w, r, data); err != nil {
renderShim(w, r, errRender(err))
err = renderShim(w, r, errRender(err))
if err != nil {
http.Error(w, fmt.Sprintf("render shim: %v", err), http.StatusInternalServerError)
}
}
}
@ -226,7 +266,7 @@ func webhookFieldseeker(w http.ResponseWriter, r *http.Request) {
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
return
}
defer file.Close()
defer lint.LogOnErr(file.Close, "close request log")
// Write timestamp
timestamp := time.Now().Format("2006-01-02 15:04:05")
@ -238,10 +278,20 @@ func webhookFieldseeker(w http.ResponseWriter, r *http.Request) {
}
// Write request line
fmt.Fprintf(file, "%s %s %s\n", r.Method, r.RequestURI, r.Proto)
_, err = fmt.Fprintf(file, "%s %s %s\n", r.Method, r.RequestURI, r.Proto)
if err != nil {
log.Error().Err(err).Msg("writing response")
http.Error(w, "Internal server error", http.StatusInternalServerError)
return
}
// Write all headers
fmt.Fprintf(file, "\nHeaders:\n")
_, err = fmt.Fprintf(file, "\nHeaders:\n")
if err != nil {
log.Error().Err(err).Msg("writing response")
http.Error(w, "Internal server error", http.StatusInternalServerError)
return
}
for name, values := range r.Header {
for _, value := range values {
fmt.Fprintf(file, "%s: %s\n", name, value)
@ -249,11 +299,21 @@ func webhookFieldseeker(w http.ResponseWriter, r *http.Request) {
}
// Write body
fmt.Fprintf(file, "\nBody:\n")
_, err = fmt.Fprintf(file, "\nBody:\n")
if err != nil {
log.Error().Err(err).Msg("writing response")
http.Error(w, "Internal server error", http.StatusInternalServerError)
return
}
body, err := io.ReadAll(r.Body)
if err != nil {
log.Printf("Error reading request body: %v", err)
fmt.Fprintf(file, "Error reading body: %v\n", err)
_, err = fmt.Fprintf(file, "Error reading body: %v\n", err)
if err != nil {
log.Error().Err(err).Msg("writing response")
http.Error(w, "Internal server error", http.StatusInternalServerError)
return
}
} else {
_, err = file.Write(body)
if err != nil {

18
api/handler.go
View file

@ -94,7 +94,11 @@ func authenticatedHandlerJSON[T any](f handlerFunctionGetAuthenticated[T]) http.
respondErrorStatus(w, nhttp.NewError("failed to marshal json: %w", err))
return
}
w.Write(body)
_, err = w.Write(body)
if err != nil {
respondErrorStatus(w, nhttp.NewError("failed to write json: %w", err))
return
}
})
}
@ -124,7 +128,11 @@ func authenticatedHandlerJSONSlice[T any](f handlerFunctionGetSliceAuthenticated
respondErrorStatus(w, nhttp.NewError("failed to marshal json: %w", err))
return
}
w.Write(body)
_, err = w.Write(body)
if err != nil {
respondErrorStatus(w, nhttp.NewError("failed to write json: %w", err))
return
}
})
}
func authenticatedHandlerJSONPost[RequestType any, ResponseType any](f handlerFunctionPostAuthenticated[RequestType, ResponseType]) http.Handler {
@ -146,7 +154,11 @@ func authenticatedHandlerJSONPost[RequestType any, ResponseType any](f handlerFu
respondErrorStatus(w, nhttp.NewError("failed to marshal json: %w", err))
return
}
w.Write(body)
_, err = w.Write(body)
if err != nil {
respondErrorStatus(w, nhttp.NewError("failed to write json: %w", err))
return
}
})
}

4
label-studio/tasks_draft.go
View file

@ -4,6 +4,8 @@ import (
"encoding/json"
"fmt"
"time"
"github.com/Gleipnir-Technology/nidus-sync/lint"
)
// DraftRequest represents the request body for creating a draft
@ -94,7 +96,7 @@ func (c *Client) CreateDraft(taskID int, draft *DraftRequest) (*Draft, error) {
if err != nil {
return nil, fmt.Errorf("failed to POST %s: %w", path, err)
}
defer resp.Body.Close()
defer lint.LogOnErr(resp.Body.Close, "close response body")
// Parse response
var createdDraft Draft

4
label-studio/tasks_update.go
View file

@ -3,6 +3,8 @@ package labelstudio
import (
"encoding/json"
"fmt"
"github.com/Gleipnir-Technology/nidus-sync/lint"
)
type TaskResultValue struct {
@ -171,7 +173,7 @@ func (c *Client) TaskUpdate(taskID int, update *TaskUpdate) (*Task, error) {
if err != nil {
return nil, fmt.Errorf("failed to PATCH %s: %w", path, err)
}
defer resp.Body.Close()
defer lint.LogOnErr(resp.Body.Close, "close response")
// Parse response
var updatedTask Task

4
label-studio/users.go
View file

@ -4,6 +4,8 @@ import (
"encoding/json"
"fmt"
"time"
"github.com/Gleipnir-Technology/nidus-sync/lint"
)
// User represents a user in Label Studio
@ -33,7 +35,7 @@ func (c *Client) ListUsers() ([]User, error) {
if err != nil {
return nil, fmt.Errorf("failed to GET /api/userls: %w", err)
}
defer resp.Body.Close()
defer lint.LogOnErr(resp.Body.Close, "close response")
// Parse response
var users []User

5
main.go
View file

@ -208,7 +208,10 @@ func main() {
platform.WaitForExit()
log.Info().Msg("Shutdown complete")
os.Stderr.Sync()
err = os.Stderr.Sync()
if err != nil {
panic("can't sync stderr")
}
}
func LoggerMiddleware(logger *zerolog.Logger) func(next http.Handler) http.Handler {
return func(next http.Handler) http.Handler {

2
platform/email/template.go
View file

@ -99,7 +99,7 @@ func LoadTemplates() error {
if err != nil {
return fmt.Errorf("Failed to load report-notification-confirmation template ID: %s", err)
}
tx.Commit(ctx)
lint.LogOnErrCtx(tx.Commit, ctx, "commit")
return nil
}

3
platform/file/base.go
View file

@ -7,6 +7,7 @@ import (
"os"
"github.com/Gleipnir-Technology/nidus-sync/config"
"github.com/Gleipnir-Technology/nidus-sync/lint"
"github.com/google/uuid"
//"github.com/rs/zerolog/log"
)
@ -93,7 +94,7 @@ func writeFileContent(w http.ResponseWriter, image_path string) {
}
return
}
defer file.Close()
defer lint.LogOnErr(file.Close, "close file")
// Get file info for Content-Length header
fileInfo, err := file.Stat()

3
platform/file/image.go
View file

@ -6,6 +6,7 @@ import (
"net/http"
"os"
"github.com/Gleipnir-Technology/nidus-sync/lint"
"github.com/google/uuid"
"github.com/rs/zerolog/log"
)
@ -18,7 +19,7 @@ func ImageFileFromReader(collection Collection, uid uuid.UUID, body io.Reader) e
if err != nil {
return fmt.Errorf("Failed to create image file %s: %w", filepath, err)
}
defer dst.Close()
defer lint.LogOnErr(dst.Close, "close dst file")
// Copy rest of request body to file
_, err = io.Copy(dst, body)

3
platform/file/mailer.go
View file

@ -5,6 +5,7 @@ import (
"io"
"os"
"github.com/Gleipnir-Technology/nidus-sync/lint"
"github.com/rs/zerolog/log"
)
@ -16,7 +17,7 @@ func MailerFromReader(public_id string, body io.Reader) error {
if err != nil {
return fmt.Errorf("Failed to create image file %s: %w", filepath, err)
}
defer dst.Close()
defer lint.LogOnErr(dst.Close, "close dst file")
// Copy rest of request body to file
_, err = io.Copy(dst, body)

3
platform/file/upload.go
View file

@ -7,6 +7,7 @@ import (
"mime/multipart"
"net/http"
"github.com/Gleipnir-Technology/nidus-sync/lint"
"github.com/google/uuid"
"github.com/rs/zerolog/log"
)
@ -50,7 +51,7 @@ func saveFileUpload(headers *multipart.FileHeader, collection Collection) (uploa
if err != nil {
return upload, fmt.Errorf("Failed to open header: %w", err)
}
defer file.Close()
defer lint.LogOnErr(file.Close, "close file")
file_bytes, err := io.ReadAll(file)
content_type := http.DetectContentType(file_bytes)

3
platform/file/userfile.go
View file

@ -7,6 +7,7 @@ import (
"os"
"github.com/Gleipnir-Technology/nidus-sync/config"
"github.com/Gleipnir-Technology/nidus-sync/lint"
"github.com/google/uuid"
"github.com/rs/zerolog/log"
)
@ -33,7 +34,7 @@ func FileContentWrite(body io.Reader, collection Collection, uid uuid.UUID) erro
log.Error().Err(err).Str("filepath", filepath).Msg("Failed to create upload file")
return fmt.Errorf("Failed to create upload file at %s: %v", filepath, err)
}
defer dst.Close()
defer lint.LogOnErr(dst.Close, "close dst file")
// Copy rest of request body to file
_, err = io.Copy(dst, body)

5
platform/mailer/mailer.go
View file

@ -9,6 +9,7 @@ import (
"github.com/Gleipnir-Technology/nidus-sync/config"
"github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/lint"
"github.com/Gleipnir-Technology/nidus-sync/lob"
"github.com/Gleipnir-Technology/nidus-sync/platform/file"
"github.com/Gleipnir-Technology/nidus-sync/platform/pdf"
@ -91,7 +92,7 @@ func ComplianceSend(ctx context.Context, row_id int32) error {
if err != nil {
return fmt.Errorf("start txn: %w", err)
}
defer txn.Rollback(ctx)
defer lint.LogOnErrRollback(txn.Rollback, ctx, "rollback")
mailer, err := models.CommsMailers.Insert(&models.CommsMailerSetter{
AddressID: omit.From(address.ID),
Created: omit.From(time.Now()),
@ -113,7 +114,7 @@ func ComplianceSend(ctx context.Context, row_id int32) error {
return fmt.Errorf("create crrm: %w", err)
}
log.Info().Int32("id", crrm.ID).Msg("Created compliance report request mailer")
txn.Commit(ctx)
lint.LogOnErrCtx(txn.Commit, ctx, "commit")
return nil
}

5
platform/notification.go
View file

@ -44,7 +44,10 @@ func ClearOauth(ctx context.Context, user *models.User) {
models.UpdateWhere.Notifications.UserID.EQ(user.ID),
setter.UpdateMod(),
)
updater.Exec(ctx, db.PGInstance.BobDB)
_, err := updater.Exec(ctx, db.PGInstance.BobDB)
if err != nil {
log.Error().Err(err).Msg("execute update")
}
//user.UserNotifications(
//models.SelectWhere.Notifications.Link.EQ(NotificationPathOauthReset),
//).UpdateAll()