luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

api: add partition field to acl structs (#11080)

This commit is contained in:
R.B. Boyer 2021-09-17 11:53:03 -05:00 committed by GitHub
parent ea8ab90968
commit a727ee6416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/11080.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
api: add partition field to acl structs
```

32
api/acl.go
View File

@ -53,6 +53,10 @@ type ACLToken struct {
// Namespaces are a Consul Enterprise feature. // Namespaces are a Consul Enterprise feature.
Namespace string `json:",omitempty"` Namespace string `json:",omitempty"`
// Partition is the partition the ACLToken is associated with.
// Partitions are a Consul Enterprise feature.
Partition string `json:",omitempty"`
// AuthMethodNamespace is the namespace the token's AuthMethod is associated with. // AuthMethodNamespace is the namespace the token's AuthMethod is associated with.
// Namespacing is a Consul Enterprise feature. // Namespacing is a Consul Enterprise feature.
AuthMethodNamespace string `json:",omitempty"` AuthMethodNamespace string `json:",omitempty"`
@ -79,6 +83,10 @@ type ACLTokenListEntry struct {
// Namespacing is a Consul Enterprise feature. // Namespacing is a Consul Enterprise feature.
Namespace string `json:",omitempty"` Namespace string `json:",omitempty"`
// Partition is the partition the ACLTokenListEntry is associated with.
// Partitions are a Consul Enterprise feature.
Partition string `json:",omitempty"`
// AuthMethodNamespace is the namespace the token's AuthMethod is associated with. // AuthMethodNamespace is the namespace the token's AuthMethod is associated with.
// Namespacing is a Consul Enterprise feature. // Namespacing is a Consul Enterprise feature.
AuthMethodNamespace string `json:",omitempty"` AuthMethodNamespace string `json:",omitempty"`
@ -138,6 +146,10 @@ type ACLPolicy struct {
// Namespace is the namespace the ACLPolicy is associated with. // Namespace is the namespace the ACLPolicy is associated with.
// Namespacing is a Consul Enterprise feature. // Namespacing is a Consul Enterprise feature.
Namespace string `json:",omitempty"` Namespace string `json:",omitempty"`
// Partition is the partition the ACLPolicy is associated with.
// Partitions are a Consul Enterprise feature.
Partition string `json:",omitempty"`
} }
type ACLPolicyListEntry struct { type ACLPolicyListEntry struct {
@ -152,6 +164,10 @@ type ACLPolicyListEntry struct {
// Namespace is the namespace the ACLPolicyListEntry is associated with. // Namespace is the namespace the ACLPolicyListEntry is associated with.
// Namespacing is a Consul Enterprise feature. // Namespacing is a Consul Enterprise feature.
Namespace string `json:",omitempty"` Namespace string `json:",omitempty"`
// Partition is the partition the ACLPolicyListEntry is associated with.
// Partitions are a Consul Enterprise feature.
Partition string `json:",omitempty"`
} }
type ACLRolePolicyLink = ACLLink type ACLRolePolicyLink = ACLLink
@ -171,6 +187,10 @@ type ACLRole struct {
// Namespace is the namespace the ACLRole is associated with. // Namespace is the namespace the ACLRole is associated with.
// Namespacing is a Consul Enterprise feature. // Namespacing is a Consul Enterprise feature.
Namespace string `json:",omitempty"` Namespace string `json:",omitempty"`
// Partition is the partition the ACLRole is associated with.
// Partitions are a Consul Enterprise feature.
Partition string `json:",omitempty"`
} }
// BindingRuleBindType is the type of binding rule mechanism used. // BindingRuleBindType is the type of binding rule mechanism used.
@ -198,6 +218,10 @@ type ACLBindingRule struct {
// Namespace is the namespace the ACLBindingRule is associated with. // Namespace is the namespace the ACLBindingRule is associated with.
// Namespacing is a Consul Enterprise feature. // Namespacing is a Consul Enterprise feature.
Namespace string `json:",omitempty"` Namespace string `json:",omitempty"`
// Partition is the partition the ACLBindingRule is associated with.
// Partitions are a Consul Enterprise feature.
Partition string `json:",omitempty"`
} }
type ACLAuthMethod struct { type ACLAuthMethod struct {
@ -226,6 +250,10 @@ type ACLAuthMethod struct {
// Namespace is the namespace the ACLAuthMethod is associated with. // Namespace is the namespace the ACLAuthMethod is associated with.
// Namespacing is a Consul Enterprise feature. // Namespacing is a Consul Enterprise feature.
Namespace string `json:",omitempty"` Namespace string `json:",omitempty"`
// Partition is the partition the ACLAuthMethod is associated with.
// Partitions are a Consul Enterprise feature.
Partition string `json:",omitempty"`
} }
func (m *ACLAuthMethod) MarshalJSON() ([]byte, error) { func (m *ACLAuthMethod) MarshalJSON() ([]byte, error) {
@ -293,6 +321,10 @@ type ACLAuthMethodListEntry struct {
// Namespace is the namespace the ACLAuthMethodListEntry is associated with. // Namespace is the namespace the ACLAuthMethodListEntry is associated with.
// Namespacing is a Consul Enterprise feature. // Namespacing is a Consul Enterprise feature.
Namespace string `json:",omitempty"` Namespace string `json:",omitempty"`
// Partition is the partition the ACLAuthMethodListEntry is associated with.
// Partitions are a Consul Enterprise feature.
Partition string `json:",omitempty"`
} }
// This is nearly identical to the ACLAuthMethod MarshalJSON // This is nearly identical to the ACLAuthMethod MarshalJSON