From 0f3cc3d631142c96d314629d7fcb0de048d7a200 Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Thu, 21 Dec 2023 15:18:11 -0700
Subject: [PATCH] fix formatting issue in envoy bootstrapping. (#20036)

---
 command/connect/envoy/bootstrap_config.go     | 10 +++----
 .../connect/envoy/bootstrap_config_test.go    | 26 +++++++++----------
 test/integration/connect/envoy/main_test.go   |  6 ++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/command/connect/envoy/bootstrap_config.go b/command/connect/envoy/bootstrap_config.go
index c99188bb14..e309e6648c 100644
--- a/command/connect/envoy/bootstrap_config.go
+++ b/command/connect/envoy/bootstrap_config.go
@@ -655,12 +655,12 @@ func (c *BootstrapConfig) generateListenerConfig(args *BootstrapTplArgs, bindAdd
 		"type": "STATIC",
 		"typed_extension_protocol_options": {
 			"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-			 "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-			 "explicit_http_config": {
-			  "http_protocol_options": {}
-			 }
+				"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+				"explicit_http_config": {
+					"http_protocol_options": {}
+				}
 			}
-          },
+		},
 		"loadAssignment": {
 			"clusterName": "` + clusterName + `",
 			"endpoints": [
diff --git a/command/connect/envoy/bootstrap_config_test.go b/command/connect/envoy/bootstrap_config_test.go
index 1a782cdb39..27598b93b3 100644
--- a/command/connect/envoy/bootstrap_config_test.go
+++ b/command/connect/envoy/bootstrap_config_test.go
@@ -23,12 +23,12 @@ const (
   "type": "STATIC",
   "typed_extension_protocol_options": {
 	"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-	 "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-	 "explicit_http_config": {
-	  "http_protocol_options": {}
-	 }
-	}
-   },
+      "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+      "explicit_http_config": {
+        "http_protocol_options": {}
+      }
+    }
+  },
   "loadAssignment": {
     "clusterName": "self_admin",
     "endpoints": [
@@ -55,13 +55,13 @@ const (
   "connect_timeout": "5s",
   "type": "STATIC",
   "typed_extension_protocol_options": {
-	"envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-	 "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-	 "explicit_http_config": {
-	  "http_protocol_options": {}
-	 }
-	}
-   },
+    "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+	  "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+      "explicit_http_config": {
+        "http_protocol_options": {}
+      }
+    }
+  },
   "loadAssignment": {
     "clusterName": "self_admin",
     "endpoints": [
diff --git a/test/integration/connect/envoy/main_test.go b/test/integration/connect/envoy/main_test.go
index 0268587f22..aa83bb6bbe 100644
--- a/test/integration/connect/envoy/main_test.go
+++ b/test/integration/connect/envoy/main_test.go
@@ -50,9 +50,9 @@ func TestEnvoy(t *testing.T) {
 			caseDir := "CASE_DIR=" + tc
 
 			t.Cleanup(func() {
-				//if t.Failed() {
-				runCmd(t, "capture_logs", caseDir)
-				//}
+				if t.Failed() {
+					runCmd(t, "capture_logs", caseDir)
+				}
 
 				runCmd(t, "test_teardown", caseDir)
 			})