Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
35e1c7a
chore(router): Remove unnecessary tls config field from server
dkorittki May 13, 2026
a26f430
chore(router): invent global type for all tls configs
dkorittki May 13, 2026
e3690c3
chore(router): move subgraph tls config into router.tls field
dkorittki May 13, 2026
dda275c
chore(router): add layer to router cfg for server http settings
dkorittki May 13, 2026
f8b9ba8
chore(router): improve godoc
dkorittki May 13, 2026
14c7498
chore(router): consistent field naming
dkorittki May 13, 2026
1eb0f6b
Merge branch 'main' into dominik/eng-9572-improve-tls-server-configur…
dkorittki May 15, 2026
2648cf5
fix: detect tls_client usage correctly
dkorittki May 15, 2026
8f2eba0
fix: set tls client and server config independently
dkorittki May 15, 2026
39fab54
chore: use testify require instead of t.Fatal
dkorittki May 15, 2026
8d96e11
chore: minimize code by outsourcing repeats into vars
dkorittki May 15, 2026
adc9366
chore: minimize code by outsourcing repeats into vars #2
dkorittki May 15, 2026
30e6ada
chore: use keys in structs
dkorittki May 18, 2026
e0755ad
Merge branch 'main' into dominik/eng-9572-improve-tls-server-configur…
dkorittki May 18, 2026
18c950e
chore: use require instead of t.Fatal
dkorittki May 18, 2026
bf432d5
chore: make compiled config a private field
dkorittki May 18, 2026
ee6cad8
fix: create new tls configs for each test
dkorittki May 18, 2026
3375c32
chore: minimize intermediate config type
dkorittki May 18, 2026
46789d2
chore: depointer testenv tls config
dkorittki May 18, 2026
183f929
chore: cleanup and renames
dkorittki May 18, 2026
3a50379
chore: rename variable
dkorittki May 18, 2026
f7eb6a0
chore: no comparison to bool var
dkorittki May 19, 2026
4278728
Merge branch 'main' into dominik/eng-9572-improve-tls-server-configur…
dkorittki May 19, 2026
6a34cf1
Merge branch 'main' into dominik/eng-9572-improve-tls-server-configur…
dkorittki May 19, 2026
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
12 changes: 7 additions & 5 deletions router-tests/events/nats_events_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,12 @@ func TestNatsEvents(t *testing.T) {
core.WithSubscriptionHeartbeatInterval(heartbeatInterval),
},
EnableNats: true,
TLSConfig: &core.TlsConfig{
Enabled: true,
CertFile: "../testdata/tls/cert.pem",
KeyFile: "../testdata/tls/key.pem",
TLSConfig: config.TLSConfiguration{
Server: config.TLSServerConfiguration{
Enabled: true,
CertFile: "../testdata/tls/cert.pem",
KeyFile: "../testdata/tls/key.pem",
},
},
}, func(t *testing.T, xEnv *testenv.Environment) {
subscribePayload := []byte(`{"query":"subscription { employeeUpdated(employeeID: 3) { id details { forename surname } } }"}`)
Expand Down Expand Up @@ -287,7 +289,7 @@ func TestNatsEvents(t *testing.T) {
testenv.Run(t, &testenv.Config{
RouterConfigJSONTemplate: testenv.ConfigWithEdfsNatsJSONTemplate,
EnableNats: true,
TLSConfig: nil, // Force Http/1
TLSConfig: config.TLSConfiguration{}, // empty to force HTTP/1
RouterOptions: []core.Option{
core.WithSubscriptionHeartbeatInterval(heartbeatInterval),
},
Expand Down
Loading
Loading