Skip to content

Commit

Permalink
lint: Stop using dot imports
Browse files Browse the repository at this point in the history 
While convenient, they can make the code harder to read.
https://github.com/golang/go/wiki/CodeReviewComments#import-dot

This should fix:
```
pkg/services/dns/dns_test.go:8:2: dot-imports: should not use dot imports (revive)
	. "github.com/onsi/ginkgo"
	^
pkg/services/dns/dns_test.go:9:2: dot-imports: should not use dot imports (revive)
	. "github.com/onsi/gomega"
	^
test/port_forwarding_test.go:18:2: dot-imports: should not use dot imports (revive)
	. "github.com/onsi/ginkgo"
	^
test/basic_test.go:10:2: dot-imports: should not use dot imports (revive)
	. "github.com/onsi/ginkgo"
	^
test/basic_test.go:11:2: dot-imports: should not use dot imports (revive)
	. "github.com/onsi/gomega"
	^
test/suite_test.go:16:2: dot-imports: should not use dot imports (revive)
	. "github.com/onsi/ginkgo"
	^
test/suite_test.go:16:2: dot-imports: should not use dot imports (revive)
	. "github.com/onsi/ginkgo"
	^
test/suite_test.go:17:2: dot-imports: should not use dot imports (revive)
	. "github.com/onsi/gomega"
	^
```

Signed-off-by: Christophe Fergeau <[email protected]>
  • Loading branch information
@cfergeau
cfergeau committed Nov 9, 2023
1 parent 333e533 commit d9c2fdf
Show file tree
Hide file tree
Showing 4 changed files with 195 additions and 195 deletions.
40 changes: 20 additions & 20 deletions pkg/services/dns/dns_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@ import (
"testing"

"github.com/containers/gvisor-tap-vsock/pkg/types"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
)

func TestSuite(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "gvisor-tap-vsock dns suit")
gomega.RegisterFailHandler(ginkgo.Fail)
ginkgo.RunSpecs(t, "gvisor-tap-vsock dns suit")
}

