Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-09 13:32:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

all: gometalinter (#843)

Browse Source 
* kubernetes/reverse: remove deadcode
* deadcode in errors and kubernetes removed
* unnecessary conversion
* constants
* proxy: time.Since()
* simplications
* static check
* Disable test/external_test
This commit is contained in:
Miek Gieben
2017-08-06 05:54:24 -07:00
committed by GitHub
parent 964f04f443
commit bcb2eb1ecc
25 changed files with 105 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
middleware/kubernetes/controller.go
View File

@@ -51,11 +51,10 @@ type dnsControl struct {
selector *labels.Selector
svcController *cache.Controller
podController *cache.Controller
nsController *cache.Controller
epController *cache.Controller
nodeController *cache.Controller
svcController *cache.Controller
podController *cache.Controller
nsController *cache.Controller
epController *cache.Controller
svcLister cache.StoreToServiceLister
podLister cache.StoreToPodLister

20
middleware/kubernetes/handler_test.go
View File

@@ -273,32 +273,32 @@ func TestServeDNS(t *testing.T) {
k.Next = testHandler(nextMWMap)
ctx := context.TODO()
runServeDNSTests(t, dnsTestCases, k, ctx)
runServeDNSTests(t, autopathCases, k, ctx)
runServeDNSTests(t, autopathBareSearch, k, ctx)
runServeDNSTests(ctx, t, dnsTestCases, k)
runServeDNSTests(ctx, t, autopathCases, k)
runServeDNSTests(ctx, t, autopathBareSearch, k)
//Set PodMode to Disabled
k.PodMode = PodModeDisabled
runServeDNSTests(t, podModeDisabledCases, k, ctx)
runServeDNSTests(ctx, t, podModeDisabledCases, k)
//Set PodMode to Insecure
k.PodMode = PodModeInsecure
runServeDNSTests(t, podModeInsecureCases, k, ctx)
runServeDNSTests(ctx, t, podModeInsecureCases, k)
//Set PodMode to Verified
k.PodMode = PodModeVerified
runServeDNSTests(t, podModeVerifiedCases, k, ctx)
runServeDNSTests(ctx, t, podModeVerifiedCases, k)
// Set ndots to 2 for the ndots test cases
k.AutoPath.NDots = 2
runServeDNSTests(t, autopath2NDotsCases, k, ctx)
runServeDNSTests(ctx, t, autopath2NDotsCases, k)
k.AutoPath.NDots = defautNdots
// Disable the NXDOMAIN override (enabled by default)
k.OnNXDOMAIN = dns.RcodeNameError
runServeDNSTests(t, autopathCases, k, ctx)
runServeDNSTests(t, autopathBareSearchExpectNameErr, k, ctx)
runServeDNSTests(ctx, t, autopathCases, k)
runServeDNSTests(ctx, t, autopathBareSearchExpectNameErr, k)
}
func runServeDNSTests(t *testing.T, dnsTestCases map[string](*test.Case), k Kubernetes, ctx context.Context) {
func runServeDNSTests(ctx context.Context, t *testing.T, dnsTestCases map[string](*test.Case), k Kubernetes) {
for testname, tc := range dnsTestCases {
testname = "\nTest Case \"" + testname + "\""
r := tc.Msg()

20
middleware/kubernetes/kubernetes.go
View File

@@ -100,13 +100,12 @@ type recordRequest struct {
}
var (
errNoItems = errors.New("no items found")
errNsNotExposed = errors.New("namespace is not exposed")
errInvalidRequest = errors.New("invalid query name")
errZoneNotFound = errors.New("zone not found")
errAPIBadPodType = errors.New("expected type *api.Pod")
errPodsDisabled = errors.New("pod records disabled")
errResolvConfReadErr = errors.New("resolv.conf read error")
errNoItems = errors.New("no items found")
errNsNotExposed = errors.New("namespace is not exposed")
errInvalidRequest = errors.New("invalid query name")
errZoneNotFound = errors.New("zone not found")
errAPIBadPodType = errors.New("expected type *api.Pod")
errPodsDisabled = errors.New("pod records disabled")
)
// Services implements the ServiceBackend interface.
@@ -468,13 +467,6 @@ func (k *Kubernetes) getRecordsForK8sItems(services []service, pods []pod, r rec
return records
}
func ipFromPodName(podname string) string {
if strings.Count(podname, "-") == 3 && !strings.Contains(podname, "--") {
return strings.Replace(podname, "-", ".", -1)
}
return strings.Replace(podname, "-", ":", -1)
}
func (k *Kubernetes) findPodWithIP(ip string) (p *api.Pod) {
if !k.AutoPath.Enabled {
return nil

17
middleware/kubernetes/kubernetes_test.go
View File

@@ -260,23 +260,6 @@ func TestEndpointHostname(t *testing.T) {
}
}
func TestIpFromPodName(t *testing.T) {
var tests = []struct {
ip string
expected string
}{
{"10-11-12-13", "10.11.12.13"},
{"1-2-3-4", "1.2.3.4"},
{"1-2-3--A-B-C", "1:2:3::A:B:C"},
}
for _, test := range tests {
result := ipFromPodName(test.ip)
if result != test.expected {
t.Errorf("Expected ip for podname '%v' to be '%v', but got '%v'", test.ip, test.expected, result)
}
}
}
type APIConnServiceTest struct{}
func (APIConnServiceTest) Run() { return }

1
middleware/kubernetes/setup.go
View File

@@ -242,7 +242,6 @@ func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) {
const (
defaultResyncPeriod = 5 * time.Minute
defaultPodMode = PodModeDisabled
defautNdots = 0
defaultResolvConfFile = "/etc/resolv.conf"
defaultOnNXDOMAIN = dns.RcodeSuccess

64
middleware/kubernetes/setup_test.go
View File

@@ -54,7 +54,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -70,7 +70,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -87,7 +87,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -105,7 +105,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -123,7 +123,7 @@ func TestKubernetesParse(t *testing.T) {
1,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -141,7 +141,7 @@ func TestKubernetesParse(t *testing.T) {
2,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -159,7 +159,7 @@ func TestKubernetesParse(t *testing.T) {
0,
30 * time.Second,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -177,7 +177,7 @@ func TestKubernetesParse(t *testing.T) {
0,
15 * time.Minute,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -195,7 +195,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"environment=prod",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -213,7 +213,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"application=nginx,environment in (production,qa,staging)",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -235,7 +235,7 @@ func TestKubernetesParse(t *testing.T) {
2,
15 * time.Minute,
"application=nginx,environment in (production,qa,staging)",
defaultPodMode,
PodModeDisabled,
nil,
true,
nil,
@@ -252,7 +252,7 @@ func TestKubernetesParse(t *testing.T) {
-1,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -268,7 +268,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -286,7 +286,7 @@ func TestKubernetesParse(t *testing.T) {
-1,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -304,7 +304,7 @@ func TestKubernetesParse(t *testing.T) {
-1,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -322,7 +322,7 @@ func TestKubernetesParse(t *testing.T) {
0,
0 * time.Minute,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -340,7 +340,7 @@ func TestKubernetesParse(t *testing.T) {
0,
0 * time.Second,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -358,7 +358,7 @@ func TestKubernetesParse(t *testing.T) {
0,
0 * time.Second,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -376,7 +376,7 @@ func TestKubernetesParse(t *testing.T) {
0,
0 * time.Second,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -394,7 +394,7 @@ func TestKubernetesParse(t *testing.T) {
0,
0 * time.Second,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -489,7 +489,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
[]net.IPNet{parseCidr("10.0.0.0/24"), parseCidr("10.0.1.0/24")},
false,
nil,
@@ -508,7 +508,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -527,7 +527,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -546,7 +546,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
[]string{"13.14.15.16:53"},
@@ -565,7 +565,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -585,7 +585,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -607,7 +607,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -626,7 +626,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -650,7 +650,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -668,7 +668,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -686,7 +686,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,
@@ -704,7 +704,7 @@ func TestKubernetesParse(t *testing.T) {
0,
defaultResyncPeriod,
"",
defaultPodMode,
PodModeDisabled,
nil,
false,
nil,