From cc4ff3ae02870970929713c91f70f1ba0eb676c2 Mon Sep 17 00:00:00 2001 From: freddygv Date: Fri, 12 Jun 2020 09:34:02 -0600 Subject: [PATCH] Fixup stray sid references --- agent/consul/state/catalog.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/consul/state/catalog.go b/agent/consul/state/catalog.go index f24b20e4c..575213d17 100644 --- a/agent/consul/state/catalog.go +++ b/agent/consul/state/catalog.go @@ -879,8 +879,8 @@ func (s *Store) serviceListTxn(tx *memdb.Txn, ws memdb.WatchSet, entMeta *struct } results := make(structs.ServiceList, 0, len(unique)) - for sid, _ := range unique { - results = append(results, structs.ServiceName{Name: sid.Name, EnterpriseMeta: sid.EnterpriseMeta}) + for sn, _ := range unique { + results = append(results, structs.ServiceName{Name: sn.Name, EnterpriseMeta: sn.EnterpriseMeta}) } return idx, results, nil @@ -2020,8 +2020,8 @@ func (s *Store) CheckIngressServiceNodes(ws memdb.WatchSet, serviceName string, } var results structs.CheckServiceNodes - for sid := range names { - idx, n, err := s.checkServiceNodesTxn(tx, ws, sid.Name, false, &sid.EnterpriseMeta) + for sn := range names { + idx, n, err := s.checkServiceNodesTxn(tx, ws, sn.Name, false, &sn.EnterpriseMeta) if err != nil { return 0, nil, err }