github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix formatting issue in envoy bootstrapping.

pull/20036/head
John Murret 2023-12-21 14:02:32 -07:00
parent a19df32fa5
commit c4c2ddef30
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
command/connect/envoy/bootstrap_config.go
View File

@ -655,12 +655,12 @@ func (c *BootstrapConfig) generateListenerConfig(args *BootstrapTplArgs, bindAdd
"type": "STATIC", "type": "STATIC",
"typed_extension_protocol_options": { "typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": { "explicit_http_config": {
"http_protocol_options": {} "http_protocol_options": {}
} }
} }
}, },
"loadAssignment": { "loadAssignment": {
"clusterName": "` + clusterName + `", "clusterName": "` + clusterName + `",
"endpoints": [ "endpoints": [

26
command/connect/envoy/bootstrap_config_test.go
View File

@ -23,12 +23,12 @@ const (
"type": "STATIC", "type": "STATIC",
"typed_extension_protocol_options": { "typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": { "explicit_http_config": {
"http_protocol_options": {} "http_protocol_options": {}
} }
} }
}, },
"loadAssignment": { "loadAssignment": {
"clusterName": "self_admin", "clusterName": "self_admin",
"endpoints": [ "endpoints": [
@ -55,13 +55,13 @@ const (
"connect_timeout": "5s", "connect_timeout": "5s",
"type": "STATIC", "type": "STATIC",
"typed_extension_protocol_options": { "typed_extension_protocol_options": {
"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": { "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions", "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
"explicit_http_config": { "explicit_http_config": {
"http_protocol_options": {} "http_protocol_options": {}
} }
} }
}, },
"loadAssignment": { "loadAssignment": {
"clusterName": "self_admin", "clusterName": "self_admin",
"endpoints": [ "endpoints": [

6
test/integration/connect/envoy/main_test.go
View File

@ -50,9 +50,9 @@ func TestEnvoy(t *testing.T) {
caseDir := "CASE_DIR=" + tc caseDir := "CASE_DIR=" + tc
t.Cleanup(func() { t.Cleanup(func() {
//if t.Failed() { if t.Failed() {
runCmd(t, "capture_logs", caseDir) runCmd(t, "capture_logs", caseDir)
//} }
runCmd(t, "test_teardown", caseDir) runCmd(t, "test_teardown", caseDir)
}) })