Login Successful!
Session: { resp.Session }
-
{ resp.Credentials }
+
You may close this window now
}
diff --git a/pkg/store/create.go b/pkg/store/create.go
index 02a70cb..c621c1d 100644
--- a/pkg/store/create.go
+++ b/pkg/store/create.go
@@ -51,8 +51,27 @@ func (s Store) create(
key hz.ObjectKeyer,
data []byte,
) error {
- _, err := s.kv.Create(ctx, hz.KeyFromObject(key), data)
+ rawKey, err := hz.KeyFromObjectStrict(key)
if err != nil {
+ return &hz.Error{
+ Status: http.StatusBadRequest,
+ Message: fmt.Sprintf(
+ "invalid key: %q",
+ err.Error(),
+ ),
+ }
+ }
+ data, err = removeReadOnlyFields(data)
+ if err != nil {
+ return &hz.Error{
+ Status: http.StatusInternalServerError,
+ Message: fmt.Sprintf(
+ "removing read-only fields: %s",
+ err.Error(),
+ ),
+ }
+ }
+ if _, err := s.kv.Create(ctx, rawKey, data); err != nil {
if errors.Is(err, jetstream.ErrKeyExists) {
return &hz.Error{
Status: http.StatusConflict,
diff --git a/pkg/store/gc.go b/pkg/store/gc.go
index 269469c..351c5de 100644
--- a/pkg/store/gc.go
+++ b/pkg/store/gc.go
@@ -56,12 +56,12 @@ func (gc *GarbageCollector) garbageCollect(
if err := json.Unmarshal(event.Data, &obj); err != nil {
return hz.Result{}, fmt.Errorf("unmarshal object: %w", err)
}
- // Double check the object has a deletion timestamp.
- if obj.ObjectMeta.DeletionTimestamp == nil {
+ // If the object has no deletion timestamp, it's not ready to be deleted.
+ if obj.DeletionTimestamp == nil {
return hz.Result{}, nil
}
- // Check that timestamp has expired... so we don't delete prematurely.
- if obj.ObjectMeta.DeletionTimestamp.After(time.Now()) {
+ // Check the deletion is due. If not, reschedule for when it is.
+ if !obj.ObjectMeta.DeletionTimestamp.IsPast() {
// If the deletion timestamp has not expired yet, requeue the event
// to be processed once it has.
return hz.Result{
@@ -77,11 +77,9 @@ func (gc *GarbageCollector) garbageCollect(
}, nil
}
if result == DeleteResultFinalizers {
- // If the object still has finalizers, requeue the event to be processed
- // again later.
- return hz.Result{
- RequeueAfter: time.Second * 5,
- }, nil
+ // If the object still has finalizers, ACK and we will try again when
+ // the object is updated.
+ return hz.Result{}, nil
}
return hz.Result{}, nil
@@ -91,8 +89,17 @@ func (gc *GarbageCollector) deleteObjectCascading(
ctx context.Context,
obj hz.MetaOnlyObject,
) (DeleteResult, error) {
+ slog.Info(
+ "CASCADING DELETE",
+ "key",
+ hz.KeyFromObject(obj),
+ // "revision",
+ // *obj.ObjectMeta.Revision,
+ "finalizers",
+ obj.Finalizers,
+ )
// If the object has finalizers, it's not ready to be deleted.
- if len(obj.ObjectMeta.Finalizers) > 0 {
+ if obj.ObjectMeta.Finalizers != nil && len(*obj.ObjectMeta.Finalizers) > 0 {
return DeleteResultFinalizers, nil
}
// Check any child objects and delete those first.
diff --git a/pkg/store/store.go b/pkg/store/store.go
index 876df7c..5239a74 100644
--- a/pkg/store/store.go
+++ b/pkg/store/store.go
@@ -13,6 +13,7 @@ import (
"github.com/nats-io/nats.go"
"github.com/nats-io/nats.go/jetstream"
+ "github.com/tidwall/sjson"
"github.com/verifa/horizon/pkg/auth"
"github.com/verifa/horizon/pkg/hz"
)
@@ -441,3 +442,7 @@ func (s Store) handleInternalMsg(ctx context.Context, msg *nats.Msg) {
_ = hz.RespondOK(msg, nil)
}
+
+func removeReadOnlyFields(data []byte) ([]byte, error) {
+ return sjson.DeleteBytes(data, "metadata.revision")
+}
diff --git a/pkg/store/update.go b/pkg/store/update.go
index 8d0b526..6446cd1 100644
--- a/pkg/store/update.go
+++ b/pkg/store/update.go
@@ -43,6 +43,16 @@ func (s Store) update(
),
}
}
+ data, err = removeReadOnlyFields(data)
+ if err != nil {
+ return &hz.Error{
+ Status: http.StatusInternalServerError,
+ Message: fmt.Sprintf(
+ "removing read-only fields: %s",
+ err.Error(),
+ ),
+ }
+ }
if _, err := s.kv.Update(ctx, rawKey, data, revision); err != nil {
if isErrWrongLastSequence(err) {
return hz.ErrIncorrectRevision