var _ = Describe("dns add test", func() {
var _ = ginkgo.Describe("dns add test", func() {
var server *Server

BeforeEach(func() {
ginkgo.BeforeEach(func() {
server, _ = New(nil, nil, []types.Zone{})
})

It("should add dns zone with ip", func() {
ginkgo.It("should add dns zone with ip", func() {
req := types.Zone{
Name: "internal.",
DefaultIP: net.ParseIP("192.168.0.1"),
}
server.addZone(req)

Expect(server.handler.zones).To(Equal([]types.Zone{req}))
gomega.Expect(server.handler.zones).To(gomega.Equal([]types.Zone{req}))
})

It("should add dns zone with record", func() {
ginkgo.It("should add dns zone with record", func() {
req := types.Zone{
Name: "internal.",
Records: []types.Record{{
Expand All @@ -41,10 +41,10 @@ var _ = Describe("dns add test", func() {
}
server.addZone(req)

Expect(server.handler.zones).To(Equal([]types.Zone{req}))
gomega.Expect(server.handler.zones).To(gomega.Equal([]types.Zone{req}))
})

It("should add dns zone with record and ip", func() {
ginkgo.It("should add dns zone with record and ip", func() {
ipReq := types.Zone{
Name: "dynamic.internal.",
DefaultIP: net.ParseIP("192.168.0.1"),
Expand All @@ -59,10 +59,10 @@ var _ = Describe("dns add test", func() {
server.addZone(ipReq)
server.addZone(recordReq)

Expect(server.handler.zones).To(Equal([]types.Zone{ipReq, recordReq}))
gomega.Expect(server.handler.zones).To(gomega.Equal([]types.Zone{ipReq, recordReq}))
})

It("should add new zone to existing zone with default ip", func() {
ginkgo.It("should add new zone to existing zone with default ip", func() {
ipReq := types.Zone{
Name: "internal.",
DefaultIP: net.ParseIP("192.168.0.1"),
Expand All @@ -77,7 +77,7 @@ var _ = Describe("dns add test", func() {
}
server.addZone(recordReq)

Expect(server.handler.zones).To(Equal([]types.Zone{{
gomega.Expect(server.handler.zones).To(gomega.Equal([]types.Zone{{
Name: "internal.",
Records: []types.Record{{
Name: "crc.testing",
Expand All @@ -86,7 +86,7 @@ var _ = Describe("dns add test", func() {
}}))
})

It("should add new zone to existing zone with records", func() {
ginkgo.It("should add new zone to existing zone with records", func() {
ipReq := types.Zone{
Name: "internal.",
Records: []types.Record{{
Expand All @@ -104,7 +104,7 @@ var _ = Describe("dns add test", func() {
}
server.addZone(recordReq)

Expect(server.handler.zones).To(Equal([]types.Zone{{
gomega.Expect(server.handler.zones).To(gomega.Equal([]types.Zone{{
Name: "internal.",
Records: []types.Record{{
Name: "crc.testing",
Expand All @@ -116,7 +116,7 @@ var _ = Describe("dns add test", func() {
}}))
})

It("should add new zone to existing zone with records", func() {
ginkgo.It("should add new zone to existing zone with records", func() {
ipReq := types.Zone{
Name: "internal.",
Records: []types.Record{{
Expand All @@ -134,7 +134,7 @@ var _ = Describe("dns add test", func() {
}
server.addZone(recordReq)

Expect(server.handler.zones).To(Equal([]types.Zone{{
gomega.Expect(server.handler.zones).To(gomega.Equal([]types.Zone{{
Name: "internal.",
Records: []types.Record{{
Name: "crc.testing",
Expand All @@ -146,7 +146,7 @@ var _ = Describe("dns add test", func() {
}}))
})

It("should retain the order of zones", func() {
ginkgo.It("should retain the order of zones", func() {
server, _ = New(nil, nil, []types.Zone{
{
Name: "crc.testing.",
Expand All @@ -171,7 +171,7 @@ var _ = Describe("dns add test", func() {
},
},
})
Expect(server.handler.zones).To(Equal([]types.Zone{
gomega.Expect(server.handler.zones).To(gomega.Equal([]types.Zone{
{
Name: "crc.testing.",
DefaultIP: net.ParseIP("192.168.127.2"),
Expand Down
130 changes: 65 additions & 65 deletions test/basic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,92 +7,92 @@ import (

gvproxyclient "github.com/containers/gvisor-tap-vsock/pkg/client"
"github.com/containers/gvisor-tap-vsock/pkg/types"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
)

var _ = Describe("connectivity", func() {
It("should configure the interface", func() {
var _ = ginkgo.Describe("connectivity", func() {
ginkgo.It("should configure the interface", func() {
out, err := sshExec("ifconfig $(route | grep '^default' | grep -o '[^ ]*$')")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("mtu 1500"))
Expect(string(out)).To(ContainSubstring("inet 192.168.127.2"))
Expect(string(out)).To(ContainSubstring("netmask 255.255.255.0"))
Expect(string(out)).To(ContainSubstring("broadcast 192.168.127.255"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("mtu 1500"))
gomega.Expect(string(out)).To(gomega.ContainSubstring("inet 192.168.127.2"))
gomega.Expect(string(out)).To(gomega.ContainSubstring("netmask 255.255.255.0"))
gomega.Expect(string(out)).To(gomega.ContainSubstring("broadcast 192.168.127.255"))
})

It("should configure the default route", func() {
ginkgo.It("should configure the default route", func() {
out, err := sshExec("ip route show")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(MatchRegexp(`default via 192\.168\.127\.1 dev (.*?) proto dhcp (src 192\.168\.127\.2 )?metric 100`))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.MatchRegexp(`default via 192\.168\.127\.1 dev (.*?) proto dhcp (src 192\.168\.127\.2 )?metric 100`))
})

It("should configure dns settings", func() {
ginkgo.It("should configure dns settings", func() {
out, err := sshExec("cat /etc/resolv.conf")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("nameserver 192.168.127.1"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("nameserver 192.168.127.1"))
})

It("should ping the tap device", func() {
ginkgo.It("should ping the tap device", func() {
out, err := sshExec("ping -c2 192.168.127.2")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("2 packets transmitted, 2 received, 0% packet loss"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("2 packets transmitted, 2 received, 0% packet loss"))
})

It("should ping the gateway", func() {
ginkgo.It("should ping the gateway", func() {
out, err := sshExec("ping -c2 192.168.127.1")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("2 packets transmitted, 2 received, 0% packet loss"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("2 packets transmitted, 2 received, 0% packet loss"))
})
})

var _ = Describe("dns", func() {
It("should resolve redhat.com", func() {
var _ = ginkgo.Describe("dns", func() {
ginkgo.It("should resolve redhat.com", func() {
out, err := sshExec("nslookup redhat.com")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("Address: 52.200.142.250"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("Address: 52.200.142.250"))
})

It("should resolve CNAME record for www.wikipedia.org", func() {
ginkgo.It("should resolve CNAME record for www.wikipedia.org", func() {
out, err := sshExec("nslookup -query=cname www.wikipedia.org")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("www.wikipedia.org canonical name = dyna.wikimedia.org."))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("www.wikipedia.org canonical name = dyna.wikimedia.org."))
})
It("should resolve MX record for wikipedia.org", func() {
ginkgo.It("should resolve MX record for wikipedia.org", func() {
out, err := sshExec("nslookup -query=mx wikipedia.org")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("wikipedia.org mail exchanger = 10 mx1001.wikimedia.org."))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("wikipedia.org mail exchanger = 10 mx1001.wikimedia.org."))
})

It("should resolve NS record for wikipedia.org", func() {
ginkgo.It("should resolve NS record for wikipedia.org", func() {
out, err := sshExec("nslookup -query=ns wikipedia.org")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("wikipedia.org nameserver = ns0.wikimedia.org."))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("wikipedia.org nameserver = ns0.wikimedia.org."))
})
It("should resolve LDAP SRV record for google.com", func() {
ginkgo.It("should resolve LDAP SRV record for google.com", func() {
out, err := sshExec("nslookup -query=srv _ldap._tcp.google.com")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring(`_ldap._tcp.google.com service = 5 0 389 ldap.google.com.`))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring(`_ldap._tcp.google.com service = 5 0 389 ldap.google.com.`))
})
It("should resolve TXT for wikipedia.org", func() {
ginkgo.It("should resolve TXT for wikipedia.org", func() {
out, err := sshExec("nslookup -query=txt wikipedia.org")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring(`"v=spf1 include:wikimedia.org ~all"`))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring(`"v=spf1 include:wikimedia.org ~all"`))
})

It("should resolve gateway.containers.internal", func() {
ginkgo.It("should resolve gateway.containers.internal", func() {
out, err := sshExec("nslookup gateway.containers.internal")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("Address: 192.168.127.1"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("Address: 192.168.127.1"))
})

It("should resolve host.containers.internal", func() {
ginkgo.It("should resolve host.containers.internal", func() {
out, err := sshExec("nslookup host.containers.internal")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("Address: 192.168.127.254"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("Address: 192.168.127.254"))
})

It("should resolve dynamically added dns entry test.dynamic.internal", func() {
ginkgo.It("should resolve dynamically added dns entry test.dynamic.internal", func() {
client := gvproxyclient.New(&http.Client{
Transport: &http.Transport{
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
Expand All @@ -109,15 +109,15 @@ var _ = Describe("dns", func() {
},
},
})
Expect(err).ShouldNot(HaveOccurred())
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())

out, err := sshExec("nslookup test.dynamic.internal")

Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("Address: 192.168.127.254"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("Address: 192.168.127.254"))
})

It("should resolve recently added dns entry test.dynamic.internal", func() {
ginkgo.It("should resolve recently added dns entry test.dynamic.internal", func() {
client := gvproxyclient.New(&http.Client{
Transport: &http.Transport{
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
Expand All @@ -134,7 +134,7 @@ var _ = Describe("dns", func() {
},
},
})
Expect(err).ShouldNot(HaveOccurred())
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())

err = client.AddDNS(&types.Zone{
Name: "dynamic.internal.",
Expand All @@ -145,15 +145,15 @@ var _ = Describe("dns", func() {
},
},
})
Expect(err).ShouldNot(HaveOccurred())
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())

out, err := sshExec("nslookup test.dynamic.internal")

Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("Address: 192.168.127.253"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("Address: 192.168.127.253"))
})

It("should retain order of existing zone", func() {
ginkgo.It("should retain order of existing zone", func() {
client := gvproxyclient.New(&http.Client{
Transport: &http.Transport{
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
Expand All @@ -175,8 +175,8 @@ var _ = Describe("dns", func() {
},
})
out, err := sshExec("nslookup test.dynamic.internal")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("Address: 192.168.127.2"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("Address: 192.168.127.2"))

_ = client.AddDNS(&types.Zone{
Name: "testing.",
Expand All @@ -188,17 +188,17 @@ var _ = Describe("dns", func() {
},
})
out, err = sshExec("nslookup *.dynamic.testing")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("Address: 192.168.127.2"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("Address: 192.168.127.2"))

out, err = sshExec("nslookup gateway.testing")
Expect(err).ShouldNot(HaveOccurred())
Expect(string(out)).To(ContainSubstring("Address: 192.168.127.1"))
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Expect(string(out)).To(gomega.ContainSubstring("Address: 192.168.127.1"))
})
})

var _ = Describe("command-line format", func() {
It("should convert Command to command line format", func() {
var _ = ginkgo.Describe("command-line format", func() {
ginkgo.It("should convert Command to command line format", func() {
command := types.NewGvproxyCommand()
command.AddEndpoint("unix:///tmp/network.sock")
command.Debug = true
Expand All @@ -207,7 +207,7 @@ var _ = Describe("command-line format", func() {
command.AddForwardUser("demouser")

cmd := command.ToCmdline()
Expect(cmd).To(Equal([]string{
gomega.Expect(cmd).To(gomega.Equal([]string{
"-listen", "unix:///tmp/network.sock",
"-debug",
"-mtu", "1500",
Expand Down
Loading

0 comments on commit d9c2fdf

Please sign in to comment.