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

PR comment and better formatting

This commit is contained in:
Chris Piraino 2020-05-11 14:04:59 -05:00
parent fb9ee9d892
commit 74c0543ef2
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
agent/consul/state/catalog.go
View File

@ -2524,7 +2524,15 @@ func (s *Store) updateGatewayServices(tx *memdb.Txn, idx uint64, conf structs.Co
return nil return nil
} }
func (s *Store) ingressConfigGatewayServices(tx *memdb.Txn, gateway structs.ServiceID, conf structs.ConfigEntry, entMeta *structs.EnterpriseMeta) (bool, structs.GatewayServices, error) { // ingressConfigGatewayServices constructs a list of GatewayService structs for
// insertion into the memdb table, specific to ingress gateways. The boolean
// returned indicates that there are no changes necessary to the memdb table.
func (s *Store) ingressConfigGatewayServices(
tx *memdb.Txn,
gateway structs.ServiceID,
conf structs.ConfigEntry,
entMeta *structs.EnterpriseMeta,
) (bool, structs.GatewayServices, error) {
entry, ok := conf.(*structs.IngressGatewayConfigEntry) entry, ok := conf.(*structs.IngressGatewayConfigEntry)
if !ok { if !ok {
return false, nil, fmt.Errorf("unexpected config entry type: %T", conf) return false, nil, fmt.Errorf("unexpected config entry type: %T", conf)
@ -2560,7 +2568,16 @@ func (s *Store) ingressConfigGatewayServices(tx *memdb.Txn, gateway structs.Serv
return false, gatewayServices, nil return false, gatewayServices, nil
} }
func (s *Store) terminatingConfigGatewayServices(tx *memdb.Txn, gateway structs.ServiceID, conf structs.ConfigEntry, entMeta *structs.EnterpriseMeta) (bool, structs.GatewayServices, error) { // terminatingConfigGatewayServices constructs a list of GatewayService structs
// for insertion into the memdb table, specific to terminating gateways. The
// boolean returned indicates that there are no changes necessary to the memdb
// table.
func (s *Store) terminatingConfigGatewayServices(
tx *memdb.Txn,
gateway structs.ServiceID,
conf structs.ConfigEntry,
entMeta *structs.EnterpriseMeta,
) (bool, structs.GatewayServices, error) {
entry, ok := conf.(*structs.TerminatingGatewayConfigEntry) entry, ok := conf.(*structs.TerminatingGatewayConfigEntry)
if !ok { if !ok {
return false, nil, fmt.Errorf("unexpected config entry type: %T", conf) return false, nil, fmt.Errorf("unexpected config entry type: %T", conf)

1
agent/consul/state/catalog_test.go
View File

@ -4545,7 +4545,6 @@ func TestStateStore_GatewayServices_Terminating(t *testing.T) {
}, nil)) }, nil))
assert.False(t, watchFired(ws)) assert.False(t, watchFired(ws))
ws = memdb.NewWatchSet()
idx, out, err = s.GatewayServices(ws, "gateway", nil) idx, out, err = s.GatewayServices(ws, "gateway", nil)
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, idx, uint64(21)) assert.Equal(t, idx, uint64(21))