Skip to content

Commit

Permalink
Condition modification for interactive create silence option
Browse files Browse the repository at this point in the history
Signed-off-by: Rajshekar Chavakula <[email protected]>
  • Loading branch information
chavakula committed Feb 2, 2024
1 parent b2bb21d commit 3b29d19
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 1 deletion.
9 changes: 8 additions & 1 deletion backend/store/etcd/silenced_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
const (
silencedPathPrefix = "silenced"
maxTxnOps = 64 // this is half of the etcd default maximum
silencedLimitError = "silenced crossed maximum duration allowed"
)

var (
Expand Down Expand Up @@ -211,7 +212,7 @@ func (s *Store) UpdateSilencedEntry(ctx context.Context, silenced *corev2.Silenc

// check for maximum allowed duration for silenced allowed
if silenced.ExpireAt > 0 && (silenced.ExpireAt > allowedMaxTime) {
err := errors.New("silenced crossed maximum duration allowed")
err := errors.New(silencedLimitError)
return &store.ErrThreshold{Err: err}
}

Expand All @@ -221,6 +222,12 @@ func (s *Store) UpdateSilencedEntry(ctx context.Context, silenced *corev2.Silenc
start = time.Unix(silenced.Begin, 0)
}
silenced.ExpireAt = start.Add(time.Duration(silenced.Expire) * time.Second).Unix()

// check for maximum allowed duration for silenced allowed
if silenced.ExpireAt > allowedMaxTime {
err := errors.New(silencedLimitError)
return &store.ErrThreshold{Err: err}
}
}

// set default silenced expiry time configured in backend yaml file
Expand Down
46 changes: 46 additions & 0 deletions backend/store/etcd/silenced_store_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,49 @@ func TestSilencedStorageWithMaxAllowedThresholdExpiry(t *testing.T) {

})
}

func TestSilencedStorageWithMaxAllowedThresholdExpiryWithError(t *testing.T) {
testWithEtcd(t, func(store store.Store) {
silenced := types.FixtureSilenced("subscription:checkname")
silenced.Namespace = "default"
silenced.ExpireAt = 0
silenced.Expire = 3001
silenced.Begin = time.Now().Unix()
ctx := context.WithValue(context.Background(), types.NamespaceKey, silenced.Namespace)

err := store.UpdateSilencedEntry(ctx, silenced)

// assert that error is thrown for breaching max expiry time allowed
assert.Error(t, err)

entry, err := store.GetSilencedEntryByName(ctx, silenced.Name)

// assert that entry is nil
assert.NoError(t, err)
assert.Nil(t, entry)

})
}

func TestSilencedStorageWithMaxAllowedThresholdExpiryAndWithoutError(t *testing.T) {
testWithEtcd(t, func(store store.Store) {
silenced := types.FixtureSilenced("subscription:checkname")
silenced.Namespace = "default"
silenced.ExpireAt = 0
silenced.Expire = 100
silenced.Begin = time.Now().Unix()
ctx := context.WithValue(context.Background(), types.NamespaceKey, silenced.Namespace)

err := store.UpdateSilencedEntry(ctx, silenced)

// assert that error is nil
assert.Nil(t, err)

entry, err := store.GetSilencedEntryByName(ctx, silenced.Name)

// assert that entry is not nil
assert.NoError(t, err)
assert.NotNil(t, entry)

})
}

0 comments on commit 3b29d19

Please sign in to comment.