mirror of
https://github.com/status-im/consul.git
synced 2025-02-19 00:56:45 +00:00
Protobuf Refactoring for Multi-Module Cleanliness This commit includes the following: Moves all packages that were within proto/ to proto/private Rewrites imports to account for the packages being moved Adds in buf.work.yaml to enable buf workspaces Names the proto-public buf module so that we can override the Go package imports within proto/buf.yaml Bumps the buf version dependency to 1.14.0 (I was trying out the version to see if it would get around an issue - it didn't but it also doesn't break things and it seemed best to keep up with the toolchain changes) Why: In the future we will need to consume other protobuf dependencies such as the Google HTTP annotations for openapi generation or grpc-gateway usage. There were some recent changes to have our own ratelimiting annotations. The two combined were not working when I was trying to use them together (attempting to rebase another branch) Buf workspaces should be the solution to the problem Buf workspaces means that each module will have generated Go code that embeds proto file names relative to the proto dir and not the top level repo root. This resulted in proto file name conflicts in the Go global protobuf type registry. The solution to that was to add in a private/ directory into the path within the proto/ directory. That then required rewriting all the imports. Is this safe? AFAICT yes The gRPC wire protocol doesn't seem to care about the proto file names (although the Go grpc code does tack on the proto file name as Metadata in the ServiceDesc) Other than imports, there were no changes to any generated code as a result of this.
187 lines
5.6 KiB
Go
187 lines
5.6 KiB
Go
package pbcommon
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/hashicorp/consul/agent/structs"
|
|
durationpb "google.golang.org/protobuf/types/known/durationpb"
|
|
)
|
|
|
|
// IsRead is always true for QueryOption
|
|
func (q *QueryOptions) IsRead() bool {
|
|
return true
|
|
}
|
|
|
|
// AllowStaleRead returns whether a stale read should be allowed
|
|
func (q *QueryOptions) AllowStaleRead() bool {
|
|
return q.AllowStale
|
|
}
|
|
|
|
func (q *QueryOptions) TokenSecret() string {
|
|
return q.Token
|
|
}
|
|
|
|
func (q *QueryOptions) SetTokenSecret(s string) {
|
|
q.Token = s
|
|
}
|
|
|
|
// SetToken is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetToken(token string) {
|
|
q.Token = token
|
|
}
|
|
|
|
// SetMinQueryIndex is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetMinQueryIndex(minQueryIndex uint64) {
|
|
q.MinQueryIndex = minQueryIndex
|
|
}
|
|
|
|
// SetMaxQueryTime is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetMaxQueryTime(maxQueryTime time.Duration) {
|
|
q.MaxQueryTime = durationpb.New(maxQueryTime)
|
|
}
|
|
|
|
// SetAllowStale is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetAllowStale(allowStale bool) {
|
|
q.AllowStale = allowStale
|
|
}
|
|
|
|
// SetRequireConsistent is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetRequireConsistent(requireConsistent bool) {
|
|
q.RequireConsistent = requireConsistent
|
|
}
|
|
|
|
// SetUseCache is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetUseCache(useCache bool) {
|
|
q.UseCache = useCache
|
|
}
|
|
|
|
// SetMaxStaleDuration is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetMaxStaleDuration(maxStaleDuration time.Duration) {
|
|
q.MaxStaleDuration = durationpb.New(maxStaleDuration)
|
|
}
|
|
|
|
// SetMaxAge is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetMaxAge(maxAge time.Duration) {
|
|
q.MaxAge = durationpb.New(maxAge)
|
|
}
|
|
|
|
// SetMustRevalidate is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetMustRevalidate(mustRevalidate bool) {
|
|
q.MustRevalidate = mustRevalidate
|
|
}
|
|
|
|
// SetStaleIfError is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetStaleIfError(staleIfError time.Duration) {
|
|
q.StaleIfError = durationpb.New(staleIfError)
|
|
}
|
|
|
|
func (q *QueryOptions) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime, defaultQueryTime time.Duration) (bool, error) {
|
|
// In addition to BlockingTimeout, allow for an additional rpcHoldTimeout buffer
|
|
// in case we need to wait for a leader election.
|
|
return time.Since(start) > rpcHoldTimeout+q.BlockingTimeout(maxQueryTime, defaultQueryTime), nil
|
|
}
|
|
|
|
// BlockingTimeout implements pool.BlockableQuery
|
|
func (q *QueryOptions) BlockingTimeout(maxQueryTime, defaultQueryTime time.Duration) time.Duration {
|
|
maxTime := q.MaxQueryTime.AsDuration()
|
|
o := structs.QueryOptions{
|
|
MaxQueryTime: maxTime,
|
|
MinQueryIndex: q.MinQueryIndex,
|
|
}
|
|
return o.BlockingTimeout(maxQueryTime, defaultQueryTime)
|
|
}
|
|
|
|
// SetFilter is needed to implement the structs.QueryOptionsCompat interface
|
|
func (q *QueryOptions) SetFilter(filter string) {
|
|
q.Filter = filter
|
|
}
|
|
|
|
// WriteRequest only applies to writes, always false
|
|
//
|
|
// IsRead implements structs.RPCInfo
|
|
func (w *WriteRequest) IsRead() bool {
|
|
return false
|
|
}
|
|
|
|
// SetTokenSecret implements structs.RPCInfo
|
|
func (w *WriteRequest) TokenSecret() string {
|
|
return w.Token
|
|
}
|
|
|
|
// SetTokenSecret implements structs.RPCInfo
|
|
func (w *WriteRequest) SetTokenSecret(s string) {
|
|
w.Token = s
|
|
}
|
|
|
|
// AllowStaleRead returns whether a stale read should be allowed
|
|
//
|
|
// AllowStaleRead implements structs.RPCInfo
|
|
func (w *WriteRequest) AllowStaleRead() bool {
|
|
return false
|
|
}
|
|
|
|
// HasTimedOut implements structs.RPCInfo
|
|
func (w *WriteRequest) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime, defaultQueryTime time.Duration) (bool, error) {
|
|
return time.Since(start) > rpcHoldTimeout, nil
|
|
}
|
|
|
|
// IsRead implements structs.RPCInfo
|
|
func (r *ReadRequest) IsRead() bool {
|
|
return true
|
|
}
|
|
|
|
// AllowStaleRead implements structs.RPCInfo
|
|
func (r *ReadRequest) AllowStaleRead() bool {
|
|
// TODO(partitions): plumb this?
|
|
return false
|
|
}
|
|
|
|
// TokenSecret implements structs.RPCInfo
|
|
func (r *ReadRequest) TokenSecret() string {
|
|
return r.Token
|
|
}
|
|
|
|
// SetTokenSecret implements structs.RPCInfo
|
|
func (r *ReadRequest) SetTokenSecret(token string) {
|
|
r.Token = token
|
|
}
|
|
|
|
// HasTimedOut implements structs.RPCInfo
|
|
func (r *ReadRequest) HasTimedOut(start time.Time, rpcHoldTimeout, _, _ time.Duration) (bool, error) {
|
|
return time.Since(start) > rpcHoldTimeout, nil
|
|
}
|
|
|
|
// RequestDatacenter implements structs.RPCInfo
|
|
func (td *TargetDatacenter) RequestDatacenter() string {
|
|
return td.Datacenter
|
|
}
|
|
|
|
// SetLastContact is needed to implement the structs.QueryMetaCompat interface
|
|
func (q *QueryMeta) SetLastContact(lastContact time.Duration) {
|
|
q.LastContact = durationpb.New(lastContact)
|
|
}
|
|
|
|
// SetKnownLeader is needed to implement the structs.QueryMetaCompat interface
|
|
func (q *QueryMeta) SetKnownLeader(knownLeader bool) {
|
|
q.KnownLeader = knownLeader
|
|
}
|
|
|
|
// SetIndex is needed to implement the structs.QueryMetaCompat interface
|
|
func (q *QueryMeta) SetIndex(index uint64) {
|
|
q.Index = index
|
|
}
|
|
|
|
// SetConsistencyLevel is needed to implement the structs.QueryMetaCompat interface
|
|
func (q *QueryMeta) SetConsistencyLevel(consistencyLevel string) {
|
|
q.ConsistencyLevel = consistencyLevel
|
|
}
|
|
|
|
func (q *QueryMeta) GetBackend() structs.QueryBackend {
|
|
return structs.QueryBackend(0)
|
|
}
|
|
|
|
// SetResultsFilteredByACLs is needed to implement the structs.QueryMetaCompat interface
|
|
func (q *QueryMeta) SetResultsFilteredByACLs(v bool) {
|
|
q.ResultsFilteredByACLs = v
|
|
}
|