TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 4 Projects Releases Packages Wiki Activity Actions

More idiomatic Go

Browse source
This commit is contained in:
Miek Gieben 2016-11-11 16:56:15 +00:00
parent 20e25559d5
commit 651f3938a1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
middleware/kubernetes/kubernetes.go
View file

@ -44,8 +44,8 @@ type Kubernetes struct {
Selector *labels.Selector Selector *labels.Selector
} }
var noItemsErr = errors.New("no items found") var errNoItems = errors.New("no items found")
var nsUnexposedErr = errors.New("namespace is not exposed") var errNsNotExposed = errors.New("namespace is not exposed")
// Services implements the ServiceBackend interface. // Services implements the ServiceBackend interface.
func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.Options) ([]msg.Service, []msg.Service, error) { func (k *Kubernetes) Services(state request.Request, exact bool, opt middleware.Options) ([]msg.Service, []msg.Service, error) {
@ -71,7 +71,7 @@ func (k *Kubernetes) Lookup(state request.Request, name string, typ uint16) (*dn
// IsNameError implements the ServiceBackend interface. // IsNameError implements the ServiceBackend interface.
func (k *Kubernetes) IsNameError(err error) bool { func (k *Kubernetes) IsNameError(err error) bool {
return err == noItemsErr || err == nsUnexposedErr return err == errNoItems || err == errNsNotExposed
} }
// Debug implements the ServiceBackend interface. // Debug implements the ServiceBackend interface.
@ -202,7 +202,7 @@ func (k *Kubernetes) Records(name string, exact bool) ([]msg.Service, error) {
// Abort if the namespace does not contain a wildcard, and namespace is not published per CoreFile // Abort if the namespace does not contain a wildcard, and namespace is not published per CoreFile
// Case where namespace contains a wildcard is handled in Get(...) method. // Case where namespace contains a wildcard is handled in Get(...) method.
if (!nsWildcard) && (len(k.Namespaces) > 0) && (!dnsstrings.StringInSlice(namespace, k.Namespaces)) { if (!nsWildcard) && (len(k.Namespaces) > 0) && (!dnsstrings.StringInSlice(namespace, k.Namespaces)) {
return nil, nsUnexposedErr return nil, errNsNotExposed
} }
k8sItems, err := k.Get(namespace, nsWildcard, serviceName, serviceWildcard, typeName) k8sItems, err := k.Get(namespace, nsWildcard, serviceName, serviceWildcard, typeName)
@ -211,7 +211,7 @@ func (k *Kubernetes) Records(name string, exact bool) ([]msg.Service, error) {
} }
if len(k8sItems) == 0 { if len(k8sItems) == 0 {
// Did not find item in k8s // Did not find item in k8s
return nil, noItemsErr return nil, errNoItems
} }
records := k.getRecordsForServiceItems(k8sItems, zone) records := k.getRecordsForServiceItems(k8sItems, zone)