proxycfg: reference to entry in map should not panic

hashicorp · Jun 17, 2021 · 5204383 · 5204383
1 parent 41ec132
commit 5204383
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.changelog/10423.txt b/.changelog/10423.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+proxycfg: reference to entry in map should not panic.
+```
diff --git a/agent/proxycfg/state.go b/agent/proxycfg/state.go
@@ -846,44 +846,39 @@ func (s *state) handleUpdateConnectProxy(ctx context.Context, u cache.UpdateEven
 
 		// Clean up data from services that were not in the update
 		for sn := range snap.ConnectProxy.WatchedUpstreams {
-			upstream := snap.ConnectProxy.UpstreamConfig[sn]
-			if upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
+			if upstream, ok := snap.ConnectProxy.UpstreamConfig[sn]; ok && upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
 				continue
 			}
 			if _, ok := seenServices[sn]; !ok {
 				delete(snap.ConnectProxy.WatchedUpstreams, sn)
 			}
 		}
 		for sn := range snap.ConnectProxy.WatchedUpstreamEndpoints {
-			upstream := snap.ConnectProxy.UpstreamConfig[sn]
-			if upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
+			if upstream, ok := snap.ConnectProxy.UpstreamConfig[sn]; ok && upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
 				continue
 			}
 			if _, ok := seenServices[sn]; !ok {
 				delete(snap.ConnectProxy.WatchedUpstreamEndpoints, sn)
 			}
 		}
 		for sn := range snap.ConnectProxy.WatchedGateways {
-			upstream := snap.ConnectProxy.UpstreamConfig[sn]
-			if upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
+			if upstream, ok := snap.ConnectProxy.UpstreamConfig[sn]; ok && upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
 				continue
 			}
 			if _, ok := seenServices[sn]; !ok {
 				delete(snap.ConnectProxy.WatchedGateways, sn)
 			}
 		}
 		for sn := range snap.ConnectProxy.WatchedGatewayEndpoints {
-			upstream := snap.ConnectProxy.UpstreamConfig[sn]
-			if upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
+			if upstream, ok := snap.ConnectProxy.UpstreamConfig[sn]; ok && upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
 				continue
 			}
 			if _, ok := seenServices[sn]; !ok {
 				delete(snap.ConnectProxy.WatchedGatewayEndpoints, sn)
 			}
 		}
 		for sn, cancelFn := range snap.ConnectProxy.WatchedDiscoveryChains {
-			upstream := snap.ConnectProxy.UpstreamConfig[sn]
-			if upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
+			if upstream, ok := snap.ConnectProxy.UpstreamConfig[sn]; ok && upstream.Datacenter != "" && upstream.Datacenter != s.source.Datacenter {
 				continue
 			}
 			if _, ok := seenServices[sn]; !ok {