From 351bdc3c0d8d6faccf7decc9f287bdc0ee16915d Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@hashicorp.com>
Date: Mon, 27 Mar 2023 12:17:04 -0400
Subject: [PATCH] Fix struct tags for TCPService enterprise meta (#16781)

* Fix struct tags for TCPService enterprise meta

* Add changelog
---
 .changelog/16781.txt                 | 3 +++
 agent/structs/config_entry_routes.go | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 .changelog/16781.txt

diff --git a/.changelog/16781.txt b/.changelog/16781.txt
new file mode 100644
index 0000000000..708a91d40c
--- /dev/null
+++ b/.changelog/16781.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+gateway: **(Enterprise only)** Fix bug where namespace/partition would fail to unmarshal for TCPServices.
+```
diff --git a/agent/structs/config_entry_routes.go b/agent/structs/config_entry_routes.go
index 683ec9f3fa..70a3065598 100644
--- a/agent/structs/config_entry_routes.go
+++ b/agent/structs/config_entry_routes.go
@@ -556,7 +556,7 @@ func (e *TCPRouteConfigEntry) CanWrite(authz acl.Authorizer) error {
 type TCPService struct {
 	Name string
 
-	acl.EnterpriseMeta
+	acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
 }
 
 func (s TCPService) ServiceName() ServiceName {