3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-06 02:09:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix any shadowing

Browse source
This commit is contained in:
Caleb Doxsey 2023-04-04 14:08:38 -06:00
parent d23a110e6e
commit 2f43328c39
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/controlplane/xds.go
View file

@ -25,11 +25,10 @@ func (srv *Server) buildDiscoveryResources(ctx context.Context) (map[string][]*e
return nil, err return nil, err
} }
for _, cluster := range clusters { for _, cluster := range clusters {
any := protoutil.NewAny(cluster)
resources[clusterTypeURL] = append(resources[clusterTypeURL], &envoy_service_discovery_v3.Resource{ resources[clusterTypeURL] = append(resources[clusterTypeURL], &envoy_service_discovery_v3.Resource{
Name: cluster.Name, Name: cluster.Name,
Version: hex.EncodeToString(cryptutil.HashProto(cluster)), Version: hex.EncodeToString(cryptutil.HashProto(cluster)),
Resource: any, Resource: protoutil.NewAny(cluster),
}) })
} }
@ -38,11 +37,10 @@ func (srv *Server) buildDiscoveryResources(ctx context.Context) (map[string][]*e
return nil, err return nil, err
} }
for _, listener := range listeners { for _, listener := range listeners {
any := protoutil.NewAny(listener)
resources[listenerTypeURL] = append(resources[listenerTypeURL], &envoy_service_discovery_v3.Resource{ resources[listenerTypeURL] = append(resources[listenerTypeURL], &envoy_service_discovery_v3.Resource{
Name: listener.Name, Name: listener.Name,
Version: hex.EncodeToString(cryptutil.HashProto(listener)), Version: hex.EncodeToString(cryptutil.HashProto(listener)),
Resource: any, Resource: protoutil.NewAny(listener),
}) })
} }