10000 feat: add killswitch for notifications by mtojek · Pull Request #13794 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat: add killswitch for notifications #13794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jul 10, 2024
Merged

feat: add killswitch for notifications #13794

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
735d0ef
feat: add killswitch for notifications
mtojek Jul 9, 2024
b6338e5
revert
mtojek Jul 10, 2024
16c8950
migrate down
mtojek Jul 10, 2024
edfff5e
304
mtojek Jul 10, 2024
89e1396
Notifications settings
mtojek Jul 10, 2024
ab8a6c7
debug message
mtojek Jul 10, 2024
2522366
return true
mtojek Jul 10, 2024
7dfbd29
remove WillUsePostgres
mtojek Jul 10, 2024
d7f470d
Merge branch 'main' into 4-pause-1
mtojek Jul 10, 2024
6abf39f
fix client 304
mtojek Jul 10, 2024
341485f
createSampleUser
mtojek Jul 10, 2024
c90ff21
sdkError
mtojek Jul 10, 2024
da6775f
remove test for not modified
mtojek Jul 10, 2024
9d430bb
swagger update 8000
mtojek Jul 10, 2024
a55fc8a
bring back Settings not modified
mtojek Jul 10, 2024
af36afb
enable WillUsePostgres in TestWebhookDispatch
mtojek Jul 10, 2024
7e8ad09
refactor Settings not modified
mtojek Jul 10, 2024
ce1a9e9
refactored TestNotifierPaused
mtojek Jul 10, 2024
dbf6a40
bug: RLock RUnlock
mtojek Jul 10, 2024
c2e181c
Danny's review
mtojek Jul 10, 2024
fa0f381
Merge branch 'main' into 4-pause-1
mtojek Jul 10, 2024
83978e7
fix
mtojek Jul 10, 2024
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
Prev Previous commit
fix
  • Loading branch information
@mtojek
mtojek committed Jul 10, 2024
commit 83978e73c9bcea53223541932e32e2ad0233ea2a
3 changes: 2 additions & 1 deletion coderd/notifications/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
10000 Expand Up @@ -7,12 +7,13 @@ import (
"testing"
"time"

"github.com/coder/serpent"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/xerrors"

"github.com/coder/serpent"

"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbgen"
"github.com/coder/coder/v2/coderd/notifications"
Expand Down
8 changes: 3 additions & 5 deletions coderd/notifications/notifications_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,9 +542,7 @@ func TestNotifierPaused(t *testing.T) {
t.Parallel()

// setup
ctx := testutil.Context(t, testutil.WaitLong)
logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true, IgnoredErrorIs: []error{}}).Leveled(slog.LevelDebug)
db := dbmem.New() // FIXME https://github.com/coder/coder/pull/13863
ctx, logger, db := setupInMemory(t)

// Prepare the test
handler := &fakeHandler{}
Expand All @@ -571,7 +569,7 @@ func TestNotifierPaused(t *testing.T) {
require.Eventually(t, func() bool {
handler.mu.RLock()
defer handler.mu.RUnlock()
return handler.succeeded == sid.String()
return slices.Contains(handler.succeeded, sid.String())
}, testutil.WaitShort, testutil.IntervalFast)

// Pause the notifier.
Expand Down Expand Up @@ -601,7 +599,7 @@ func TestNotifierPaused(t *testing.T) {
require.Eventually(t, func() bool {
handler.mu.RLock()
defer handler.mu.RUnlock()
return handler.succeeded == sid.String()
return slices.Contains(handler.succeeded, sid.String())
}, testutil.WaitShort, testutil.IntervalFast)
}

Expand Down
Loading
0