status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use split wildcard partition name 

This way OSS avoids passing a non-empty label, which will be rejected in
OSS consul.
This commit is contained in:
freddygv 2022-10-13 16:54:14 -06:00
parent f48d7fbe04
commit bf51021c07
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
acl/acl_oss.go
View File

@ -4,7 +4,8 @@
package acl package acl
const ( const (
DefaultPartitionName = "" WildcardPartitionName = ""
DefaultPartitionName = ""
) )
// Reviewer Note: This is a little bit strange; one might want it to be "" like partition name // Reviewer Note: This is a little bit strange; one might want it to be "" like partition name

3
agent/proxycfg/mesh_gateway.go
View File

@ -9,6 +9,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/hashicorp/consul/acl"
"github.com/hashicorp/go-hclog" "github.com/hashicorp/go-hclog"
cachetype "github.com/hashicorp/consul/agent/cache-types" cachetype "github.com/hashicorp/consul/agent/cache-types"
@ -564,7 +565,7 @@ func (s *handlerMeshGateway) handleUpdate(ctx context.Context, u UpdateEvent, sn
peeringListCtx, cancel := context.WithCancel(ctx) peeringListCtx, cancel := context.WithCancel(ctx)
err := s.dataSources.PeeringList.Notify(peeringListCtx, &cachetype.PeeringListRequest{ err := s.dataSources.PeeringList.Notify(peeringListCtx, &cachetype.PeeringListRequest{
Request: &pbpeering.PeeringListRequest{ Request: &pbpeering.PeeringListRequest{
Partition: structs.WildcardSpecifier, Partition: acl.WildcardPartitionName,
}, },
}, peerServersWatchID, s.ch) }, peerServersWatchID, s.ch)
if err != nil { if err != nil {