Backport/squashing fix for enterprise meta (#16651)

* Backport squash structures for config entries * Add changelog * Rename changelog file for current PR * change changelog file name * Add enterprise only tag to changelog * Fix changelog
hashicorp · Mar 20, 2023 · 70b8c6b · 70b8c6b
1 parent 9e88415
commit 70b8c6b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.changelog/16651.txt b/.changelog/16651.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+gateway: **(Enterprise only)** Fix bug where namespace/partition would fail to unmarshal.
+```
diff --git a/agent/structs/config_entry_routes.go b/agent/structs/config_entry_routes.go
@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/consul/acl"
 	"github.com/miekg/dns"
+
+	"github.com/hashicorp/consul/acl"
 )
 
 // BoundRoute indicates a route that has parent gateways which
@@ -443,7 +444,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 {

diff --git a/agent/structs/config_entry_status.go b/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 {