Skip to content

Commit 3f782b6

Browse files
committed
Introduce MZ_LISTENERS_CONFIG_PATH for CI tests
1 parent ba74633 commit 3f782b6

File tree

3 files changed

+48
-6
lines changed

3 files changed

+48
-6
lines changed

.github/listener_configs/no_auth.json

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
{
2+
"sql": {
3+
"external": {
4+
"addr": "0.0.0.0:7875",
5+
"authenticator_kind": "None",
6+
"allowed_roles": "Normal",
7+
"enable_tls": false
8+
},
9+
"internal": {
10+
"addr": "0.0.0.0:7877",
11+
"authenticator_kind": "None",
12+
"allowed_roles": "Internal",
13+
"enable_tls": false
14+
}
15+
},
16+
"http": {
17+
"external": {
18+
"addr": "0.0.0.0:7876",
19+
"authenticator_kind": "None",
20+
"allowed_roles": "NormalAndInternal",
21+
"enable_tls": false,
22+
"routes": {
23+
"base": true,
24+
"webhook": true,
25+
"internal": false,
26+
"metrics": false,
27+
"profiling": false
28+
}
29+
},
30+
"internal": {
31+
"addr": "0.0.0.0:7878",
32+
"authenticator_kind": "None",
33+
"allowed_roles": "NormalAndInternal",
34+
"enable_tls": false,
35+
"routes": {
36+
"base": true,
37+
"webhook": true,
38+
"internal": true,
39+
"metrics": true,
40+
"profiling": true
41+
}
42+
}
43+
}
44+
}

compose.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,9 @@ services:
5151
- --all-features
5252
environment:
5353
MZ_NO_TELEMETRY: 1
54-
MZ_SQL_LISTEN_ADDR: 0.0.0.0:7875
55-
MZ_HTTP_LISTEN_ADDR: 0.0.0.0:7876
56-
MZ_INTERNAL_SQL_LISTEN_ADDR: 0.0.0.0:7877
57-
MZ_INTERNAL_HTTP_LISTEN_ADDR: 0.0.0.0:7878
54+
MZ_LISTENERS_CONFIG_PATH: /custom-listeners.json
55+
volumes:
56+
- ./.github/listener_configs/no_auth.json:/custom-listeners.json
5857
ports:
5958
- 7875:7875
6059
- 7877:7877
@@ -149,7 +148,6 @@ services:
149148
container_name: provider
150149
depends_on:
151150
materialized: {condition: service_healthy}
152-
materialized2: {condition: service_healthy}
153151
redpanda: {condition: service_healthy}
154152
volumes:
155153
- ./integration:/usr/src/app/integration

pkg/provider/provider.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func Provider(version string) *schema.Provider {
3838
DefaultFunc: schema.EnvDefaultFunc("MZ_SSLMODE", "require"),
3939
Description: "For testing purposes, the SSL mode to use.",
4040
},
41-
// TODO: Switch name to Admin Endpoint for consistency:
41+
// TODO: Switch name to Admin Endpoint for consistency
4242
"endpoint": {
4343
Type: schema.TypeString,
4444
Optional: true,

0 commit comments

Comments
 (0)