aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2017-02-22 16:06:20 +0000
committerGravatar GitHub <noreply@github.com> 2017-02-22 16:06:20 +0000
commit4723fb941893ed34f9106077891ecc5ed1e4d576 (patch)
treedbbb939d66fd4d1c1c8dfcca146b2cfbaab444d2
parent682957cc2999eadf4e7f1e9dd36ff310024c13cb (diff)
downloadcoredns-4723fb941893ed34f9106077891ecc5ed1e4d576.tar.gz
coredns-4723fb941893ed34f9106077891ecc5ed1e4d576.tar.zst
coredns-4723fb941893ed34f9106077891ecc5ed1e4d576.zip
Gofmt all code (#552)
* Gofmt all code * fmt
-rw-r--r--core/dnsserver/config.go2
-rw-r--r--middleware/loadbalance/setup.go2
-rw-r--r--middleware/middleware.go2
-rw-r--r--middleware/pprof/setup.go3
-rw-r--r--middleware/reverse/network_test.go42
5 files changed, 26 insertions, 25 deletions
diff --git a/core/dnsserver/config.go b/core/dnsserver/config.go
index 957411ceb..ac623838a 100644
--- a/core/dnsserver/config.go
+++ b/core/dnsserver/config.go
@@ -22,7 +22,7 @@ type Config struct {
Root string
// Server is the server that handles this config
- Server *Server
+ Server *Server
// Middleware stack.
Middleware []middleware.Middleware
diff --git a/middleware/loadbalance/setup.go b/middleware/loadbalance/setup.go
index 95590adbe..334d288a0 100644
--- a/middleware/loadbalance/setup.go
+++ b/middleware/loadbalance/setup.go
@@ -1,9 +1,9 @@
package loadbalance
import (
- "github.com/mholt/caddy"
"github.com/coredns/coredns/core/dnsserver"
"github.com/coredns/coredns/middleware"
+ "github.com/mholt/caddy"
)
func init() {
diff --git a/middleware/middleware.go b/middleware/middleware.go
index 35563cd2e..7d0d502b3 100644
--- a/middleware/middleware.go
+++ b/middleware/middleware.go
@@ -6,7 +6,7 @@ import (
"fmt"
"github.com/miekg/dns"
- ot "github.com/opentracing/opentracing-go"
+ ot "github.com/opentracing/opentracing-go"
"golang.org/x/net/context"
)
diff --git a/middleware/pprof/setup.go b/middleware/pprof/setup.go
index 37359ed8f..725dc0d63 100644
--- a/middleware/pprof/setup.go
+++ b/middleware/pprof/setup.go
@@ -3,8 +3,9 @@ package pprof
import (
"sync"
- "github.com/mholt/caddy"
"github.com/coredns/coredns/middleware"
+
+ "github.com/mholt/caddy"
)
func init() {
diff --git a/middleware/reverse/network_test.go b/middleware/reverse/network_test.go
index ee4db1206..88ea88250 100644
--- a/middleware/reverse/network_test.go
+++ b/middleware/reverse/network_test.go
@@ -1,10 +1,10 @@
package reverse
import (
- "testing"
"net"
"reflect"
"regexp"
+ "testing"
)
// Test converting from hostname to IP and back again to hostname
@@ -23,18 +23,18 @@ func TestNetworkConversion(t *testing.T) {
}{
{
network{
- IPnet:net4,
- Template: "dns-{ip}.domain.internal.",
- RegexMatchIP:regexIP4,
+ IPnet: net4,
+ Template: "dns-{ip}.domain.internal.",
+ RegexMatchIP: regexIP4,
},
"dns-10-1-1-23.domain.internal.",
net.ParseIP("10.1.1.23"),
},
{
network{
- IPnet:net6,
- Template: "dns-{ip}.domain.internal.",
- RegexMatchIP:regexIP6,
+ IPnet: net6,
+ Template: "dns-{ip}.domain.internal.",
+ RegexMatchIP: regexIP6,
},
"dns-fd01000000000000000000000000a32f.domain.internal.",
net.ParseIP("fd01::a32f"),
@@ -70,56 +70,56 @@ func TestNetworkHostnameToIP(t *testing.T) {
}{
{
network{
- IPnet:net4,
- RegexMatchIP:regexIP4,
+ IPnet: net4,
+ RegexMatchIP: regexIP4,
},
// domain does not match
"dns-10-1-1-23.domain.internals.",
},
{
network{
- IPnet:net4,
- RegexMatchIP:regexIP4,
+ IPnet: net4,
+ RegexMatchIP: regexIP4,
},
// IP does match / contain in subnet
"dns-200-1-1-23.domain.internals.",
},
{
network{
- IPnet:net4,
- RegexMatchIP:regexIP4,
+ IPnet: net4,
+ RegexMatchIP: regexIP4,
},
// template does not match
"dns-10-1-1-23-x.domain.internal.",
},
{
network{
- IPnet:net4,
- RegexMatchIP:regexIP4,
+ IPnet: net4,
+ RegexMatchIP: regexIP4,
},
// template does not match
"IP-dns-10-1-1-23.domain.internal.",
},
{
network{
- IPnet:net6,
- RegexMatchIP:regexIP6,
+ IPnet: net6,
+ RegexMatchIP: regexIP6,
},
// template does not match
"dnx-fd01000000000000000000000000a32f.domain.internal.",
},
{
network{
- IPnet:net6,
- RegexMatchIP:regexIP6,
+ IPnet: net6,
+ RegexMatchIP: regexIP6,
},
// no valid v6 (missing one 0, only 31 chars)
"dns-fd0100000000000000000000000a32f.domain.internal.",
},
{
network{
- IPnet:net6,
- RegexMatchIP:regexIP6,
+ IPnet: net6,
+ RegexMatchIP: regexIP6,
},
// IP does match / contain in subnet
"dns-ed01000000000000000000000000a32f.domain.internal.",