From 600ef8cf172db2ef2fd0229c907e77a57b00fb12 Mon Sep 17 00:00:00 2001 From: jm96441n Date: Thu, 16 Mar 2023 12:09:38 -0400 Subject: [PATCH 1/6] Backport squash structures for config entries --- agent/structs/config_entry_routes.go | 5 +++-- agent/structs/config_entry_status.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/agent/structs/config_entry_routes.go b/agent/structs/config_entry_routes.go index 1235723f89f..683ec9f3fac 100644 --- 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 index 85140f3e5aa..2a56ba08a01 100644 --- 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 { From 2aff3c52a2f4634924badd7aa48d917b911a35f7 Mon Sep 17 00:00:00 2001 From: jm96441n Date: Thu, 16 Mar 2023 12:22:45 -0400 Subject: [PATCH 2/6] Add changelog --- .changelog/16650.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/16650.txt diff --git a/.changelog/16650.txt b/.changelog/16650.txt new file mode 100644 index 00000000000..3208b915c74 --- /dev/null +++ b/.changelog/16650.txt @@ -0,0 +1,3 @@ +```release-note:bug +gateway: Fix bug where namespace/partition would fail to unmarshal. [[GH-16650](https://github.com/hashicorp/consul/pull/16650)]. +``` From 00125ac4dafd566e2925bf7f0c02c097114df473 Mon Sep 17 00:00:00 2001 From: jm96441n Date: Thu, 16 Mar 2023 12:40:47 -0400 Subject: [PATCH 3/6] Rename changelog file for current PR --- .changelog/{16650.txt => 16651.txt} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .changelog/{16650.txt => 16651.txt} (58%) diff --git a/.changelog/16650.txt b/.changelog/16651.txt similarity index 58% rename from .changelog/16650.txt rename to .changelog/16651.txt index 3208b915c74..27073b585a6 100644 --- a/.changelog/16650.txt +++ b/.changelog/16651.txt @@ -1,3 +1,3 @@ ```release-note:bug -gateway: Fix bug where namespace/partition would fail to unmarshal. [[GH-16650](https://github.com/hashicorp/consul/pull/16650)]. +gateway: Fix bug where namespace/partition would fail to unmarshal. [[GH-16651](https://github.com/hashicorp/consul/pull/16651)]. ``` From a71c4cc29dbef29a162439ce885915fb7268f03c Mon Sep 17 00:00:00 2001 From: jm96441n Date: Thu, 16 Mar 2023 14:54:03 -0400 Subject: [PATCH 4/6] change changelog file name --- .changelog/{16651.txt => _16651.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .changelog/{16651.txt => _16651.txt} (100%) diff --git a/.changelog/16651.txt b/.changelog/_16651.txt similarity index 100% rename from .changelog/16651.txt rename to .changelog/_16651.txt From 2a8de937b72067c4a934dd517cc7e9288cff599e Mon Sep 17 00:00:00 2001 From: jm96441n Date: Mon, 20 Mar 2023 11:55:00 -0400 Subject: [PATCH 5/6] Add enterprise only tag to changelog --- .changelog/_16651.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/_16651.txt b/.changelog/_16651.txt index 27073b585a6..dd306bde8ab 100644 --- a/.changelog/_16651.txt +++ b/.changelog/_16651.txt @@ -1,3 +1,3 @@ ```release-note:bug -gateway: Fix bug where namespace/partition would fail to unmarshal. [[GH-16651](https://github.com/hashicorp/consul/pull/16651)]. +gateway: **(Enterprise only)** Fix bug where namespace/partition would fail to unmarshal. [[GH-16651](https://github.com/hashicorp/consul/pull/16651)]. ``` From 4f6eb5a0e8bd6e480b2493a02f8b6243a11bf663 Mon Sep 17 00:00:00 2001 From: jm96441n Date: Mon, 20 Mar 2023 12:23:17 -0400 Subject: [PATCH 6/6] Fix changelog --- .changelog/{_16651.txt => 16651.txt} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .changelog/{_16651.txt => 16651.txt} (50%) diff --git a/.changelog/_16651.txt b/.changelog/16651.txt similarity index 50% rename from .changelog/_16651.txt rename to .changelog/16651.txt index dd306bde8ab..c297cca489d 100644 --- a/.changelog/_16651.txt +++ b/.changelog/16651.txt @@ -1,3 +1,3 @@ ```release-note:bug -gateway: **(Enterprise only)** Fix bug where namespace/partition would fail to unmarshal. [[GH-16651](https://github.com/hashicorp/consul/pull/16651)]. +gateway: **(Enterprise only)** Fix bug where namespace/partition would fail to unmarshal. ```