Skip to content

Commit

Permalink
Fix go vet complaints
Browse files Browse the repository at this point in the history
  • Loading branch information
@banks
banks committed May 21, 2019
1 parent aa35597 commit e3648eb
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 24 deletions.
4 changes: 2 additions & 2 deletions agent/xds/clusters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func (s *Server) makeAppCluster(cfgSnap *proxycfg.ConfigSnapshot) (*envoy.Cluste
c = &envoy.Cluster{
Name: LocalAppClusterName,
ConnectTimeout: time.Duration(cfg.LocalConnectTimeoutMs) * time.Millisecond,
ClusterDiscoveryType: &envoy.Cluster_Type{envoy.Cluster_STATIC},
ClusterDiscoveryType: &envoy.Cluster_Type{Type: envoy.Cluster_STATIC},
LoadAssignment: &envoy.ClusterLoadAssignment{
ClusterName: LocalAppClusterName,
Endpoints: []envoyendpoint.LocalityLbEndpoints{
Expand Down Expand Up @@ -113,7 +113,7 @@ func (s *Server) makeUpstreamCluster(upstream structs.Upstream, cfgSnap *proxycf
c = &envoy.Cluster{
Name: upstream.Identifier(),
ConnectTimeout: time.Duration(cfg.ConnectTimeoutMs) * time.Millisecond,
ClusterDiscoveryType: &envoy.Cluster_Type{envoy.Cluster_EDS},
ClusterDiscoveryType: &envoy.Cluster_Type{Type: envoy.Cluster_EDS},
EdsClusterConfig: &envoy.Cluster_EdsClusterConfig{
EdsConfig: &envoycore.ConfigSource{
ConfigSourceSpecifier: &envoycore.ConfigSource_Ads{
Expand Down
2 changes: 1 addition & 1 deletion agent/xds/endpoints.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func endpointsFromSnapshot(cfgSnap *proxycfg.ConfigSnapshot, token string) ([]pr

func makeEndpoint(clusterName, host string, port int) envoyendpoint.LbEndpoint {
return envoyendpoint.LbEndpoint{
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{&envoyendpoint.Endpoint{
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{Endpoint: &envoyendpoint.Endpoint{
Address: makeAddressPtr(host, port),
},
}}
Expand Down
42 changes: 24 additions & 18 deletions agent/xds/endpoints_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,18 @@ func Test_makeLoadAssignment(t *testing.T) {
Endpoints: []envoyendpoint.LocalityLbEndpoints{{
LbEndpoints: []envoyendpoint.LbEndpoint{
envoyendpoint.LbEndpoint{
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{&envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.10", 1234),
}},
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{
Endpoint: &envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.10", 1234),
}},
HealthStatus: core.HealthStatus_HEALTHY,
LoadBalancingWeight: makeUint32Value(1),
},
envoyendpoint.LbEndpoint{
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{&envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.20", 1234),
}},
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{
Endpoint: &envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.20", 1234),
}},
HealthStatus: core.HealthStatus_HEALTHY,
LoadBalancingWeight: makeUint32Value(1),
},
Expand All @@ -140,16 +142,18 @@ func Test_makeLoadAssignment(t *testing.T) {
Endpoints: []envoyendpoint.LocalityLbEndpoints{{
LbEndpoints: []envoyendpoint.LbEndpoint{
envoyendpoint.LbEndpoint{
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{&envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.10", 1234),
}},
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{
Endpoint: &envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.10", 1234),
}},
HealthStatus: core.HealthStatus_HEALTHY,
LoadBalancingWeight: makeUint32Value(10),
},
envoyendpoint.LbEndpoint{
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{&envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.20", 1234),
}},
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{
Endpoint: &envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.20", 1234),
}},
HealthStatus: core.HealthStatus_HEALTHY,
LoadBalancingWeight: makeUint32Value(5),
},
Expand All @@ -166,16 +170,18 @@ func Test_makeLoadAssignment(t *testing.T) {
Endpoints: []envoyendpoint.LocalityLbEndpoints{{
LbEndpoints: []envoyendpoint.LbEndpoint{
envoyendpoint.LbEndpoint{
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{&envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.10", 1234),
}},
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{
Endpoint: &envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.10", 1234),
}},
HealthStatus: core.HealthStatus_HEALTHY,
LoadBalancingWeight: makeUint32Value(1),
},
envoyendpoint.LbEndpoint{
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{&envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.20", 1234),
}},
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{
Endpoint: &envoyendpoint.Endpoint{
Address: makeAddressPtr("10.10.10.20", 1234),
}},
HealthStatus: core.HealthStatus_UNHEALTHY,
LoadBalancingWeight: makeUint32Value(1),
},
Expand Down
6 changes: 3 additions & 3 deletions agent/xds/listeners.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ func makeListenerFilter(protocol, filterName, cluster, statPrefix string, ingres
func makeTCPProxyFilter(filterName, cluster, statPrefix string) (envoylistener.Filter, error) {
cfg := &envoytcp.TcpProxy{
StatPrefix: makeStatPrefix("tcp", statPrefix, filterName),
ClusterSpecifier: &envoytcp.TcpProxy_Cluster{cluster},
ClusterSpecifier: &envoytcp.TcpProxy_Cluster{Cluster: cluster},
}
return makeFilter("envoy.tcp_proxy", cfg)
}
Expand Down Expand Up @@ -313,7 +313,7 @@ func makeHTTPFilter(filterName, cluster, statPrefix string, ingress, grpc, http2
// Add grpc bridge before router
cfg.HttpFilters = append([]*envoyhttp.HttpFilter{&envoyhttp.HttpFilter{
Name: "envoy.grpc_http1_bridge",
ConfigType: &envoyhttp.HttpFilter_Config{&types.Struct{}},
ConfigType: &envoyhttp.HttpFilter_Config{Config: &types.Struct{}},
}}, cfg.HttpFilters...)
}

Expand Down Expand Up @@ -355,7 +355,7 @@ func makeFilter(name string, cfg proto.Message) (envoylistener.Filter, error) {

return envoylistener.Filter{
Name: name,
ConfigType: &envoylistener.Filter_Config{cfgStruct},
ConfigType: &envoylistener.Filter_Config{Config: cfgStruct},
}, nil
}

Expand Down

0 comments on commit e3648eb

Please sign in to comment.