Update proto
This commit is contained in:
Jeff Mitchell
parent
65f664be47
commit
a80791ce7e
2
Makefile
2
Makefile
|
|
@ -83,7 +83,7 @@ proto:
|
|||
protoc -I helper/storagepacker helper/storagepacker/types.proto --go_out=plugins=grpc:helper/storagepacker
|
||||
protoc -I helper/forwarding -I vault -I ../../.. helper/forwarding/types.proto --go_out=plugins=grpc:helper/forwarding
|
||||
protoc -I helper/identity -I ../../.. helper/identity/types.proto --go_out=plugins=grpc:helper/identity
|
||||
sed -i -e 's/Idp/IDP/' -e 's/Url/URL/' -e 's/Id/ID/' -e 's/EntityId/EntityID/' -e 's/Api/API/' -e 's/Qr/QR/'helper/identity/types.pb.go helper/storagepacker/types.pb.go
|
||||
sed -i -e 's/Idp/IDP/' -e 's/Url/URL/' -e 's/Id/ID/' -e 's/EntityId/EntityID/' -e 's/Api/API/' -e 's/Qr/QR/' -e 's/protobuf:"/sentinel:"" protobuf:"/' helper/identity/types.pb.go helper/storagepacker/types.pb.go
|
||||
|
||||
fmtcheck:
|
||||
@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
|
||||
|
|
|
|||
|
|
@ -33,32 +33,32 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
|
|||
// Group represents an identity group.
|
||||
type Group struct {
|
||||
// ID is the unique identifier for this group
|
||||
ID string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
|
||||
ID string `sentinel:"" protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
|
||||
// Name is the unique name for this group
|
||||
Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
|
||||
Name string `sentinel:"" protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
|
||||
// Policies are the vault policies to be granted to members of this group
|
||||
Policies []string `protobuf:"bytes,3,rep,name=policies" json:"policies,omitempty"`
|
||||
Policies []string `sentinel:"" protobuf:"bytes,3,rep,name=policies" json:"policies,omitempty"`
|
||||
// ParentGroupIDs are the identifiers of those groups to which this group is a
|
||||
// member of. These will serve as references to the parent group in the
|
||||
// hierarchy.
|
||||
ParentGroupIDs []string `protobuf:"bytes,4,rep,name=parent_group_ids,json=parentGroupIds" json:"parent_group_ids,omitempty"`
|
||||
ParentGroupIDs []string `sentinel:"" protobuf:"bytes,4,rep,name=parent_group_ids,json=parentGroupIds" json:"parent_group_ids,omitempty"`
|
||||
// MemberEntityIDs are the identifiers of entities which are members of this
|
||||
// group
|
||||
MemberEntityIDs []string `protobuf:"bytes,5,rep,name=member_entity_ids,json=memberEntityIDs" json:"member_entity_ids,omitempty"`
|
||||
MemberEntityIDs []string `sentinel:"" protobuf:"bytes,5,rep,name=member_entity_ids,json=memberEntityIDs" json:"member_entity_ids,omitempty"`
|
||||
// Metadata represents the custom data tied with this group
|
||||
Metadata map[string]string `protobuf:"bytes,6,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
|
||||
Metadata map[string]string `sentinel:"" protobuf:"bytes,6,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
|
||||
// CreationTime is the time at which this group was created
|
||||
CreationTime *google_protobuf.Timestamp `protobuf:"bytes,7,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"`
|
||||
CreationTime *google_protobuf.Timestamp `sentinel:"" protobuf:"bytes,7,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"`
|
||||
// LastUpdateTime is the time at which this group was last modified
|
||||
LastUpdateTime *google_protobuf.Timestamp `protobuf:"bytes,8,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"`
|
||||
LastUpdateTime *google_protobuf.Timestamp `sentinel:"" protobuf:"bytes,8,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"`
|
||||
// ModifyIndex tracks the number of updates to the group. It is useful to detect
|
||||
// updates to the groups.
|
||||
ModifyIndex uint64 `protobuf:"varint,9,opt,name=modify_index,json=modifyIndex" json:"modify_index,omitempty"`
|
||||
ModifyIndex uint64 `sentinel:"" protobuf:"varint,9,opt,name=modify_index,json=modifyIndex" json:"modify_index,omitempty"`
|
||||
// BucketKeyHash is the MD5 hash of the storage bucket key into which this
|
||||
// group is stored in the underlying storage. This is useful to find all
|
||||
// the groups belonging to a particular bucket during invalidation of the
|
||||
// storage key.
|
||||
BucketKeyHash string `protobuf:"bytes,10,opt,name=bucket_key_hash,json=bucketKeyHash" json:"bucket_key_hash,omitempty"`
|
||||
BucketKeyHash string `sentinel:"" protobuf:"bytes,10,opt,name=bucket_key_hash,json=bucketKeyHash" json:"bucket_key_hash,omitempty"`
|
||||
}
|
||||
|
||||
func (m *Group) Reset() { *m = Group{} }
|
||||
|
|
@ -142,41 +142,41 @@ type Entity struct {
|
|||
// Aliases are the identities that this entity is made of. This can be
|
||||
// empty as well to favor being able to create the entity first and then
|
||||
// incrementally adding aliases.
|
||||
Aliases []*Alias `protobuf:"bytes,1,rep,name=aliases" json:"aliases,omitempty"`
|
||||
Aliases []*Alias `sentinel:"" protobuf:"bytes,1,rep,name=aliases" json:"aliases,omitempty"`
|
||||
// ID is the unique identifier of the entity which always be a UUID. This
|
||||
// should never be allowed to be updated.
|
||||
ID string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
|
||||
ID string `sentinel:"" protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
|
||||
// Name is a unique identifier of the entity which is intended to be
|
||||
// human-friendly. The default name might not be human friendly since it
|
||||
// gets suffixed by a UUID, but it can optionally be updated, unlike the ID
|
||||
// field.
|
||||
Name string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
|
||||
Name string `sentinel:"" protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
|
||||
// Metadata represents the explicit metadata which is set by the
|
||||
// clients. This is useful to tie any information pertaining to the
|
||||
// aliases. This is a non-unique field of entity, meaning multiple
|
||||
// entities can have the same metadata set. Entities will be indexed based
|
||||
// on this explicit metadata. This enables virtual groupings of entities
|
||||
// based on its metadata.
|
||||
Metadata map[string]string `protobuf:"bytes,4,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
|
||||
Metadata map[string]string `sentinel:"" protobuf:"bytes,4,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
|
||||
// CreationTime is the time at which this entity is first created.
|
||||
CreationTime *google_protobuf.Timestamp `protobuf:"bytes,5,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"`
|
||||
CreationTime *google_protobuf.Timestamp `sentinel:"" protobuf:"bytes,5,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"`
|
||||
// LastUpdateTime is the most recent time at which the properties of this
|
||||
// entity got modified. This is helpful in filtering out entities based on
|
||||
// its age and to take action on them, if desired.
|
||||
LastUpdateTime *google_protobuf.Timestamp `protobuf:"bytes,6,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"`
|
||||
LastUpdateTime *google_protobuf.Timestamp `sentinel:"" protobuf:"bytes,6,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"`
|
||||
// MergedEntityIDs are the entities which got merged to this one. Entities
|
||||
// will be indexed based on all the entities that got merged into it. This
|
||||
// helps to apply the actions on this entity on the tokens that are merged
|
||||
// to the merged entities. Merged entities will be deleted entirely and
|
||||
// this is the only trackable trail of its earlier presence.
|
||||
MergedEntityIDs []string `protobuf:"bytes,7,rep,name=merged_entity_ids,json=mergedEntityIDs" json:"merged_entity_ids,omitempty"`
|
||||
MergedEntityIDs []string `sentinel:"" protobuf:"bytes,7,rep,name=merged_entity_ids,json=mergedEntityIDs" json:"merged_entity_ids,omitempty"`
|
||||
// Policies the entity is entitled to
|
||||
Policies []string `protobuf:"bytes,8,rep,name=policies" json:"policies,omitempty"`
|
||||
Policies []string `sentinel:"" protobuf:"bytes,8,rep,name=policies" json:"policies,omitempty"`
|
||||
// BucketKeyHash is the MD5 hash of the storage bucket key into which this
|
||||
// entity is stored in the underlying storage. This is useful to find all
|
||||
// the entities belonging to a particular bucket during invalidation of the
|
||||
// storage key.
|
||||
BucketKeyHash string `protobuf:"bytes,9,opt,name=bucket_key_hash,json=bucketKeyHash" json:"bucket_key_hash,omitempty"`
|
||||
BucketKeyHash string `sentinel:"" protobuf:"bytes,9,opt,name=bucket_key_hash,json=bucketKeyHash" json:"bucket_key_hash,omitempty"`
|
||||
}
|
||||
|
||||
func (m *Entity) Reset() { *m = Entity{} }
|
||||
|
|
@ -252,39 +252,39 @@ func (m *Entity) GetBucketKeyHash() string {
|
|||
// alias object.
|
||||
type Alias struct {
|
||||
// ID is the unique identifier that represents this alias
|
||||
ID string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
|
||||
ID string `sentinel:"" protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
|
||||
// EntityID is the entity identifier to which this alias belongs to
|
||||
EntityID string `protobuf:"bytes,2,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"`
|
||||
EntityID string `sentinel:"" protobuf:"bytes,2,opt,name=entity_id,json=entityId" json:"entity_id,omitempty"`
|
||||
// MountType is the backend mount's type to which this alias belongs to.
|
||||
// This enables categorically querying aliases of specific backend types.
|
||||
MountType string `protobuf:"bytes,3,opt,name=mount_type,json=mountType" json:"mount_type,omitempty"`
|
||||
MountType string `sentinel:"" protobuf:"bytes,3,opt,name=mount_type,json=mountType" json:"mount_type,omitempty"`
|
||||
// MountAccessor is the backend mount's accessor to which this alias
|
||||
// belongs to.
|
||||
MountAccessor string `protobuf:"bytes,4,opt,name=mount_accessor,json=mountAccessor" json:"mount_accessor,omitempty"`
|
||||
MountAccessor string `sentinel:"" protobuf:"bytes,4,opt,name=mount_accessor,json=mountAccessor" json:"mount_accessor,omitempty"`
|
||||
// MountPath is the backend mount's path to which the Maccessor belongs to. This
|
||||
// field is not used for any operational purposes. This is only returned when
|
||||
// alias is read, only as a nicety.
|
||||
MountPath string `protobuf:"bytes,5,opt,name=mount_path,json=mountPath" json:"mount_path,omitempty"`
|
||||
MountPath string `sentinel:"" protobuf:"bytes,5,opt,name=mount_path,json=mountPath" json:"mount_path,omitempty"`
|
||||
// Metadata is the explicit metadata that clients set against an entity
|
||||
// which enables virtual grouping of aliases. Aliases will be indexed
|
||||
// against their metadata.
|
||||
Metadata map[string]string `protobuf:"bytes,6,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
|
||||
Metadata map[string]string `sentinel:"" protobuf:"bytes,6,rep,name=metadata" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
|
||||
// Name is the identifier of this alias in its authentication source.
|
||||
// This does not uniquely identify a alias in Vault. This in conjunction
|
||||
// with MountAccessor form to be the factors that represent a alias in a
|
||||
// unique way. Aliases will be indexed based on this combined uniqueness
|
||||
// factor.
|
||||
Name string `protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
|
||||
Name string `sentinel:"" protobuf:"bytes,7,opt,name=name" json:"name,omitempty"`
|
||||
// CreationTime is the time at which this alias was first created
|
||||
CreationTime *google_protobuf.Timestamp `protobuf:"bytes,8,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"`
|
||||
CreationTime *google_protobuf.Timestamp `sentinel:"" protobuf:"bytes,8,opt,name=creation_time,json=creationTime" json:"creation_time,omitempty"`
|
||||
// LastUpdateTime is the most recent time at which the properties of this
|
||||
// alias got modified. This is helpful in filtering out aliases based
|
||||
// on its age and to take action on them, if desired.
|
||||
LastUpdateTime *google_protobuf.Timestamp `protobuf:"bytes,9,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"`
|
||||
LastUpdateTime *google_protobuf.Timestamp `sentinel:"" protobuf:"bytes,9,opt,name=last_update_time,json=lastUpdateTime" json:"last_update_time,omitempty"`
|
||||
// MergedFromEntityIDs is the FIFO history of merging activity by entity IDs from
|
||||
// which this alias is transfered over to the entity to which it
|
||||
// currently belongs to.
|
||||
MergedFromEntityIDs []string `protobuf:"bytes,10,rep,name=merged_from_entity_ids,json=mergedFromEntityIDs" json:"merged_from_entity_ids,omitempty"`
|
||||
MergedFromEntityIDs []string `sentinel:"" protobuf:"bytes,10,rep,name=merged_from_entity_ids,json=mergedFromEntityIDs" json:"merged_from_entity_ids,omitempty"`
|
||||
}
|
||||
|
||||
func (m *Alias) Reset() { *m = Alias{} }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,16 @@
|
|||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// source: request_forwarding_service.proto
|
||||
|
||||
/*
|
||||
Package vault is a generated protocol buffer package.
|
||||
|
||||
It is generated from these files:
|
||||
request_forwarding_service.proto
|
||||
|
||||
It has these top-level messages:
|
||||
EchoRequest
|
||||
EchoReply
|
||||
*/
|
||||
package vault
|
||||
|
||||
import proto "github.com/golang/protobuf/proto"
|
||||
|
|
@ -18,6 +28,12 @@ var _ = proto.Marshal
|
|||
var _ = fmt.Errorf
|
||||
var _ = math.Inf
|
||||
|
||||
// This is a compile-time assertion to ensure that this generated file
|
||||
// is compatible with the proto package it is being compiled against.
|
||||
// A compilation error at this line likely means your copy of the
|
||||
// proto package needs to be updated.
|
||||
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
|
||||
|
||||
type EchoRequest struct {
|
||||
Message string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"`
|
||||
// ClusterAddr is used to send up a standby node's address to the active
|
||||
|
|
@ -31,7 +47,7 @@ type EchoRequest struct {
|
|||
func (m *EchoRequest) Reset() { *m = EchoRequest{} }
|
||||
func (m *EchoRequest) String() string { return proto.CompactTextString(m) }
|
||||
func (*EchoRequest) ProtoMessage() {}
|
||||
func (*EchoRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
|
||||
func (*EchoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
|
||||
|
||||
func (m *EchoRequest) GetMessage() string {
|
||||
if m != nil {
|
||||
|
|
@ -62,7 +78,7 @@ type EchoReply struct {
|
|||
func (m *EchoReply) Reset() { *m = EchoReply{} }
|
||||
func (m *EchoReply) String() string { return proto.CompactTextString(m) }
|
||||
func (*EchoReply) ProtoMessage() {}
|
||||
func (*EchoReply) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
|
||||
func (*EchoReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
|
||||
|
||||
func (m *EchoReply) GetMessage() string {
|
||||
if m != nil {
|
||||
|
|
@ -188,9 +204,9 @@ var _RequestForwarding_serviceDesc = grpc.ServiceDesc{
|
|||
Metadata: "request_forwarding_service.proto",
|
||||
}
|
||||
|
||||
func init() { proto.RegisterFile("request_forwarding_service.proto", fileDescriptor1) }
|
||||
func init() { proto.RegisterFile("request_forwarding_service.proto", fileDescriptor0) }
|
||||
|
||||
var fileDescriptor1 = []byte{
|
||||
var fileDescriptor0 = []byte{
|
||||
// 261 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x3f, 0x4f, 0xc3, 0x30,
|
||||
0x10, 0xc5, 0x9b, 0x96, 0x3f, 0x8a, 0x5b, 0x10, 0x18, 0x86, 0x28, 0x53, 0x08, 0x4b, 0x27, 0x47,
|
||||
|
|
|
|||
Loading…
Reference in New Issue