github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8176 from hashicorp/dnephin/add-linter-unparam-1 

lint: add unparam linter and fix some of the issues
pull/8191/head
Daniel Nephin 2020-06-25 15:34:48 -04:00 committed by GitHub
parent 70cf674d72 0279bf6fe5
commit a891ee8428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 141 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.golangci.yml
View File

@ -6,6 +6,7 @@ linters:
- unconvert - unconvert
- staticcheck - staticcheck
- ineffassign - ineffassign
- unparam
issues: issues:
# Disable the default exclude list so that all excludes are explicitly # Disable the default exclude list so that all excludes are explicitly
@ -16,7 +17,36 @@ issues:
# Temp Ignore SA9004: only the first constant in this group has an explicit type # Temp Ignore SA9004: only the first constant in this group has an explicit type
# https://staticcheck.io/docs/checks#SA9004 # https://staticcheck.io/docs/checks#SA9004
- linters: [staticcheck] - linters: [staticcheck]
text: "SA9004:" text: 'SA9004:'
# An argument that always receives the same value is often not a problem.
- linters: [unparam]
text: 'always receives'
# Often functions will implement an interface that returns an error without
# needing to return an error. Sometimes the error return value is unnecessary
# but a linter can not tell the difference.
- linters: [unparam]
text: 'result \d+ \(error\) is always nil'
# Allow unused parameters to start with an underscore. Arguments with a name
# of '_' are already ignored.
# Ignoring longer names that start with underscore allow for better
# self-documentation than a single underscore by itself. Underscore arguments
# should generally only be used when a function is implementing an interface.
- linters: [unparam]
text: '`_[^`]*` is unused'
# Temp ignore some common unused parameters so that unparam can be added
# incrementally.
- linters: [unparam]
text: '`(t|resp|req|entMeta)` is unused'
# Temp ignore everything in _oss(_test).go and _ent(_test).go. Many of these
# could use underscore to ignore the unused arguments, but the "always returns"
# issue will likely remain in oss, and will need to be excluded.
- linters: [unparam]
path: '(_oss.go|_oss_test.go|_ent.go|_ent_test.go)'
linters-settings: linters-settings:
gofmt: gofmt:

6
agent/acl_endpoint.go
View File

