aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml1
-rw-r--r--Makefile3
-rw-r--r--plugin/dns64/dns64_test.go36
-rw-r--r--plugin/forward/forward.go2
-rw-r--r--plugin/kubernetes/external_test.go20
-rw-r--r--plugin/kubernetes/ns_test.go4
-rw-r--r--plugin/whoami/whoami.go1
7 files changed, 37 insertions, 30 deletions
diff --git a/.travis.yml b/.travis.yml
index 1a42350d1..67986011e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ env:
- TEST_TYPE=integration
- TEST_TYPE=core
- TEST_TYPE=plugin
+ - TEST_TYPE=fmt
# - TEST_TYPE=fuzzit FUZZIT_TYPE=local-regression
# - TEST_TYPE=fuzzit FUZZIT_TYPE=fuzzing
diff --git a/Makefile b/Makefile
index b07ace86f..b981fcb05 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,9 @@ endif
ifeq ($(TEST_TYPE),integration)
( cd test; go test -race ./... )
endif
+ifeq ($(TEST_TYPE),fmt)
+ ( echo "fmt"; gofmt -w -s . | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi )
+endif
ifeq ($(TEST_TYPE),plugin)
( cd plugin; go test -race ./... )
endif
diff --git a/plugin/dns64/dns64_test.go b/plugin/dns64/dns64_test.go
index fe8b77ec6..d7f9fdade 100644
--- a/plugin/dns64/dns64_test.go
+++ b/plugin/dns64/dns64_test.go
@@ -164,7 +164,7 @@ func TestDNS64(t *testing.T) {
RecursionDesired: true,
Opcode: dns.OpcodeQuery,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
},
initResp: &dns.Msg{ //success, no answers
MsgHdr: dns.MsgHdr{
@@ -174,7 +174,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeSuccess,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
Ns: []dns.RR{test.SOA("example.com. 70 IN SOA foo bar 1 1 1 1 1")},
},
aResp: &dns.Msg{
@@ -185,7 +185,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeSuccess,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeA, dns.ClassINET}},
Answer: []dns.RR{
test.A("example.com. 60 IN A 192.0.2.42"),
test.A("example.com. 5000 IN A 192.0.2.43"),
@@ -200,7 +200,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeSuccess,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
Answer: []dns.RR{
test.AAAA("example.com. 60 IN AAAA 64:ff9b::192.0.2.42"),
// override RR ttl to SOA ttl, since it's lower
@@ -217,7 +217,7 @@ func TestDNS64(t *testing.T) {
RecursionDesired: true,
Opcode: dns.OpcodeQuery,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
},
initResp: &dns.Msg{ //success, no answers
MsgHdr: dns.MsgHdr{
@@ -227,7 +227,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeSuccess,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
Ns: []dns.RR{test.SOA("example.com. 3600 IN SOA foo bar 1 7200 900 1209600 86400")},
},
aResp: &dns.Msg{
@@ -238,7 +238,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeSuccess,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeA, dns.ClassINET}},
Ns: []dns.RR{test.SOA("example.com. 3600 IN SOA foo bar 1 7200 900 1209600 86400")},
},
@@ -250,7 +250,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeSuccess,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
Ns: []dns.RR{test.SOA("example.com. 3600 IN SOA foo bar 1 7200 900 1209600 86400")},
Answer: []dns.RR{}, // just to make comparison happy
},
@@ -264,7 +264,7 @@ func TestDNS64(t *testing.T) {
RecursionDesired: true,
Opcode: dns.OpcodeQuery,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
},
initResp: &dns.Msg{ // failure
MsgHdr: dns.MsgHdr{
@@ -274,7 +274,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeRefused,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
},
aResp: &dns.Msg{
MsgHdr: dns.MsgHdr{
@@ -284,7 +284,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeSuccess,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeA, dns.ClassINET}},
Answer: []dns.RR{
test.A("example.com. 60 IN A 192.0.2.42"),
test.A("example.com. 5000 IN A 192.0.2.43"),
@@ -299,7 +299,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeSuccess,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
Answer: []dns.RR{
test.AAAA("example.com. 60 IN AAAA 64:ff9b::192.0.2.42"),
test.AAAA("example.com. 600 IN AAAA 64:ff9b::192.0.2.43"),
@@ -315,7 +315,7 @@ func TestDNS64(t *testing.T) {
RecursionDesired: true,
Opcode: dns.OpcodeQuery,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
},
initResp: &dns.Msg{ // failure
MsgHdr: dns.MsgHdr{
@@ -325,7 +325,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeNameError,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
Ns: []dns.RR{test.SOA("example.com. 3600 IN SOA foo bar 1 7200 900 1209600 86400")},
},
resp: &dns.Msg{
@@ -336,7 +336,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeNameError,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
Ns: []dns.RR{test.SOA("example.com. 3600 IN SOA foo bar 1 7200 900 1209600 86400")},
},
},
@@ -349,7 +349,7 @@ func TestDNS64(t *testing.T) {
RecursionDesired: true,
Opcode: dns.OpcodeQuery,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
},
initResp: &dns.Msg{
@@ -360,7 +360,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeSuccess,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
Answer: []dns.RR{
test.AAAA("example.com. 60 IN AAAA ::1"),
test.AAAA("example.com. 5000 IN AAAA ::2"),
@@ -375,7 +375,7 @@ func TestDNS64(t *testing.T) {
Rcode: dns.RcodeSuccess,
Response: true,
},
- Question: []dns.Question{dns.Question{"example.com.", dns.TypeAAAA, dns.ClassINET}},
+ Question: []dns.Question{{"example.com.", dns.TypeAAAA, dns.ClassINET}},
Answer: []dns.RR{
test.AAAA("example.com. 60 IN AAAA ::1"),
test.AAAA("example.com. 5000 IN AAAA ::2"),
diff --git a/plugin/forward/forward.go b/plugin/forward/forward.go
index 59e27b216..673d04732 100644
--- a/plugin/forward/forward.go
+++ b/plugin/forward/forward.go
@@ -205,7 +205,7 @@ func (f *Forward) ForceTCP() bool { return f.opts.forceTCP }
func (f *Forward) PreferUDP() bool { return f.opts.preferUDP }
// List returns a set of proxies to be used for this client depending on the policy in f.
-func (f *Forward) List() []*Proxy {return f.p.List(f.proxies)}
+func (f *Forward) List() []*Proxy { return f.p.List(f.proxies) }
var (
// ErrNoHealthy means no healthy proxies left.
diff --git a/plugin/kubernetes/external_test.go b/plugin/kubernetes/external_test.go
index d31b49066..4855cfc63 100644
--- a/plugin/kubernetes/external_test.go
+++ b/plugin/kubernetes/external_test.go
@@ -79,17 +79,17 @@ func TestExternal(t *testing.T) {
type external struct{}
-func (external) HasSynced() bool { return true }
-func (external) Run() {}
-func (external) Stop() error { return nil }
-func (external) EpIndexReverse(string) []*object.Endpoints { return nil }
-func (external) SvcIndexReverse(string) []*object.Service { return nil }
-func (external) Modified() int64 { return 0 }
-func (external) EpIndex(s string) []*object.Endpoints { return nil }
-func (external) EndpointsList() []*object.Endpoints { return nil }
+func (external) HasSynced() bool { return true }
+func (external) Run() {}
+func (external) Stop() error { return nil }
+func (external) EpIndexReverse(string) []*object.Endpoints { return nil }
+func (external) SvcIndexReverse(string) []*object.Service { return nil }
+func (external) Modified() int64 { return 0 }
+func (external) EpIndex(s string) []*object.Endpoints { return nil }
+func (external) EndpointsList() []*object.Endpoints { return nil }
func (external) GetNodeByName(ctx context.Context, name string) (*api.Node, error) { return nil, nil }
-func (external) SvcIndex(s string) []*object.Service { return svcIndexExternal[s] }
-func (external) PodIndex(string) []*object.Pod { return nil }
+func (external) SvcIndex(s string) []*object.Service { return svcIndexExternal[s] }
+func (external) PodIndex(string) []*object.Pod { return nil }
func (external) GetNamespaceByName(name string) (*api.Namespace, error) {
return &api.Namespace{
diff --git a/plugin/kubernetes/ns_test.go b/plugin/kubernetes/ns_test.go
index 4e767f092..0dc55f489 100644
--- a/plugin/kubernetes/ns_test.go
+++ b/plugin/kubernetes/ns_test.go
@@ -103,7 +103,9 @@ func (APIConnTest) EpIndexReverse(ip string) []*object.Endpoints {
return eps
}
-func (APIConnTest) GetNodeByName(ctx context.Context, name string) (*api.Node, error) { return &api.Node{}, nil }
+func (APIConnTest) GetNodeByName(ctx context.Context, name string) (*api.Node, error) {
+ return &api.Node{}, nil
+}
func (APIConnTest) GetNamespaceByName(name string) (*api.Namespace, error) {
return &api.Namespace{}, nil
}
diff --git a/plugin/whoami/whoami.go b/plugin/whoami/whoami.go
index 34f24272a..fffc3be37 100644
--- a/plugin/whoami/whoami.go
+++ b/plugin/whoami/whoami.go
@@ -13,6 +13,7 @@ import (
)
const name = "whoami"
+
// Whoami is a plugin that returns your IP address, port and the protocol used for connecting
// to CoreDNS.
type Whoami struct{}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-22 00:29:52 +0000