Skip to content

fix unittest #438

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
benjaminhuo merged 1 commit into from
Jan 18, 2024
Merged

fix unittest #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions pkg/util/envoy_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
var EnvoyStaticConfigTemplate = template.Must(template.New("envoy.yaml").Parse(dedent.Dedent(`
static_resources:
listeners:
{{ if .LocalServiceEnabled }}
{{- if .LocalServiceEnabled }}
- name: self_listener
address:
socket_address:
Expand Down Expand Up @@ -46,8 +46,8 @@ static_resources:
filename: {{ .ServiceTLSCertFile }}
private_key:
filename: {{ .ServiceTLSKeyFile }}
{{ end }}
{{ if .ProxyServiceEnabled }}
{{- end }}
{{- if .ProxyServiceEnabled }}
- name: proxy_listener
address:
socket_address:
Expand All @@ -74,9 +74,9 @@ static_resources:
cluster: upstrean_serivce
http_filters:
- name: envoy.filters.http.router
{{ end }}
{{- end }}
clusters:
{{ if .LocalServiceEnabled }}
{{- if .LocalServiceEnabled }}
- name: local_serivce
type: STATIC
lb_policy: ROUND_ROBIN
Expand All @@ -89,8 +89,8 @@ static_resources:
socket_address:
address: 127.0.0.1
port_value: {{ .ServiceListenPort }}
{{ end }}
{{ if .ProxyServiceEnabled }}
{{- end }}
{{- if .ProxyServiceEnabled }}
- name: upstrean_serivce
type: STRICT_DNS
lb_policy: ROUND_ROBIN
Expand All @@ -111,5 +111,5 @@ static_resources:
validation_context:
trust_chain_verification: ACCEPT_UNTRUSTED
sni: {{ .ProxyServiceAddress }}
{{ end }}
{{- end }}
`)))
20 changes: 10 additions & 10 deletions pkg/util/envoy_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,19 @@ static_resources:
socket_address:
address: query-whizard-operated.kubesphere-monitoring-system.svc
port_value: 10902
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
'@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
common_tls_context:
validation_context:
trust_chain_verification: ACCEPT_UNTRUSTED
alpn_protocols: 'h2,http/1.1'
sni: query-whizard-operated.kubesphere-monitoring-system.svc
transport_socket:
name: envoy.transport_sockets.tls
typed_config:
'@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
common_tls_context:
validation_context:
trust_chain_verification: ACCEPT_UNTRUSTED
sni: query-whizard-operated.kubesphere-monitoring-system.svc
`

func TestTempExec(t *testing.T) {
variables := map[string]string{
variables := map[string]interface{}{
"LocalServiceEnabled": true,
"ServiceMappingPort": "10902",
"ServiceListenPort": "10904",
"ServiceTLSCertFile": "/etc/whizard/certs/tls.crt",
Expand Down