Backport ENT-4704 (#16612)

agent/structs/config_entry_routes.go

@@ -443,7 +443,7 @@ type HTTPService struct {
 	// to routing it to the upstream service
 	Filters HTTPFilters
 
-	acl.EnterpriseMeta
+	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
 }
 
 func (s HTTPService) ServiceName() ServiceName {

agent/structs/config_entry_status.go

@@ -22,7 +22,7 @@ type ResourceReference struct {
 	// unused, this should be blank.
 	SectionName string
 
-	acl.EnterpriseMeta
+	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
 }
 
 func (r *ResourceReference) String() string {

test/integration/consul-container/test/gateways/http_route_test.go

@@ -89,7 +89,6 @@ func TestHTTPRouteFlattening(t *testing.T) {
 	proxyDefaults := &api.ProxyConfigEntry{
 		Kind: api.ProxyDefaults,
 		Name: api.ProxyConfigGlobal,
-		Namespace: namespace,
 		Config: map[string]interface{}{
 			"protocol": "http",
 		},
@@ -287,7 +286,6 @@ func TestHTTPRoutePathRewrite(t *testing.T) {
 	proxyDefaults := &api.ProxyConfigEntry{
 		Kind: api.ProxyDefaults,
 		Name: api.ProxyConfigGlobal,
-		Namespace: namespace,
 		Config: map[string]interface{}{
 			"protocol": "http",
 		},
@@ -450,7 +448,6 @@ func TestHTTPRouteParentRefChange(t *testing.T) {
 	proxyDefaults := &api.ProxyConfigEntry{
 		Kind: api.ProxyDefaults,
 		Name: api.ProxyConfigGlobal,
-		Namespace: namespace,
 		Config: map[string]interface{}{
 			"protocol": "http",
 		},