Skip to content

Commit 94fd40a

Browse files
authored
Add configuration for showing temporal-system namespace (#128)
1 parent d45a53c commit 94fd40a

4 files changed

Lines changed: 33 additions & 25 deletions

File tree

config/development.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cors:
55
- http://localhost:3000
66
refreshInterval: 1m
77
defaultNamespace: default
8+
showTemporalSystemNamespace: false
89
auth:
910
enabled: false
1011
providers:

docker/config_template.yaml

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,35 @@
1-
temporalGrpcAddress: {{ default .Env.TEMPORAL_ADDRESS "127.0.0.1:7233" }}
2-
port: {{ default .Env.TEMPORAL_UI_PORT "8080" }}
3-
uiRootPath: {{ default .Env.TEMPORAL_UI_ROOT_PATH "/" }}
4-
enableUi: {{ default .Env.TEMPORAL_UI_ENABLED "true" }}
5-
enableOpenApi: {{ default .Env.TEMPORAL_OPENAPI_ENABLED "true" }}
6-
defaultNamespace: {{ default .Env.TEMPORAL_DEFAULT_NAMESPACE "default" }}
7-
refreshInterval: {{ default .Env.TEMPORAL_CONFIG_REFRESH_INTERVAL "0s" }}
1+
temporalGrpcAddress: { { default .Env.TEMPORAL_ADDRESS "127.0.0.1:7233" } }
2+
port: { { default .Env.TEMPORAL_UI_PORT "8080" } }
3+
uiRootPath: { { default .Env.TEMPORAL_UI_ROOT_PATH "/" } }
4+
enableUi: { { default .Env.TEMPORAL_UI_ENABLED "true" } }
5+
enableOpenApi: { { default .Env.TEMPORAL_OPENAPI_ENABLED "true" } }
6+
defaultNamespace: { { default .Env.TEMPORAL_DEFAULT_NAMESPACE "default" } }
7+
refreshInterval: { { default .Env.TEMPORAL_CONFIG_REFRESH_INTERVAL "0s" } }
8+
showTemporalSystemNamespace:
9+
{ { default .Env.TEMPORAL_SHOW_TEMPORAL_SYSTEM_NAMESPACE "false" } }
810
cors:
911
allowOrigins:
1012
# override framework's default that allows all origins "*"
11-
- {{ default .Env.TEMPORAL_CORS_ORIGINS "http://localhost:8080" }}
13+
- { { default .Env.TEMPORAL_CORS_ORIGINS "http://localhost:8080" } }
1214
tls:
13-
caFile: {{ default .Env.TEMPORAL_TLS_CA "" }}
14-
certFile: {{ default .Env.TEMPORAL_TLS_CERT "" }}
15-
keyFile: {{ default .Env.TEMPORAL_TLS_KEY "" }}
16-
caData: {{ default .Env.TEMPORAL_TLS_CA_DATA "" }}
17-
certData: {{ default .Env.TEMPORAL_TLS_CERT_DATA "" }}
18-
keyData: {{ default .Env.TEMPORAL_TLS_KEY_DATA "" }}
19-
enableHostVerification: {{ default .Env.TEMPORAL_TLS_ENABLE_HOST_VERIFICATION "false" }}
20-
serverName: {{ default .Env.TEMPORAL_TLS_SERVER_NAME "" }}
15+
caFile: { { default .Env.TEMPORAL_TLS_CA "" } }
16+
certFile: { { default .Env.TEMPORAL_TLS_CERT "" } }
17+
keyFile: { { default .Env.TEMPORAL_TLS_KEY "" } }
18+
caData: { { default .Env.TEMPORAL_TLS_CA_DATA "" } }
19+
certData: { { default .Env.TEMPORAL_TLS_CERT_DATA "" } }
20+
keyData: { { default .Env.TEMPORAL_TLS_KEY_DATA "" } }
21+
enableHostVerification:
22+
{ { default .Env.TEMPORAL_TLS_ENABLE_HOST_VERIFICATION "false" } }
23+
serverName: { { default .Env.TEMPORAL_TLS_SERVER_NAME "" } }
2124
auth:
22-
enabled: {{ default .Env.TEMPORAL_AUTH_ENABLED "false" }}
23-
providers:
24-
- label: {{ default .Env.TEMPORAL_AUTH_LABEL "sso" }}
25-
type: {{ default .Env.TEMPORAL_AUTH_TYPE "oidc" }}
26-
providerUrl: {{ .Env.TEMPORAL_AUTH_PROVIDER_URL }}
27-
clientId: {{ .Env.TEMPORAL_AUTH_CLIENT_ID }}
28-
clientSecret: {{ .Env.TEMPORAL_AUTH_CLIENT_SECRET }}
29-
callbackUrl: {{ .Env.TEMPORAL_AUTH_CALLBACK_URL }}
25+
enabled: { { default .Env.TEMPORAL_AUTH_ENABLED "false" } }
26+
providers:
27+
- label: { { default .Env.TEMPORAL_AUTH_LABEL "sso" } }
28+
type: { { default .Env.TEMPORAL_AUTH_TYPE "oidc" } }
29+
providerUrl: { { .Env.TEMPORAL_AUTH_PROVIDER_URL } }
30+
clientId: { { .Env.TEMPORAL_AUTH_CLIENT_ID } }
31+
clientSecret: { { .Env.TEMPORAL_AUTH_CLIENT_SECRET } }
32+
callbackUrl: { { .Env.TEMPORAL_AUTH_CALLBACK_URL } }
3033
scopes:
3134
- openid
3235
- profile

server/config/config.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ type (
4242
EnableOpenAPI bool `yaml:"enableOpenApi"`
4343
CORS CORS `yaml:"cors"`
4444
DefaultNamespace string `yaml:"defaultNamespace"`
45+
// show temporal-system namespace in namespace selector
46+
ShowTemporalSystemNamespace bool `yaml:"showTemporalSystemNamespace"`
4547
// How often to reload the config
4648
RefreshInterval time.Duration `yaml:"refreshInterval"`
4749
}

server/routes/api.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ func getSettings(cfgProvier *config.ConfigProviderWithRefresh) func(echo.Context
131131
Enabled bool
132132
Options []string
133133
}
134-
DefaultNamespace string
134+
DefaultNamespace string
135+
ShowTemporalSystemNamespace bool
135136
}{
136137
struct {
137138
Enabled bool
@@ -141,6 +142,7 @@ func getSettings(cfgProvier *config.ConfigProviderWithRefresh) func(echo.Context
141142
options,
142143
},
143144
cfg.DefaultNamespace,
145+
cfg.ShowTemporalSystemNamespace,
144146
}
145147

146148
return c.JSON(http.StatusOK, settings)

0 commit comments

Comments
 (0)