mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-04 20:06:27 +02:00
Code Issues Projects Releases Wiki Activity

BoundCidrs -> BoundCIDRs

Browse Source
This commit is contained in:
Jeff Mitchell 2018-09-20 12:45:49 -04:00
parent 20c2c978d1
commit f9d85c3d68
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
logical/plugin/pb/backend.pb.go
View File

@ -513,7 +513,7 @@ type Auth struct {
GroupAliases []*logical.Alias `sentinel:"" protobuf:"bytes,12,rep,name=group_aliases,json=groupAliases,proto3" json:"group_aliases,omitempty"`
// If set, restricts usage of the certificates to client IPs falling within
// the range of the specified CIDR(s).
BoundCidrs []string `sentinel:"" protobuf:"bytes,13,rep,name=bound_cidrs,json=boundCidrs,proto3" json:"bound_cidrs,omitempty"`
BoundCIDRs []string `sentinel:"" protobuf:"bytes,13,rep,name=bound_cidrs,json=boundCidrs,proto3" json:"bound_cidrs,omitempty"`
// TokenPolicies and IdentityPolicies break down the list in Policies to
// help determine where a policy was sourced
TokenPolicies []string `sentinel:"" protobuf:"bytes,14,rep,name=token_policies,json=tokenPolicies,proto3" json:"token_policies,omitempty"`
@ -631,9 +631,9 @@ func (m *Auth) GetGroupAliases() []*logical.Alias {
return nil
}
func (m *Auth) GetBoundCidrs() []string {
func (m *Auth) GetBoundCIDRs() []string {
if m != nil {
return m.BoundCidrs
return m.BoundCIDRs
}
return nil
}
@ -667,7 +667,7 @@ type TokenEntry struct {
Role string `sentinel:"" protobuf:"bytes,12,opt,name=role,proto3" json:"role,omitempty"`
Period int64 `sentinel:"" protobuf:"varint,13,opt,name=period,proto3" json:"period,omitempty"`
EntityID string `sentinel:"" protobuf:"bytes,14,opt,name=entity_id,json=entityId,proto3" json:"entity_id,omitempty"`
BoundCidrs []string `sentinel:"" protobuf:"bytes,15,rep,name=bound_cidrs,json=boundCidrs,proto3" json:"bound_cidrs,omitempty"`
BoundCIDRs []string `sentinel:"" protobuf:"bytes,15,rep,name=bound_cidrs,json=boundCidrs,proto3" json:"bound_cidrs,omitempty"`
NamespaceID string `sentinel:"" protobuf:"bytes,16,opt,name=namespace_id,json=namespaceID,proto3" json:"namespace_id,omitempty"`
CubbyholeID string `sentinel:"" protobuf:"bytes,17,opt,name=cubbyhole_id,json=cubbyholeId,proto3" json:"cubbyhole_id,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
@ -797,9 +797,9 @@ func (m *TokenEntry) GetEntityID() string {
return ""
}
func (m *TokenEntry) GetBoundCidrs() []string {
func (m *TokenEntry) GetBoundCIDRs() []string {
if m != nil {
return m.BoundCidrs
return m.BoundCIDRs
}
return nil
}

8
logical/plugin/pb/translation.go
View File

@ -499,7 +499,7 @@ func LogicalAuthToProtoAuth(a *logical.Auth) (*Auth, error) {
EntityID: a.EntityID,
Alias: a.Alias,
GroupAliases: a.GroupAliases,
BoundCidrs: boundCIDRs,
BoundCIDRs: boundCIDRs,
}, nil
}
@ -519,7 +519,7 @@ func ProtoAuthToLogicalAuth(a *Auth) (*logical.Auth, error) {
return nil, err
}
boundCIDRs, err := parseutil.ParseAddrs(a.BoundCidrs)
boundCIDRs, err := parseutil.ParseAddrs(a.BoundCIDRs)
if err != nil {
return nil, err
}
@ -573,7 +573,7 @@ func LogicalTokenEntryToProtoTokenEntry(t *logical.TokenEntry) *TokenEntry {
Role: t.Role,
Period: int64(t.Period),
EntityID: t.EntityID,
BoundCidrs: boundCIDRs,
BoundCIDRs: boundCIDRs,
NamespaceID: t.NamespaceID,
CubbyholeID: t.CubbyholeID,
}
@ -584,7 +584,7 @@ func ProtoTokenEntryToLogicalTokenEntry(t *TokenEntry) (*logical.TokenEntry, err
return nil, nil
}
boundCIDRs, err := parseutil.ParseAddrs(t.BoundCidrs)
boundCIDRs, err := parseutil.ParseAddrs(t.BoundCIDRs)
if err != nil {
return nil, err
}