Skip to content

Backport/squashing fix for enterprise meta #16651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jm96441n merged 8 commits into from
Mar 20, 2023
Merged

Backport/squashing fix for enterprise meta #16651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
600ef8c
Backport squash structures for config entries
jm96441n Mar 16, 2023
2aff3c5
Add changelog
jm96441n Mar 16, 2023
00125ac
Rename changelog file for current PR
jm96441n Mar 16, 2023
7d20645
Merge branch 'release/1.15.x' into backport/squashing-fix-for-enterpr…
jm96441n Mar 16, 2023
a71c4cc
change changelog file name
jm96441n Mar 16, 2023
1de62f5
Merge branch 'release/1.15.x' into backport/squashing-fix-for-enterpr…
jm96441n Mar 20, 2023
2a8de93
Add enterprise only tag to changelog
jm96441n Mar 20, 2023
4f6eb5a
Fix changelog
jm96441n Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/16651.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
gateway: **(Enterprise only)** Fix bug where namespace/partition would fail to unmarshal.
```
5 changes: 3 additions & 2 deletions agent/structs/config_entry_routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion agent/structs/config_entry_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down