From c31554ec64f4de6d65fa46ac223637f7dab61bb0 Mon Sep 17 00:00:00 2001
From: Kyle Havlovitz <kylehav@gmail.com>
Date: Wed, 6 Jul 2022 09:53:31 -0700
Subject: [PATCH] Fix syntax for bootstrap sds secret config

---
 command/connect/envoy/bootstrap_config.go                     | 4 +---
 command/connect/envoy/bootstrap_config_test.go                | 4 +---
 .../envoy/testdata/prometheus-metrics-tls-ca-file.golden      | 4 +---
 .../envoy/testdata/prometheus-metrics-tls-ca-path.golden      | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/command/connect/envoy/bootstrap_config.go b/command/connect/envoy/bootstrap_config.go
index f2ea33b7f..d101d19e4 100644
--- a/command/connect/envoy/bootstrap_config.go
+++ b/command/connect/envoy/bootstrap_config.go
@@ -653,9 +653,7 @@ func (c *BootstrapConfig) generateListenerConfig(args *BootstrapTplArgs, bindAdd
 								}
 							],
 							"validationContextSdsSecretConfig": {
-								"trustedCa": {
-									"name": "prometheus_validation_context"
-								}
+								"name": "prometheus_validation_context"
 							}
 						}
 					}
diff --git a/command/connect/envoy/bootstrap_config_test.go b/command/connect/envoy/bootstrap_config_test.go
index bb471566c..1e928db17 100644
--- a/command/connect/envoy/bootstrap_config_test.go
+++ b/command/connect/envoy/bootstrap_config_test.go
@@ -342,9 +342,7 @@ const (
 				}
 			  ],
 			  "validationContextSdsSecretConfig": {
-				"trustedCa": {
-				  "name": "prometheus_validation_context"
-				}
+				"name": "prometheus_validation_context"
 			  }
 			}
 		  }
diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
index 64d0951b2..2f508b1e2 100644
--- a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
+++ b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden
@@ -151,9 +151,7 @@
                     }
                   ],
                   "validationContextSdsSecretConfig": {
-                    "trustedCa": {
-                      "name": "prometheus_validation_context"
-                    }
+                    "name": "prometheus_validation_context"
                   }
                 }
               }
diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden
index 34cbbda97..e677e9182 100644
--- a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden
+++ b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden
@@ -151,9 +151,7 @@
                     }
                   ],
                   "validationContextSdsSecretConfig": {
-                    "trustedCa": {
-                      "name": "prometheus_validation_context"
-                    }
+                    "name": "prometheus_validation_context"
                   }
                 }
               }