move files into more appropriate packages and into pkg directory

cli/cli.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	flag "github.com/stefansundin/go-zflag"
 )

cli/dig.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 )
 
 // ParseDig parses commands from the popular DNS tool dig.

cli/dig_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"git.froth.zone/sam/awl/cli"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"gotest.tools/v3/assert"
 )
 

cli/misc.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"git.froth.zone/sam/awl/conf"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	"golang.org/x/net/idna"
 )

cli/misc_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"git.froth.zone/sam/awl/cli"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	"gotest.tools/v3/assert"
 )

doc/wiki

@@ -1 +1 @@
-Subproject commit 6f3070f5933d0cc48bc8bb5290a1d0cc1825cd75
+Subproject commit 0fba1fbe4b12e8c88514b3f7d98be3e75a5a034d

main.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"git.froth.zone/sam/awl/cli"
-	"git.froth.zone/sam/awl/query"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/query"
+	"git.froth.zone/sam/awl/pkg/util"
 )
 
 var version = "DEV"

pkg/logawl/logging_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"git.froth.zone/sam/awl/logawl"
+	"git.froth.zone/sam/awl/pkg/logawl"
 	"gotest.tools/v3/assert"
 )
 

pkg/query/print.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	"golang.org/x/net/idna"
 	"gopkg.in/yaml.v3"

pkg/query/print_test.go

@@ -5,8 +5,8 @@ package query_test
 import (
 	"testing"
 
-	"git.froth.zone/sam/awl/query"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/query"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	"gotest.tools/v3/assert"
 )

pkg/query/query.go

@@ -8,17 +8,13 @@ import (
 	"strings"
 	"time"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/resolvers"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/dchest/uniuri"
 	"github.com/miekg/dns"
 	"golang.org/x/net/idna"
 )
 
-const (
-	tcp = "tcp"
-	udp = "udp"
-)
-
 // ToString turns the response into something that looks a lot like dig
 //
 // Much of this is taken from https://github.com/miekg/dns/blob/master/msg.go#L900
@@ -336,7 +332,7 @@ func CreateQuery(opts util.Options) (util.Response, error) {
 		}
 	}
 
-	resolver, err := LoadResolver(opts)
+	resolver, err := resolvers.LoadResolver(opts)
 	if err != nil {
 		return util.Response{}, err
 	}

pkg/query/query_test.go

@@ -5,8 +5,8 @@ package query_test
 import (
 	"testing"
 
-	"git.froth.zone/sam/awl/query"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/query"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	"gotest.tools/v3/assert"
 )

pkg/resolvers/DNSCrypt.go

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
-package query
+package resolvers
 
 import (
 	"fmt"
 	"time"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/ameshkov/dnscrypt/v2"
 	"github.com/miekg/dns"
 )

pkg/resolvers/DNSCrypt_test.go

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
-package query_test
+package resolvers_test
 
 import (
 	"testing"
 
-	"git.froth.zone/sam/awl/query"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/query"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	"gotest.tools/v3/assert"
 )

pkg/resolvers/HTTPS.go

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
-package query
+package resolvers
 
 import (
 	"bytes"
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"time"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 )
 

pkg/resolvers/HTTPS_test.go

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
-package query_test
+package resolvers_test
 
 import (
 	"testing"
 
-	"git.froth.zone/sam/awl/query"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/resolvers"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	"gotest.tools/v3/assert"
 )
@@ -26,7 +26,7 @@ func TestResolveHTTPS(t *testing.T) {
 		},
 	}
 	// testCase := util.Request{Server: "https://dns9.quad9.net/dns-query", Type: dns.TypeA, Name: "git.froth.zone."}
-	resolver, err := query.LoadResolver(opts)
+	resolver, err := resolvers.LoadResolver(opts)
 	assert.NilError(t, err)
 
 	msg := new(dns.Msg)
