Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions api/internal/handler/evaluate.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package handler

import (
"log"
"net/http"

"github.com/davigiroux/flagkit/api/internal/cache"
Expand All @@ -23,15 +24,20 @@ func (h *EvalHandler) Evaluate(w http.ResponseWriter, r *http.Request) {
userID := r.URL.Query().Get("user_id")

// Try cache first
flag, _ := h.cache.GetFlag(r.Context(), key)
flag, err := h.cache.GetFlag(r.Context(), key)
if err != nil {
log.Printf("cache error for flag %q: %v", key, err)
}
if flag == nil {
var err error
flag, err = h.queries.GetFlagByKey(r.Context(), key)
if err != nil {
writeError(w, http.StatusNotFound, "flag not found")
return
}
h.cache.SetFlag(r.Context(), flag)
if err := h.cache.SetFlag(r.Context(), flag); err != nil {
log.Printf("cache set error for flag %q: %v", key, err)
}
}

result := evaluate.Evaluate(flag, userID)
Expand Down
29 changes: 22 additions & 7 deletions api/internal/handler/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package handler

import (
"encoding/json"
"log"
"net/http"

"github.com/davigiroux/flagkit/api/internal/audit"
Expand Down Expand Up @@ -60,7 +61,9 @@ func (h *FlagHandler) Create(w http.ResponseWriter, r *http.Request) {
return
}

h.queries.InsertAuditLog(r.Context(), flag.ID, model.AuditCreated, audit.FlagSnapshot(flag), middleware.GetActor(r.Context()))
if err := h.queries.InsertAuditLog(r.Context(), flag.ID, model.AuditCreated, audit.FlagSnapshot(flag), middleware.GetActor(r.Context())); err != nil {
log.Printf("audit log error (create flag %q): %v", flag.Key, err)
}

writeJSON(w, http.StatusCreated, flag)
}
Expand All @@ -86,9 +89,13 @@ func (h *FlagHandler) Update(w http.ResponseWriter, r *http.Request) {
}

diff := audit.ComputeDiff(oldFlag, flag)
h.queries.InsertAuditLog(r.Context(), flag.ID, model.AuditUpdated, audit.MarshalDiff(diff), middleware.GetActor(r.Context()))
if err := h.queries.InsertAuditLog(r.Context(), flag.ID, model.AuditUpdated, audit.MarshalDiff(diff), middleware.GetActor(r.Context())); err != nil {
log.Printf("audit log error (update flag %q): %v", key, err)
}

h.cache.InvalidateFlag(r.Context(), key)
if err := h.cache.InvalidateFlag(r.Context(), key); err != nil {
log.Printf("cache invalidation error for flag %q: %v", key, err)
}
writeJSON(w, http.StatusOK, flag)
}

Expand All @@ -106,9 +113,13 @@ func (h *FlagHandler) Delete(w http.ResponseWriter, r *http.Request) {
return
}

h.queries.InsertAuditLog(r.Context(), flag.ID, model.AuditDeleted, audit.FlagDeleteSnapshot(flag), middleware.GetActor(r.Context()))
if err := h.queries.InsertAuditLog(r.Context(), flag.ID, model.AuditDeleted, audit.FlagDeleteSnapshot(flag), middleware.GetActor(r.Context())); err != nil {
log.Printf("audit log error (delete flag %q): %v", key, err)
}

h.cache.InvalidateFlag(r.Context(), key)
if err := h.cache.InvalidateFlag(r.Context(), key); err != nil {
log.Printf("cache invalidation error for flag %q: %v", key, err)
}
w.WriteHeader(http.StatusNoContent)
}

Expand All @@ -128,9 +139,13 @@ func (h *FlagHandler) Toggle(w http.ResponseWriter, r *http.Request) {
}

diff := audit.ComputeDiff(oldFlag, flag)
h.queries.InsertAuditLog(r.Context(), flag.ID, model.AuditToggled, audit.MarshalDiff(diff), middleware.GetActor(r.Context()))
if err := h.queries.InsertAuditLog(r.Context(), flag.ID, model.AuditToggled, audit.MarshalDiff(diff), middleware.GetActor(r.Context())); err != nil {
log.Printf("audit log error (toggle flag %q): %v", key, err)
}

h.cache.InvalidateFlag(r.Context(), key)
if err := h.cache.InvalidateFlag(r.Context(), key); err != nil {
log.Printf("cache invalidation error for flag %q: %v", key, err)
}
writeJSON(w, http.StatusOK, flag)
}

Expand Down
Loading