@ -20,7 +20,7 @@ type aclBootstrapResponse struct {
// checkACLDisabled will return a standard response if ACLs are disabled. This // checkACLDisabled will return a standard response if ACLs are disabled. This
// returns true if they are disabled and we should not continue. // returns true if they are disabled and we should not continue.
func (s *HTTPServer) checkACLDisabled(resp http.ResponseWriter, req *http.Request) bool { func (s *HTTPServer) checkACLDisabled(resp http.ResponseWriter, _req *http.Request) bool {
if s.agent.delegate.ACLsEnabled() { if s.agent.delegate.ACLsEnabled() {
return false return false
} }
@ -298,7 +298,7 @@ func (s *HTTPServer) ACLPolicyWrite(resp http.ResponseWriter, req *http.Request,
return s.aclPolicyWriteInternal(resp, req, policyID, false) return s.aclPolicyWriteInternal(resp, req, policyID, false)
} }
func (s *HTTPServer) aclPolicyWriteInternal(resp http.ResponseWriter, req *http.Request, policyID string, create bool) (interface{}, error) { func (s *HTTPServer) aclPolicyWriteInternal(_resp http.ResponseWriter, req *http.Request, policyID string, create bool) (interface{}, error) {
args := structs.ACLPolicySetRequest{ args := structs.ACLPolicySetRequest{
Datacenter: s.agent.config.Datacenter, Datacenter: s.agent.config.Datacenter,
} }
@ -498,7 +498,7 @@ func (s *HTTPServer) ACLTokenSet(resp http.ResponseWriter, req *http.Request, to
return s.aclTokenSetInternal(resp, req, tokenID, false) return s.aclTokenSetInternal(resp, req, tokenID, false)
} }
func (s *HTTPServer) aclTokenSetInternal(resp http.ResponseWriter, req *http.Request, tokenID string, create bool) (interface{}, error) { func (s *HTTPServer) aclTokenSetInternal(_resp http.ResponseWriter, req *http.Request, tokenID string, create bool) (interface{}, error) {
args := structs.ACLTokenSetRequest{ args := structs.ACLTokenSetRequest{
Datacenter: s.agent.config.Datacenter, Datacenter: s.agent.config.Datacenter,
Create: create, Create: create,

6
agent/agent.go
View File

@ -2781,7 +2781,7 @@ func (a *Agent) addServiceInternal(req *addServiceRequest, snap map[structs.Chec
} }
for i := range checks { for i := range checks {
if err := a.addCheck(checks[i], chkTypes[i], service, persist, token, source); err != nil { if err := a.addCheck(checks[i], chkTypes[i], service, token, source); err != nil {
a.cleanupRegistration(cleanupServices, cleanupChecks) a.cleanupRegistration(cleanupServices, cleanupChecks)
return err return err
} }
@ -3101,7 +3101,7 @@ func (a *Agent) addCheckLocked(check *structs.HealthCheck, chkType *structs.Chec
} }
}() }()
err := a.addCheck(check, chkType, service, persist, token, source) err := a.addCheck(check, chkType, service, token, source)
if err != nil { if err != nil {
a.State.RemoveCheck(cid) a.State.RemoveCheck(cid)
return err return err
@ -3121,7 +3121,7 @@ func (a *Agent) addCheckLocked(check *structs.HealthCheck, chkType *structs.Chec
return nil return nil
} }
func (a *Agent) addCheck(check *structs.HealthCheck, chkType *structs.CheckType, service *structs.NodeService, persist bool, token string, source configSource) error { func (a *Agent) addCheck(check *structs.HealthCheck, chkType *structs.CheckType, service *structs.NodeService, token string, source configSource) error {
if check.CheckID == "" { if check.CheckID == "" {
return fmt.Errorf("CheckID missing") return fmt.Errorf("CheckID missing")
} }

2
agent/agent_endpoint.go
View File

@ -660,7 +660,7 @@ func (s *HTTPServer) AgentCheckUpdate(resp http.ResponseWriter, req *http.Reques
return s.agentCheckUpdate(resp, req, checkID, update.Status, update.Output) return s.agentCheckUpdate(resp, req, checkID, update.Status, update.Output)
} }
func (s *HTTPServer) agentCheckUpdate(resp http.ResponseWriter, req *http.Request, checkID types.CheckID, status string, output string) (interface{}, error) { func (s *HTTPServer) agentCheckUpdate(_resp http.ResponseWriter, req *http.Request, checkID types.CheckID, status string, output string) (interface{}, error) {
cid := structs.NewCheckID(checkID, nil) cid := structs.NewCheckID(checkID, nil)
// Get the provided token, if any, and vet against any ACL policies. // Get the provided token, if any, and vet against any ACL policies.

29
agent/agent_test.go
View File

@ -29,12 +29,14 @@ import (
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/internal/go-sso/oidcauth/oidcauthtest" "github.com/hashicorp/consul/internal/go-sso/oidcauth/oidcauthtest"
"github.com/hashicorp/consul/ipaddr" "github.com/hashicorp/consul/ipaddr"
"github.com/hashicorp/consul/lib"
"github.com/hashicorp/consul/sdk/freeport" "github.com/hashicorp/consul/sdk/freeport"
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/sdk/testutil/retry" "github.com/hashicorp/consul/sdk/testutil/retry"
"github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/testrpc"
"github.com/hashicorp/consul/types" "github.com/hashicorp/consul/types"
"github.com/hashicorp/go-uuid" "github.com/hashicorp/go-uuid"
"github.com/hashicorp/serf/coordinate"
"github.com/hashicorp/serf/serf" "github.com/hashicorp/serf/serf"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -3277,24 +3279,19 @@ func TestAgent_purgeCheckState(t *testing.T) {
} }
func TestAgent_GetCoordinate(t *testing.T) { func TestAgent_GetCoordinate(t *testing.T) {
t.Parallel() a := NewTestAgent(t, ``)
check := func(server bool) { defer a.Shutdown()
a := NewTestAgent(t, `
server = true
`)
defer a.Shutdown()
// This doesn't verify the returned coordinate, but it makes coords, err := a.GetLANCoordinate()
// sure that the agent chooses the correct Serf instance, require.NoError(t, err)
// depending on how it's configured as a client or a server. expected := lib.CoordinateSet{
// If it chooses the wrong one, this will crash. "": &coordinate.Coordinate{
if _, err := a.GetLANCoordinate(); err != nil { Error: 1.5,
t.Fatalf("err: %s", err) Height: 1e-05,
} Vec: []float64{0, 0, 0, 0, 0, 0, 0, 0},
},
} }
require.Equal(t, expected, coords)
check(true)
check(false)
} }
func TestAgent_reloadWatches(t *testing.T) { func TestAgent_reloadWatches(t *testing.T) {

26
agent/connect/ca/provider_consul.go
View File

@ -139,7 +139,7 @@ func (c *ConsulProvider) State() (map[string]string, error) {
// ActiveRoot returns the active root CA certificate. // ActiveRoot returns the active root CA certificate.
func (c *ConsulProvider) ActiveRoot() (string, error) { func (c *ConsulProvider) ActiveRoot() (string, error) {
_, providerState, err := c.getState() providerState, err := c.getState()
if err != nil { if err != nil {
return "", err return "", err
} }
@ -150,7 +150,7 @@ func (c *ConsulProvider) ActiveRoot() (string, error) {
// GenerateRoot initializes a new root certificate and private key // GenerateRoot initializes a new root certificate and private key
// if needed. // if needed.
func (c *ConsulProvider) GenerateRoot() error { func (c *ConsulProvider) GenerateRoot() error {
_, providerState, err := c.getState() providerState, err := c.getState()
if err != nil { if err != nil {
return err return err
} }
@ -205,7 +205,7 @@ func (c *ConsulProvider) GenerateRoot() error {
// GenerateIntermediateCSR creates a private key and generates a CSR // GenerateIntermediateCSR creates a private key and generates a CSR
// for another datacenter's root to sign. // for another datacenter's root to sign.
func (c *ConsulProvider) GenerateIntermediateCSR() (string, error) { func (c *ConsulProvider) GenerateIntermediateCSR() (string, error) {
_, providerState, err := c.getState() providerState, err := c.getState()
if err != nil { if err != nil {
return "", err return "", err
} }
@ -249,7 +249,7 @@ func (c *ConsulProvider) GenerateIntermediateCSR() (string, error) {
// SetIntermediate validates that the given intermediate is for the right private key // SetIntermediate validates that the given intermediate is for the right private key
// and writes the given intermediate and root certificates to the state. // and writes the given intermediate and root certificates to the state.
func (c *ConsulProvider) SetIntermediate(intermediatePEM, rootPEM string) error { func (c *ConsulProvider) SetIntermediate(intermediatePEM, rootPEM string) error {
_, providerState, err := c.getState() providerState, err := c.getState()
if err != nil { if err != nil {
return err return err
} }
@ -289,7 +289,7 @@ func (c *ConsulProvider) ActiveIntermediate() (string, error) {
return c.ActiveRoot() return c.ActiveRoot()
} }
_, providerState, err := c.getState() providerState, err := c.getState()
if err != nil { if err != nil {
return "", err return "", err
} }
@ -325,7 +325,7 @@ func (c *ConsulProvider) Sign(csr *x509.CertificateRequest) (string, error) {
defer c.Unlock() defer c.Unlock()
// Get the provider state // Get the provider state
_, providerState, err := c.getState() providerState, err := c.getState()
if err != nil { if err != nil {
return "", err return "", err
} }
@ -437,7 +437,7 @@ func (c *ConsulProvider) Sign(csr *x509.CertificateRequest) (string, error) {
// are met. It should return a signed CA certificate with a path length constraint // are met. It should return a signed CA certificate with a path length constraint
// of 0 to ensure that the certificate cannot be used to generate further CA certs. // of 0 to ensure that the certificate cannot be used to generate further CA certs.
func (c *ConsulProvider) SignIntermediate(csr *x509.CertificateRequest) (string, error) { func (c *ConsulProvider) SignIntermediate(csr *x509.CertificateRequest) (string, error) {
_, providerState, err := c.getState() providerState, err := c.getState()
if err != nil { if err != nil {
return "", err return "", err
} }
@ -520,7 +520,7 @@ func (c *ConsulProvider) CrossSignCA(cert *x509.Certificate) (string, error) {
} }
// Get the provider state // Get the provider state
_, providerState, err := c.getState() providerState, err := c.getState()
if err != nil { if err != nil {
return "", err return "", err
} }
@ -586,18 +586,18 @@ func (c *ConsulProvider) SupportsCrossSigning() (bool, error) {
// getState returns the current provider state from the state delegate, and returns // getState returns the current provider state from the state delegate, and returns
// ErrNotInitialized if no entry is found. // ErrNotInitialized if no entry is found.
func (c *ConsulProvider) getState() (uint64, *structs.CAConsulProviderState, error) { func (c *ConsulProvider) getState() (*structs.CAConsulProviderState, error) {
stateStore := c.Delegate.State() stateStore := c.Delegate.State()
idx, providerState, err := stateStore.CAProviderState(c.id) _, providerState, err := stateStore.CAProviderState(c.id)
if err != nil { if err != nil {
return 0, nil, err return nil, err
} }
if providerState == nil { if providerState == nil {
return 0, nil, ErrNotInitialized return nil, ErrNotInitialized
} }
return idx, providerState, nil return providerState, nil
} }
func (c *ConsulProvider) incrementAndGetNextSerialNumber() (uint64, error) { func (c *ConsulProvider) incrementAndGetNextSerialNumber() (uint64, error) {

10
agent/consul/authmethod/kubeauth/testing.go
View File

@ -94,7 +94,7 @@ func (s *TestAPIServer) SetAllowedServiceAccount(
} }
s.allowedServiceAccountJWT = jwt s.allowedServiceAccountJWT = jwt
s.replyRead = createReadServiceAccountFound(namespace, name, uid, overrideAnnotation, jwt) s.replyRead = createReadServiceAccountFound(namespace, name, uid, overrideAnnotation)
s.replyStatus = createTokenReviewFound(namespace, name, uid, jwt) s.replyStatus = createTokenReviewFound(namespace, name, uid, jwt)
} }
@ -223,10 +223,10 @@ func (s *TestAPIServer) handleReadServiceAccount(
} }
w.WriteHeader(http.StatusForbidden) w.WriteHeader(http.StatusForbidden)
} else if s.replyRead == nil { } else if s.replyRead == nil {
out = createReadServiceAccountNotFound(namespace, name) out = createReadServiceAccountNotFound(name)
w.WriteHeader(http.StatusNotFound) w.WriteHeader(http.StatusNotFound)
} else if s.replyRead.Namespace != namespace || s.replyRead.Name != name { } else if s.replyRead.Namespace != namespace || s.replyRead.Name != name {
out = createReadServiceAccountNotFound(namespace, name) out = createReadServiceAccountNotFound(name)
w.WriteHeader(http.StatusNotFound) w.WriteHeader(http.StatusNotFound)
} else { } else {
out = s.replyRead out = s.replyRead
@ -449,7 +449,7 @@ func createReadServiceAccountForbidden_NoAuthz() *metav1.Status {
) )
} }
func createReadServiceAccountNotFound(namespace, name string) *metav1.Status { func createReadServiceAccountNotFound(name string) *metav1.Status {
/* /*
STATUS: 404 STATUS: 404
{ {
@ -478,7 +478,7 @@ func createReadServiceAccountNotFound(namespace, name string) *metav1.Status {
) )
} }
func createReadServiceAccountFound(namespace, name, uid, overrideAnnotation, jwt string) *corev1.ServiceAccount { func createReadServiceAccountFound(namespace, name, uid, overrideAnnotation string) *corev1.ServiceAccount {
/* /*
STATUS: 200 STATUS: 200
{ {

4
agent/consul/intention_endpoint.go
View File

@ -152,7 +152,7 @@ func (s *Intention) prepareApplyUpdate(ident structs.ACLIdentity, authz acl.Auth
// prepareApplyDelete ensures that the intention specified by the ID in the request exists // prepareApplyDelete ensures that the intention specified by the ID in the request exists
// and that the requester is authorized to delete it // and that the requester is authorized to delete it
func (s *Intention) prepareApplyDelete(ident structs.ACLIdentity, authz acl.Authorizer, entMeta *structs.EnterpriseMeta, args *structs.IntentionRequest) error { func (s *Intention) prepareApplyDelete(ident structs.ACLIdentity, authz acl.Authorizer, args *structs.IntentionRequest) error {
// If this is not a create, then we have to verify the ID. // If this is not a create, then we have to verify the ID.
state := s.srv.fsm.State() state := s.srv.fsm.State()
_, ixn, err := state.IntentionGet(nil, args.Intention.ID) _, ixn, err := state.IntentionGet(nil, args.Intention.ID)
@ -217,7 +217,7 @@ func (s *Intention) Apply(
return err return err
} }
case structs.IntentionOpDelete: case structs.IntentionOpDelete:
if err := s.prepareApplyDelete(ident, authz, &entMeta, args); err != nil { if err := s.prepareApplyDelete(ident, authz, args); err != nil {
return err return err
} }
default: default:

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

@ -2145,7 +2145,7 @@ func (s *Store) checkServiceNodesTxn(tx *txn, ws memdb.WatchSet, serviceName str
ws.Add(iter.WatchCh()) ws.Add(iter.WatchCh())
} }
return s.parseCheckServiceNodes(tx, fallbackWS, idx, serviceName, results, err) return s.parseCheckServiceNodes(tx, fallbackWS, idx, results, err)
} }
// CheckServiceTagNodes is used to query all nodes and checks for a given // CheckServiceTagNodes is used to query all nodes and checks for a given
@ -2174,7 +2174,7 @@ func (s *Store) CheckServiceTagNodes(ws memdb.WatchSet, serviceName string, tags
// Get the table index. // Get the table index.
idx := s.maxIndexForService(tx, serviceName, serviceExists, true, entMeta) idx := s.maxIndexForService(tx, serviceName, serviceExists, true, entMeta)
return s.parseCheckServiceNodes(tx, ws, idx, serviceName, results, err) return s.parseCheckServiceNodes(tx, ws, idx, results, err)
} }
// GatewayServices is used to query all services associated with a gateway // GatewayServices is used to query all services associated with a gateway
@ -2214,7 +2214,7 @@ func (s *Store) GatewayServices(ws memdb.WatchSet, gateway string, entMeta *stru
// method used to return a rich set of results from a more simple query. // method used to return a rich set of results from a more simple query.
func (s *Store) parseCheckServiceNodes( func (s *Store) parseCheckServiceNodes(
tx *txn, ws memdb.WatchSet, idx uint64, tx *txn, ws memdb.WatchSet, idx uint64,
serviceName string, services structs.ServiceNodes, services structs.ServiceNodes,
err error) (uint64, structs.CheckServiceNodes, error) { err error) (uint64, structs.CheckServiceNodes, error) {
if err != nil { if err != nil {
return 0, nil, err return 0, nil, err
@ -2353,7 +2353,7 @@ func (s *Store) serviceDumpAllTxn(tx *txn, ws memdb.WatchSet, entMeta *structs.E
results = append(results, sn) results = append(results, sn)
} }
return s.parseCheckServiceNodes(tx, nil, idx, "", results, err) return s.parseCheckServiceNodes(tx, nil, idx, results, err)
} }
func (s *Store) serviceDumpKindTxn(tx *txn, ws memdb.WatchSet, kind structs.ServiceKind, entMeta *structs.EnterpriseMeta) (uint64, structs.CheckServiceNodes, error) { func (s *Store) serviceDumpKindTxn(tx *txn, ws memdb.WatchSet, kind structs.ServiceKind, entMeta *structs.EnterpriseMeta) (uint64, structs.CheckServiceNodes, error) {
@ -2374,7 +2374,7 @@ func (s *Store) serviceDumpKindTxn(tx *txn, ws memdb.WatchSet, kind structs.Serv
results = append(results, sn) results = append(results, sn)
} }
return s.parseCheckServiceNodes(tx, nil, idx, "", results, err) return s.parseCheckServiceNodes(tx, nil, idx, results, err)
} }
// parseNodes takes an iterator over a set of nodes and returns a struct // parseNodes takes an iterator over a set of nodes and returns a struct

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

@ -2908,7 +2908,7 @@ func ensureServiceVersion(t *testing.T, s *Store, ws memdb.WatchSet, serviceID s
} }
// Ensure index exist, if expectedIndex = -1, ensure the index does not exists // Ensure index exist, if expectedIndex = -1, ensure the index does not exists
func ensureIndexForService(t *testing.T, s *Store, ws memdb.WatchSet, serviceName string, expectedIndex uint64) { func ensureIndexForService(t *testing.T, s *Store, serviceName string, expectedIndex uint64) {
t.Helper() t.Helper()
tx := s.db.Txn(false) tx := s.db.Txn(false)
defer tx.Abort() defer tx.Abort()
@ -2993,10 +2993,10 @@ func TestStateStore_IndexIndependence(t *testing.T) {
s.DeleteCheck(15, "node2", types.CheckID("check_service_shared"), nil) s.DeleteCheck(15, "node2", types.CheckID("check_service_shared"), nil)
ensureServiceVersion(t, s, ws, "service_shared", 15, 2) ensureServiceVersion(t, s, ws, "service_shared", 15, 2)
ensureIndexForService(t, s, ws, "service_shared", 15) ensureIndexForService(t, s, "service_shared", 15)
s.DeleteService(16, "node2", "service_shared", nil) s.DeleteService(16, "node2", "service_shared", nil)
ensureServiceVersion(t, s, ws, "service_shared", 16, 1) ensureServiceVersion(t, s, ws, "service_shared", 16, 1)
ensureIndexForService(t, s, ws, "service_shared", 16) ensureIndexForService(t, s, "service_shared", 16)
s.DeleteService(17, "node1", "service_shared", nil) s.DeleteService(17, "node1", "service_shared", nil)
ensureServiceVersion(t, s, ws, "service_shared", 17, 0) ensureServiceVersion(t, s, ws, "service_shared", 17, 0)
@ -3007,7 +3007,7 @@ func TestStateStore_IndexIndependence(t *testing.T) {
ensureServiceVersion(t, s, ws, "service_shared", 17, 0) ensureServiceVersion(t, s, ws, "service_shared", 17, 0)
// No index should exist anymore, it must have been garbage collected // No index should exist anymore, it must have been garbage collected
ensureIndexForService(t, s, ws, "service_shared", 0) ensureIndexForService(t, s, "service_shared", 0)
if !watchFired(ws) { if !watchFired(ws) {
t.Fatalf("bad") t.Fatalf("bad")
} }

31
agent/consul/state/config_entry.go
View File

@ -195,14 +195,7 @@ func (s *Store) ensureConfigEntryTxn(tx *txn, idx uint64, conf structs.ConfigEnt
} }
raftIndex.ModifyIndex = idx raftIndex.ModifyIndex = idx
err = s.validateProposedConfigEntryInGraph( err = s.validateProposedConfigEntryInGraph(tx, conf.GetKind(), conf.GetName(), conf, entMeta)
tx,
idx,
conf.GetKind(),
conf.GetName(),
conf,
entMeta,
)
if err != nil { if err != nil {
return err // Err is already sufficiently decorated. return err // Err is already sufficiently decorated.
} }
@ -273,14 +266,7 @@ func (s *Store) DeleteConfigEntry(idx uint64, kind, name string, entMeta *struct
} }
} }
err = s.validateProposedConfigEntryInGraph( err = s.validateProposedConfigEntryInGraph(tx, kind, name, nil, entMeta)
tx,
idx,
kind,
name,
nil,
entMeta,
)
if err != nil { if err != nil {
return err // Err is already sufficiently decorated. return err // Err is already sufficiently decorated.
} }
@ -329,7 +315,6 @@ func (s *Store) insertConfigEntryWithTxn(tx *txn, idx uint64, conf structs.Confi
// to the caller that they can correct. // to the caller that they can correct.
func (s *Store) validateProposedConfigEntryInGraph( func (s *Store) validateProposedConfigEntryInGraph(
tx *txn, tx *txn,
idx uint64,
kind, name string, kind, name string,
next structs.ConfigEntry, next structs.ConfigEntry,
entMeta *structs.EnterpriseMeta, entMeta *structs.EnterpriseMeta,
@ -365,7 +350,7 @@ func (s *Store) validateProposedConfigEntryInGraph(
return fmt.Errorf("unhandled kind %q during validation of %q", kind, name) return fmt.Errorf("unhandled kind %q during validation of %q", kind, name)
} }
return s.validateProposedConfigEntryInServiceGraph(tx, idx, kind, name, next, validateAllChains, entMeta) return s.validateProposedConfigEntryInServiceGraph(tx, kind, name, next, validateAllChains, entMeta)
} }
func (s *Store) checkGatewayClash( func (s *Store) checkGatewayClash(
@ -392,7 +377,6 @@ var serviceGraphKinds = []string{
func (s *Store) validateProposedConfigEntryInServiceGraph( func (s *Store) validateProposedConfigEntryInServiceGraph(
tx *txn, tx *txn,
idx uint64,
kind, name string, kind, name string,
next structs.ConfigEntry, next structs.ConfigEntry,
validateAllChains bool, validateAllChains bool,
@ -424,13 +408,13 @@ func (s *Store) validateProposedConfigEntryInServiceGraph(
checkChains[sid] = struct{}{} checkChains[sid] = struct{}{}
iter, err := tx.Get(configTableName, "link", sid) iter, err := tx.Get(configTableName, "link", sid)
if err != nil {
return err
}
for raw := iter.Next(); raw != nil; raw = iter.Next() { for raw := iter.Next(); raw != nil; raw = iter.Next() {
entry := raw.(structs.ConfigEntry) entry := raw.(structs.ConfigEntry)
checkChains[structs.NewServiceID(entry.GetName(), entry.GetEnterpriseMeta())] = struct{}{} checkChains[structs.NewServiceID(entry.GetName(), entry.GetEnterpriseMeta())] = struct{}{}
} }
if err != nil {
return err
}
} }
overrides := map[structs.ConfigEntryKindName]structs.ConfigEntry{ overrides := map[structs.ConfigEntryKindName]structs.ConfigEntry{
@ -438,7 +422,7 @@ func (s *Store) validateProposedConfigEntryInServiceGraph(
} }
for chain := range checkChains { for chain := range checkChains {
if err := s.testCompileDiscoveryChain(tx, nil, chain.ID, overrides, &chain.EnterpriseMeta); err != nil { if err := s.testCompileDiscoveryChain(tx, chain.ID, overrides, &chain.EnterpriseMeta); err != nil {
return err return err
} }
} }
@ -448,7 +432,6 @@ func (s *Store) validateProposedConfigEntryInServiceGraph(
func (s *Store) testCompileDiscoveryChain( func (s *Store) testCompileDiscoveryChain(
tx *txn, tx *txn,
ws memdb.WatchSet,
chainName string, chainName string,
overrides map[structs.ConfigEntryKindName]structs.ConfigEntry, overrides map[structs.ConfigEntryKindName]structs.ConfigEntry,
entMeta *structs.EnterpriseMeta, entMeta *structs.EnterpriseMeta,

14
agent/dns.go
View File

@ -742,7 +742,7 @@ func (d *DNSServer) doDispatch(network string, remoteAddr net.Addr, req, resp *d
// Allow a "." in the node name, just join all the parts // Allow a "." in the node name, just join all the parts
node := strings.Join(queryParts, ".") node := strings.Join(queryParts, ".")
d.nodeLookup(cfg, network, datacenter, node, req, resp, maxRecursionLevel) d.nodeLookup(cfg, datacenter, node, req, resp, maxRecursionLevel)
case "query": case "query":
// ensure we have a query name // ensure we have a query name
if len(queryParts) < 1 { if len(queryParts) < 1 {
@ -836,7 +836,7 @@ func (d *DNSServer) computeRCode(err error) int {
} }
// nodeLookup is used to handle a node query // nodeLookup is used to handle a node query
func (d *DNSServer) nodeLookup(cfg *dnsConfig, network, datacenter, node string, req, resp *dns.Msg, maxRecursionLevel int) { func (d *DNSServer) nodeLookup(cfg *dnsConfig, datacenter, node string, req, resp *dns.Msg, maxRecursionLevel int) {
// Only handle ANY, A, AAAA, and TXT type requests // Only handle ANY, A, AAAA, and TXT type requests
qType := req.Question[0].Qtype qType := req.Question[0].Qtype
if qType != dns.TypeANY && qType != dns.TypeA && qType != dns.TypeAAAA && qType != dns.TypeTXT { if qType != dns.TypeANY && qType != dns.TypeA && qType != dns.TypeAAAA && qType != dns.TypeTXT {
@ -886,7 +886,7 @@ func (d *DNSServer) nodeLookup(cfg *dnsConfig, network, datacenter, node string,
} }
if cfg.NodeMetaTXT || qType == dns.TypeTXT || qType == dns.TypeANY { if cfg.NodeMetaTXT || qType == dns.TypeTXT || qType == dns.TypeANY {
metas := d.generateMeta(n.Datacenter, q.Name, n, cfg.NodeTTL) metas := d.generateMeta(q.Name, n, cfg.NodeTTL)
*metaTarget = append(*metaTarget, metas...) *metaTarget = append(*metaTarget, metas...)
} }
} }
@ -1142,7 +1142,8 @@ func trimUDPResponse(req, resp *dns.Msg, udpAnswerLimit int) (trimmed bool) {
} }
// trimDNSResponse will trim the response for UDP and TCP // trimDNSResponse will trim the response for UDP and TCP
func (d *DNSServer) trimDNSResponse(cfg *dnsConfig, network string, req, resp *dns.Msg) (trimmed bool) { func (d *DNSServer) trimDNSResponse(cfg *dnsConfig, network string, req, resp *dns.Msg) {
var trimmed bool
if network != "tcp" { if network != "tcp" {
trimmed = trimUDPResponse(req, resp, cfg.UDPAnswerLimit) trimmed = trimUDPResponse(req, resp, cfg.UDPAnswerLimit)
} else { } else {
@ -1152,7 +1153,6 @@ func (d *DNSServer) trimDNSResponse(cfg *dnsConfig, network string, req, resp *d
if trimmed && cfg.EnableTruncate { if trimmed && cfg.EnableTruncate {
resp.Truncated = true resp.Truncated = true
} }
return trimmed
} }
// lookupServiceNodes returns nodes with a given service. // lookupServiceNodes returns nodes with a given service.
@ -1775,7 +1775,7 @@ func (d *DNSServer) nodeServiceRecords(dc string, node structs.CheckServiceNode,
return d.makeRecordFromFQDN(dc, serviceAddr, node, req, ttl, cfg, maxRecursionLevel) return d.makeRecordFromFQDN(dc, serviceAddr, node, req, ttl, cfg, maxRecursionLevel)
} }
func (d *DNSServer) generateMeta(dc string, qName string, node *structs.Node, ttl time.Duration) []dns.RR { func (d *DNSServer) generateMeta(qName string, node *structs.Node, ttl time.Duration) []dns.RR {
extra := make([]dns.RR, 0, len(node.Meta)) extra := make([]dns.RR, 0, len(node.Meta))
for key, value := range node.Meta { for key, value := range node.Meta {
txt := value txt := value
@ -1817,7 +1817,7 @@ func (d *DNSServer) serviceSRVRecords(cfg *dnsConfig, dc string, nodes structs.C
resp.Extra = append(resp.Extra, extra...) resp.Extra = append(resp.Extra, extra...)
if cfg.NodeMetaTXT { if cfg.NodeMetaTXT {
resp.Extra = append(resp.Extra, d.generateMeta(dc, fmt.Sprintf("%s.node.%s.%s", node.Node.Node, dc, d.domain), node.Node, ttl)...) resp.Extra = append(resp.Extra, d.generateMeta(fmt.Sprintf("%s.node.%s.%s", node.Node.Node, dc, d.domain), node.Node, ttl)...)
} }
} }
} }

6
agent/dns_test.go
View File

@ -4569,7 +4569,7 @@ func testDNSServiceLookupResponseLimits(t *testing.T, answerLimit int, qType uin
} }
func checkDNSService(t *testing.T, generateNumNodes int, aRecordLimit int, qType uint16, func checkDNSService(t *testing.T, generateNumNodes int, aRecordLimit int, qType uint16,
expectedResultsCount int, udpSize uint16, udpAnswerLimit int) error { expectedResultsCount int, udpSize uint16) error {
a := NewTestAgent(t, ` a := NewTestAgent(t, `
node_name = "test-node" node_name = "test-node"
dns_config { dns_config {
@ -4710,7 +4710,7 @@ func TestDNS_ServiceLookup_ARecordLimits(t *testing.T) {
for idx, qType := range queriesLimited { for idx, qType := range queriesLimited {
t.Run(fmt.Sprintf("ARecordLimit %d qType: %d", idx, qType), func(t *testing.T) { t.Run(fmt.Sprintf("ARecordLimit %d qType: %d", idx, qType), func(t *testing.T) {
t.Parallel() t.Parallel()
err := checkDNSService(t, test.numNodesTotal, test.aRecordLimit, qType, test.expectedAResults, test.udpSize, test.udpAnswerLimit) err := checkDNSService(t, test.numNodesTotal, test.aRecordLimit, qType, test.expectedAResults, test.udpSize)
if err != nil { if err != nil {
t.Fatalf("Expected lookup %s to pass: %v", test.name, err) t.Fatalf("Expected lookup %s to pass: %v", test.name, err)
} }
@ -4719,7 +4719,7 @@ func TestDNS_ServiceLookup_ARecordLimits(t *testing.T) {
// No limits but the size of records for SRV records, since not subject to randomization issues // No limits but the size of records for SRV records, since not subject to randomization issues
t.Run("SRV lookup limitARecord", func(t *testing.T) { t.Run("SRV lookup limitARecord", func(t *testing.T) {
t.Parallel() t.Parallel()
err := checkDNSService(t, test.expectedSRVResults, test.aRecordLimit, dns.TypeSRV, test.numNodesTotal, test.udpSize, test.udpAnswerLimit) err := checkDNSService(t, test.expectedSRVResults, test.aRecordLimit, dns.TypeSRV, test.numNodesTotal, test.udpSize)
if err != nil { if err != nil {
t.Fatalf("Expected service SRV lookup %s to pass: %v", test.name, err) t.Fatalf("Expected service SRV lookup %s to pass: %v", test.name, err)
} }

8
agent/http_decode_test.go
View File

@ -873,7 +873,7 @@ func TestDecodeAgentRegisterCheck(t *testing.T) {
if err != nil && !tc.wantErr { if err != nil && !tc.wantErr {
t.Fatalf("expected nil error, got %v", err) t.Fatalf("expected nil error, got %v", err)
} }
if err := checkTypeHeaderTest(out, tc.want, ""); err != nil { if err := checkTypeHeaderTest(out, tc.want); err != nil {
t.Fatal(err) t.Fatal(err)
} }
}) })
@ -1747,7 +1747,7 @@ func TestDecodeAgentRegisterService(t *testing.T) {
if err != nil && !tc.wantErr { if err != nil && !tc.wantErr {
t.Fatalf("expected nil error, got %v", err) t.Fatalf("expected nil error, got %v", err)
} }
if err := checkTypeHeaderTest(out.Check, tc.want, "Check"); err != nil { if err := checkTypeHeaderTest(out.Check, tc.want); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if out.Checks == nil { if out.Checks == nil {
@ -1756,7 +1756,7 @@ func TestDecodeAgentRegisterService(t *testing.T) {
} }
return return
} }
if err := checkTypeHeaderTest(out.Checks[0], tc.want, "Checks[0]"); err != nil { if err := checkTypeHeaderTest(out.Checks[0], tc.want); err != nil {
t.Fatal(err) t.Fatal(err)
} }
}) })
@ -2523,7 +2523,7 @@ func checkTypeDurationTest(check interface{}, want time.Duration, prefix string)
// checkTypeDurationTest is a helper func to test the Header map in a CheckType or CheckDefiniton // checkTypeDurationTest is a helper func to test the Header map in a CheckType or CheckDefiniton
// (to reduce repetetive typing). // (to reduce repetetive typing).
func checkTypeHeaderTest(check interface{}, want map[string][]string, prefix string) error { func checkTypeHeaderTest(check interface{}, want map[string][]string) error {
var header map[string][]string var header map[string][]string
switch v := check.(type) { switch v := check.(type) {

15
agent/pool/pool.go
View File

@ -308,18 +308,11 @@ func (p *ConnPool) DialTimeout(
) )
} }
return p.dial( return p.dial(dc, addr, actualRPCType, RPCTLS)
dc,
nodeName,
addr,
actualRPCType,
RPCTLS,
)
} }
func (p *ConnPool) dial( func (p *ConnPool) dial(
dc string, dc string,
nodeName string,
addr net.Addr, addr net.Addr,
actualRPCType RPCType, actualRPCType RPCType,
tlsRPCType RPCType, tlsRPCType RPCType,
@ -561,7 +554,7 @@ func (p *ConnPool) RPC(
// or first time config request. For now though this is fine until // or first time config request. For now though this is fine until
// those ongoing requests are implemented. // those ongoing requests are implemented.
if method == "AutoEncrypt.Sign" || method == "Cluster.AutoConfig" { if method == "AutoEncrypt.Sign" || method == "Cluster.AutoConfig" {
return p.rpcInsecure(dc, nodeName, addr, method, args, reply) return p.rpcInsecure(dc, addr, method, args, reply)
} else { } else {
return p.rpc(dc, nodeName, addr, method, args, reply) return p.rpc(dc, nodeName, addr, method, args, reply)
} }
@ -572,13 +565,13 @@ func (p *ConnPool) RPC(
// transparent for the consumer. The pool cannot be used because // transparent for the consumer. The pool cannot be used because
// AutoEncrypt.Sign is a one-off call and it doesn't make sense to pool that // AutoEncrypt.Sign is a one-off call and it doesn't make sense to pool that
// connection if it is not being reused. // connection if it is not being reused.
func (p *ConnPool) rpcInsecure(dc string, nodeName string, addr net.Addr, method string, args interface{}, reply interface{}) error { func (p *ConnPool) rpcInsecure(dc string, addr net.Addr, method string, args interface{}, reply interface{}) error {
if dc != p.Datacenter { if dc != p.Datacenter {
return fmt.Errorf("insecure dialing prohibited between datacenters") return fmt.Errorf("insecure dialing prohibited between datacenters")
} }
var codec rpc.ClientCodec var codec rpc.ClientCodec
conn, _, err := p.dial(dc, nodeName, addr, 0, RPCTLSInsecure) conn, _, err := p.dial(dc, addr, 0, RPCTLSInsecure)
if err != nil { if err != nil {
return fmt.Errorf("rpcinsecure error establishing connection: %v", err) return fmt.Errorf("rpcinsecure error establishing connection: %v", err)
} }

6
agent/proxycfg/manager_test.go
View File

@ -294,9 +294,9 @@ func TestManager_BasicLifecycle(t *testing.T) {
webProxyCopy, err := copystructure.Copy(webProxy) webProxyCopy, err := copystructure.Copy(webProxy)
require.NoError(t, err) require.NoError(t, err)
testManager_BasicLifecycle(t, tt, types, testManager_BasicLifecycle(t, types,
rootsCacheKey, leafCacheKey, rootsCacheKey, leafCacheKey,
roots, leaf, roots,
webProxyCopy.(*structs.NodeService), webProxyCopy.(*structs.NodeService),
expectSnapCopy.(*ConfigSnapshot), expectSnapCopy.(*ConfigSnapshot),
) )
@ -313,11 +313,9 @@ type testcase_BasicLifecycle struct {
func testManager_BasicLifecycle( func testManager_BasicLifecycle(
t *testing.T, t *testing.T,
tt *testcase_BasicLifecycle,
types *TestCacheTypes, types *TestCacheTypes,
rootsCacheKey, leafCacheKey string, rootsCacheKey, leafCacheKey string,
roots *structs.IndexedCARoots, roots *structs.IndexedCARoots,
leaf *structs.IssuedCert,
webProxy *structs.NodeService, webProxy *structs.NodeService,
expectSnap *ConfigSnapshot, expectSnap *ConfigSnapshot,
) { ) {

4
agent/xds/clusters.go
View File

@ -321,9 +321,7 @@ func (s *Server) makeAppCluster(cfgSnap *proxycfg.ConfigSnapshot, name, pathProt
Endpoints: []*envoyendpoint.LocalityLbEndpoints{ Endpoints: []*envoyendpoint.LocalityLbEndpoints{
{ {
LbEndpoints: []*envoyendpoint.LbEndpoint{ LbEndpoints: []*envoyendpoint.LbEndpoint{
makeEndpoint(name, makeEndpoint(addr, port),
addr,
port),
}, },
}, },
}, },

13
agent/xds/clusters_test.go
View File

@ -569,7 +569,7 @@ func TestClustersFromSnapshot(t *testing.T) {
} }
} }
func expectClustersJSONResources(t *testing.T, snap *proxycfg.ConfigSnapshot, token string, v, n uint64) map[string]string { func expectClustersJSONResources(snap *proxycfg.ConfigSnapshot) map[string]string {
return map[string]string{ return map[string]string{
"local_app": ` "local_app": `
{ {
@ -620,7 +620,7 @@ func expectClustersJSONResources(t *testing.T, snap *proxycfg.ConfigSnapshot, to
"healthyPanicThreshold": {} "healthyPanicThreshold": {}
}, },
"connectTimeout": "5s", "connectTimeout": "5s",
"tlsContext": ` + expectedUpstreamTLSContextJSON(t, snap, "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul") + ` "tlsContext": ` + expectedUpstreamTLSContextJSON(snap, "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul") + `
}`, }`,
"prepared_query:geo-cache": ` "prepared_query:geo-cache": `
{ {
@ -641,12 +641,12 @@ func expectClustersJSONResources(t *testing.T, snap *proxycfg.ConfigSnapshot, to
}, },
"connectTimeout": "5s", "connectTimeout": "5s",
"tlsContext": ` + expectedUpstreamTLSContextJSON(t, snap, "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul") + ` "tlsContext": ` + expectedUpstreamTLSContextJSON(snap, "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul") + `
}`, }`,
} }
} }
func expectClustersJSONFromResources(t *testing.T, snap *proxycfg.ConfigSnapshot, token string, v, n uint64, resourcesJSON map[string]string) string { func expectClustersJSONFromResources(snap *proxycfg.ConfigSnapshot, v, n uint64, resourcesJSON map[string]string) string {
resJSON := "" resJSON := ""
// Sort resources into specific order because that matters in JSONEq // Sort resources into specific order because that matters in JSONEq
@ -674,9 +674,8 @@ func expectClustersJSONFromResources(t *testing.T, snap *proxycfg.ConfigSnapshot
}` }`
} }
func expectClustersJSON(t *testing.T, snap *proxycfg.ConfigSnapshot, token string, v, n uint64) string { func expectClustersJSON(snap *proxycfg.ConfigSnapshot, v, n uint64) string {
return expectClustersJSONFromResources(t, snap, token, v, n, return expectClustersJSONFromResources(snap, v, n, expectClustersJSONResources(snap))
expectClustersJSONResources(t, snap, token, v, n))
} }
type customClusterJSONOptions struct { type customClusterJSONOptions struct {

2
agent/xds/endpoints.go
View File

@ -288,7 +288,7 @@ func (s *Server) endpointsFromSnapshotIngressGateway(cfgSnap *proxycfg.ConfigSna
return resources, nil return resources, nil
} }
func makeEndpoint(clusterName, host string, port int) *envoyendpoint.LbEndpoint { func makeEndpoint(host string, port int) *envoyendpoint.LbEndpoint {
return &envoyendpoint.LbEndpoint{ return &envoyendpoint.LbEndpoint{
HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{ HostIdentifier: &envoyendpoint.LbEndpoint_Endpoint{
Endpoint: &envoyendpoint.Endpoint{ Endpoint: &envoyendpoint.Endpoint{

4
agent/xds/listeners.go
View File

@ -402,7 +402,7 @@ func makeListenerFromUserConfig(configJSON string) (*envoy.Listener, error) {
// specify custom listener params in config but still get our certs delivered // specify custom listener params in config but still get our certs delivered
// dynamically and intentions enforced without coming up with some complicated // dynamically and intentions enforced without coming up with some complicated
// templating/merging solution. // templating/merging solution.
func injectConnectFilters(cfgSnap *proxycfg.ConfigSnapshot, token string, listener *envoy.Listener, setTLS bool) error { func injectConnectFilters(cfgSnap *proxycfg.ConfigSnapshot, token string, listener *envoy.Listener) error {
authFilter, err := makeExtAuthFilter(token) authFilter, err := makeExtAuthFilter(token)
if err != nil { if err != nil {
return err return err
@ -474,7 +474,7 @@ func (s *Server) makePublicListener(cfgSnap *proxycfg.ConfigSnapshot, token stri
} }
} }
err = injectConnectFilters(cfgSnap, token, l, true) err = injectConnectFilters(cfgSnap, token, l)
return l, err return l, err
} }

7
agent/xds/listeners_test.go
View File

@ -489,7 +489,7 @@ func TestListenersFromSnapshot(t *testing.T) {
} }
} }
func expectListenerJSONResources(t *testing.T, snap *proxycfg.ConfigSnapshot, token string, v, n uint64) map[string]string { func expectListenerJSONResources(t *testing.T, snap *proxycfg.ConfigSnapshot, token string) map[string]string {
tokenVal := "" tokenVal := ""
if token != "" { if token != "" {
tokenVal = fmt.Sprintf(",\n"+`"value": "%s"`, token) tokenVal = fmt.Sprintf(",\n"+`"value": "%s"`, token)
@ -585,7 +585,7 @@ func expectListenerJSONResources(t *testing.T, snap *proxycfg.ConfigSnapshot, to
} }
} }
func expectListenerJSONFromResources(t *testing.T, snap *proxycfg.ConfigSnapshot, token string, v, n uint64, resourcesJSON map[string]string) string { func expectListenerJSONFromResources(snap *proxycfg.ConfigSnapshot, v, n uint64, resourcesJSON map[string]string) string {
resJSON := "" resJSON := ""
// Sort resources into specific order because that matters in JSONEq // Sort resources into specific order because that matters in JSONEq
// comparison later. // comparison later.
@ -612,8 +612,7 @@ func expectListenerJSONFromResources(t *testing.T, snap *proxycfg.ConfigSnapshot
} }
func expectListenerJSON(t *testing.T, snap *proxycfg.ConfigSnapshot, token string, v, n uint64) string { func expectListenerJSON(t *testing.T, snap *proxycfg.ConfigSnapshot, token string, v, n uint64) string {
return expectListenerJSONFromResources(t, snap, token, v, n, return expectListenerJSONFromResources(snap, v, n, expectListenerJSONResources(t, snap, token))
expectListenerJSONResources(t, snap, token, v, n))
} }
type customListenerJSONOptions struct { type customListenerJSONOptions struct {

4
agent/xds/routes.go
View File

@ -141,7 +141,7 @@ func makeUpstreamRouteForDiscoveryChain(
routes = make([]*envoyroute.Route, 0, len(startNode.Routes)) routes = make([]*envoyroute.Route, 0, len(startNode.Routes))
for _, discoveryRoute := range startNode.Routes { for _, discoveryRoute := range startNode.Routes {
routeMatch := makeRouteMatchForDiscoveryRoute(discoveryRoute, chain.Protocol) routeMatch := makeRouteMatchForDiscoveryRoute(discoveryRoute)
var ( var (
routeAction *envoyroute.Route_Route routeAction *envoyroute.Route_Route
@ -240,7 +240,7 @@ func makeUpstreamRouteForDiscoveryChain(
return host, nil return host, nil
} }
func makeRouteMatchForDiscoveryRoute(discoveryRoute *structs.DiscoveryRoute, protocol string) *envoyroute.RouteMatch { func makeRouteMatchForDiscoveryRoute(discoveryRoute *structs.DiscoveryRoute) *envoyroute.RouteMatch {
match := discoveryRoute.Definition.Match match := discoveryRoute.Definition.Match
if match == nil || match.IsEmpty() { if match == nil || match.IsEmpty() {
return makeDefaultRouteMatch() return makeDefaultRouteMatch()

26
agent/xds/server_test.go
View File

@ -145,7 +145,7 @@ func TestServer_StreamAggregatedResources_BasicProtocol(t *testing.T) {
snap := proxycfg.TestConfigSnapshot(t) snap := proxycfg.TestConfigSnapshot(t)
mgr.DeliverConfig(t, sid, snap) mgr.DeliverConfig(t, sid, snap)
assertResponseSent(t, envoy.stream.sendCh, expectClustersJSON(t, snap, "", 1, 1)) assertResponseSent(t, envoy.stream.sendCh, expectClustersJSON(snap, 1, 1))
// Envoy then tries to discover endpoints for those clusters. Technically it // Envoy then tries to discover endpoints for those clusters. Technically it
// includes the cluster names in the ResourceNames field but we ignore that // includes the cluster names in the ResourceNames field but we ignore that
@ -160,7 +160,7 @@ func TestServer_StreamAggregatedResources_BasicProtocol(t *testing.T) {
// the server for endpoints. Note that this should not be racy if the server // the server for endpoints. Note that this should not be racy if the server
// is behaving well since the Cluster send above should be blocked until we // is behaving well since the Cluster send above should be blocked until we
// deliver a new config version. // deliver a new config version.
assertResponseSent(t, envoy.stream.sendCh, expectEndpointsJSON(t, snap, "", 1, 2)) assertResponseSent(t, envoy.stream.sendCh, expectEndpointsJSON(1, 2))
// And no other response yet // And no other response yet
assertChanBlocked(t, envoy.stream.sendCh) assertChanBlocked(t, envoy.stream.sendCh)
@ -195,8 +195,8 @@ func TestServer_StreamAggregatedResources_BasicProtocol(t *testing.T) {
// don't know the order the nonces will be assigned. For now we rely and // don't know the order the nonces will be assigned. For now we rely and
// require our implementation to always deliver updates in a specific order // require our implementation to always deliver updates in a specific order
// which is reasonable anyway to ensure consistency of the config Envoy sees. // which is reasonable anyway to ensure consistency of the config Envoy sees.
assertResponseSent(t, envoy.stream.sendCh, expectClustersJSON(t, snap, "", 2, 4)) assertResponseSent(t, envoy.stream.sendCh, expectClustersJSON(snap, 2, 4))
assertResponseSent(t, envoy.stream.sendCh, expectEndpointsJSON(t, snap, "", 2, 5)) assertResponseSent(t, envoy.stream.sendCh, expectEndpointsJSON(2, 5))
assertResponseSent(t, envoy.stream.sendCh, expectListenerJSON(t, snap, "", 2, 6)) assertResponseSent(t, envoy.stream.sendCh, expectListenerJSON(t, snap, "", 2, 6))
// Let's pretend that Envoy doesn't like that new listener config. It will ACK // Let's pretend that Envoy doesn't like that new listener config. It will ACK
@ -232,12 +232,12 @@ func TestServer_StreamAggregatedResources_BasicProtocol(t *testing.T) {
snap.ConnectProxy.Leaf = proxycfg.TestLeafForCA(t, snap.Roots.Roots[0]) snap.ConnectProxy.Leaf = proxycfg.TestLeafForCA(t, snap.Roots.Roots[0])
mgr.DeliverConfig(t, sid, snap) mgr.DeliverConfig(t, sid, snap)
assertResponseSent(t, envoy.stream.sendCh, expectClustersJSON(t, snap, "", 3, 7)) assertResponseSent(t, envoy.stream.sendCh, expectClustersJSON(snap, 3, 7))
assertResponseSent(t, envoy.stream.sendCh, expectEndpointsJSON(t, snap, "", 3, 8)) assertResponseSent(t, envoy.stream.sendCh, expectEndpointsJSON(3, 8))
assertResponseSent(t, envoy.stream.sendCh, expectListenerJSON(t, snap, "", 3, 9)) assertResponseSent(t, envoy.stream.sendCh, expectListenerJSON(t, snap, "", 3, 9))
} }
func expectEndpointsJSON(t *testing.T, snap *proxycfg.ConfigSnapshot, token string, v, n uint64) string { func expectEndpointsJSON(v, n uint64) string {
return `{ return `{
"versionInfo": "` + hexString(v) + `", "versionInfo": "` + hexString(v) + `",
"resources": [ "resources": [
@ -315,15 +315,15 @@ func expectEndpointsJSON(t *testing.T, snap *proxycfg.ConfigSnapshot, token stri
}` }`
} }
func expectedUpstreamTLSContextJSON(t *testing.T, snap *proxycfg.ConfigSnapshot, sni string) string { func expectedUpstreamTLSContextJSON(snap *proxycfg.ConfigSnapshot, sni string) string {
return expectedTLSContextJSON(t, snap, false, sni) return expectedTLSContextJSON(snap, false, sni)
} }
func expectedPublicTLSContextJSON(t *testing.T, snap *proxycfg.ConfigSnapshot) string { func expectedPublicTLSContextJSON(t *testing.T, snap *proxycfg.ConfigSnapshot) string {
return expectedTLSContextJSON(t, snap, true, "") return expectedTLSContextJSON(snap, true, "")
} }
func expectedTLSContextJSON(t *testing.T, snap *proxycfg.ConfigSnapshot, requireClientCert bool, sni string) string { func expectedTLSContextJSON(snap *proxycfg.ConfigSnapshot, requireClientCert bool, sni string) string {
// Assume just one root for now, can get fancier later if needed. // Assume just one root for now, can get fancier later if needed.
caPEM := snap.Roots.Roots[0].RootCert caPEM := snap.Roots.Roots[0].RootCert
reqClient := "" reqClient := ""
@ -593,7 +593,7 @@ func TestServer_StreamAggregatedResources_ACLTokenDeleted_StreamTerminatedDuring
snap := proxycfg.TestConfigSnapshot(t) snap := proxycfg.TestConfigSnapshot(t)
mgr.DeliverConfig(t, sid, snap) mgr.DeliverConfig(t, sid, snap)
assertResponseSent(t, envoy.stream.sendCh, expectClustersJSON(t, snap, token, 1, 1)) assertResponseSent(t, envoy.stream.sendCh, expectClustersJSON(snap, 1, 1))
// Now nuke the ACL token. // Now nuke the ACL token.
validToken.Store("") validToken.Store("")
@ -685,7 +685,7 @@ func TestServer_StreamAggregatedResources_ACLTokenDeleted_StreamTerminatedInBack
snap := proxycfg.TestConfigSnapshot(t) snap := proxycfg.TestConfigSnapshot(t)
mgr.DeliverConfig(t, sid, snap) mgr.DeliverConfig(t, sid, snap)
assertResponseSent(t, envoy.stream.sendCh, expectClustersJSON(t, snap, token, 1, 1)) assertResponseSent(t, envoy.stream.sendCh, expectClustersJSON(snap, 1, 1))
// It also (in parallel) issues the next cluster request (which acts as an ACK // It also (in parallel) issues the next cluster request (which acts as an ACK
// of the version we sent) // of the version we sent)

12
lib/telemetry.go
View File

@ -338,7 +338,7 @@ func InitTelemetry(cfg TelemetryConfig) (*metrics.InmemSink, error) {
metricsConf.BlockedPrefixes = cfg.BlockedPrefixes metricsConf.BlockedPrefixes = cfg.BlockedPrefixes
var sinks metrics.FanoutSink var sinks metrics.FanoutSink
addSink := func(name string, fn func(TelemetryConfig, string) (metrics.MetricSink, error)) error { addSink := func(fn func(TelemetryConfig, string) (metrics.MetricSink, error)) error {
s, err := fn(cfg, metricsConf.HostName) s, err := fn(cfg, metricsConf.HostName)
if err != nil { if err != nil {
return err return err
@ -349,19 +349,19 @@ func InitTelemetry(cfg TelemetryConfig) (*metrics.InmemSink, error) {
return nil return nil
} }
if err := addSink("statsite", statsiteSink); err != nil { if err := addSink(statsiteSink); err != nil {
return nil, err return nil, err
} }
if err := addSink("statsd", statsdSink); err != nil { if err := addSink(statsdSink); err != nil {
return nil, err return nil, err
} }
if err := addSink("dogstatd", dogstatdSink); err != nil { if err := addSink(dogstatdSink); err != nil {
return nil, err return nil, err
} }
if err := addSink("circonus", circonusSink); err != nil { if err := addSink(circonusSink); err != nil {
return nil, err return nil, err
} }
if err := addSink("prometheus", prometheusSink); err != nil { if err := addSink(prometheusSink); err != nil {
return nil, err return nil, err
} }