@@ -49,7 +49,7 @@ func Test2ResolveHTTPS(t *testing.T) {
 	var err error
 
 	testCase := util.Request{Type: dns.TypeA, Name: "git.froth.zone"}
-	resolver, err := query.LoadResolver(opts)
+	resolver, err := resolvers.LoadResolver(opts)
 	assert.NilError(t, err)
 
 	msg := new(dns.Msg)
@@ -77,7 +77,7 @@ func Test3ResolveHTTPS(t *testing.T) {
 	// 	testCase.Name = fmt.Sprintf("%s.", testCase.Name)
 	// }
 
-	resolver, err := query.LoadResolver(opts)
+	resolver, err := resolvers.LoadResolver(opts)
 	assert.NilError(t, err)
 
 	msg := new(dns.Msg)
@@ -103,7 +103,7 @@ func Test404ResolveHTTPS(t *testing.T) {
 		},
 	}
 	// testCase := util.Request{Server: "https://dns9.quad9.net/dns-query", Type: dns.TypeA, Name: "git.froth.zone."}
-	resolver, err := query.LoadResolver(opts)
+	resolver, err := resolvers.LoadResolver(opts)
 	assert.NilError(t, err)
 
 	msg := new(dns.Msg)

pkg/resolvers/QUIC.go

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
-package query
+package resolvers
 
 import (
 	"crypto/tls"
@@ -8,7 +8,7 @@ import (
 	"io"
 	"time"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/lucas-clemente/quic-go"
 	"github.com/miekg/dns"
 )

pkg/resolvers/QUIC_test.go

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
-package query_test
+package resolvers_test
 
 import (
 	"fmt"
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"git.froth.zone/sam/awl/query"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/resolvers"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	"gotest.tools/v3/assert"
 )
@@ -35,7 +35,7 @@ func TestQuic(t *testing.T) {
 	for i := range testCases {
 		switch i {
 		case 0:
-			resolver, err := query.LoadResolver(opts)
+			resolver, err := resolvers.LoadResolver(opts)
 			assert.NilError(t, err)
 			// if the domain is not canonical, make it canonical
 			if !strings.HasSuffix(testCase.Name, ".") {
@@ -50,7 +50,7 @@ func TestQuic(t *testing.T) {
 			assert.ErrorContains(t, err, "fully qualified")
 			assert.Equal(t, res, util.Response{})
 		case 1:
-			resolver, err := query.LoadResolver(opts)
+			resolver, err := resolvers.LoadResolver(opts)
 			assert.NilError(t, err)
 
 			testCase2.Server = net.JoinHostPort(testCase2.Server, strconv.Itoa(opts.Request.Port))
@@ -79,7 +79,7 @@ func TestInvalidQuic(t *testing.T) {
 		Logger:  util.InitLogger(0),
 		Request: util.Request{Server: "example.com", Port: 853, Type: dns.TypeA, Name: "git.froth.zone", Timeout: 10 * time.Millisecond},
 	}
-	resolver, err := query.LoadResolver(opts)
+	resolver, err := resolvers.LoadResolver(opts)
 	assert.NilError(t, err)
 
 	msg := new(dns.Msg)

pkg/resolvers/general.go

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
-package query
+package resolvers
 
 import (
 	"crypto/tls"
 	"fmt"
 	"net"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 )
 

pkg/resolvers/general_test.go

@@ -1,13 +1,14 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
-package query_test
+package resolvers_test
 
 import (
 	"testing"
 	"time"
 
-	"git.froth.zone/sam/awl/query"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/query"
+	"git.froth.zone/sam/awl/pkg/resolvers"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	"gotest.tools/v3/assert"
 )
@@ -26,7 +27,7 @@ func TestResolve(t *testing.T) {
 			Retries: 0,
 		},
 	}
-	resolver, err := query.LoadResolver(opts)
+	resolver, err := resolvers.LoadResolver(opts)
 	assert.NilError(t, err)
 
 	msg := new(dns.Msg)
@@ -49,7 +50,7 @@ func TestTruncate(t *testing.T) {
 			Name:   "limit.txt.example.",
 		},
 	}
-	resolver, err := query.LoadResolver(opts)
+	resolver, err := resolvers.LoadResolver(opts)
 	assert.NilError(t, err)
 
 	msg := new(dns.Msg)

pkg/resolvers/resolver.go

@@ -1,16 +1,21 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
-package query
+package resolvers
 
 import (
 	"net"
 	"strconv"
 	"strings"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 )
 
+const (
+	tcp = "tcp"
+	udp = "udp"
+)
+
 // Resolver is the main resolver interface.
 type Resolver interface {
 	LookUp(*dns.Msg) (util.Response, error)

pkg/util/logger.go

@@ -2,7 +2,7 @@
 
 package util
 
-import "git.froth.zone/sam/awl/logawl"
+import "git.froth.zone/sam/awl/pkg/logawl"
 
 // InitLogger initializes the logawl instance.
 func InitLogger(verbosity int) (log *logawl.Logger) {

pkg/util/logger_test.go

@@ -5,8 +5,8 @@ package util_test
 import (
 	"testing"
 
-	"git.froth.zone/sam/awl/logawl"
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/logawl"
+	"git.froth.zone/sam/awl/pkg/util"
 	"gotest.tools/v3/assert"
 )
 

pkg/util/options.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net"
 
-	"git.froth.zone/sam/awl/logawl"
+	"git.froth.zone/sam/awl/pkg/logawl"
 	"github.com/miekg/dns"
 )
 

pkg/util/options_test.go

@@ -5,7 +5,7 @@ package util_test
 import (
 	"testing"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"gotest.tools/v3/assert"
 )
 

pkg/util/reverseDNS.go

@@ -13,8 +13,8 @@ type errReverseDNS struct {
 	addr string
 }
 
-func (e *errReverseDNS) Error() string {
-	return fmt.Sprintf("reverseDNS: invalid value %s given", e.addr)
+func (errDNS *errReverseDNS) Error() string {
+	return fmt.Sprintf("reverseDNS: invalid value %s given", errDNS.addr)
 }
 
 // ReverseDNS is given an IP or phone number and returns a canonical string to be queried.

pkg/util/reverseDNS_test.go

@@ -5,7 +5,7 @@ package util_test
 import (
 	"testing"
 
-	"git.froth.zone/sam/awl/util"
+	"git.froth.zone/sam/awl/pkg/util"
 	"github.com/miekg/dns"
 	"gotest.tools/v3/assert"
 )