refactor: moved files to standard layout

aacebedo · Jan 28, 2024 · 941e4ec · 941e4ec
1 parent 38436e3
commit 941e4ec
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 16 deletions.
diff --git a/PULL_REQUEST_TEMPLATE.md → .github/pull_request_template.md b/PULL_REQUEST_TEMPLATE.md → .github/pull_request_template.md
diff --git a/src/core/cmdline.go → internal/core/cmdline.go b/src/core/cmdline.go → internal/core/cmdline.go
@@ -10,7 +10,7 @@ package core
 
 import (
 	"fmt"
-	"github.com/aacebedo/dnsdock/src/utils"
+	"github.com/aacebedo/dnsdock/internal/utils"
 	"gopkg.in/alecthomas/kingpin.v2"
 	"strconv"
 )

diff --git a/src/core/docker.go → internal/core/docker.go b/src/core/docker.go → internal/core/docker.go
@@ -11,8 +11,8 @@ package core
 import (
 	"crypto/tls"
 	"errors"
-	"github.com/aacebedo/dnsdock/src/servers"
-	"github.com/aacebedo/dnsdock/src/utils"
+	"github.com/aacebedo/dnsdock/internal/servers"
+	"github.com/aacebedo/dnsdock/internal/utils"
 	"github.com/docker/engine-api/client"
 	"github.com/docker/engine-api/types"
 	eventtypes "github.com/docker/engine-api/types/events"

diff --git a/src/core/docker_test.go → internal/core/docker_test.go b/src/core/docker_test.go → internal/core/docker_test.go
@@ -9,7 +9,7 @@
 package core
 
 import (
-	"github.com/aacebedo/dnsdock/src/servers"
+	"github.com/aacebedo/dnsdock/internal/servers"
 	"reflect"
 	"testing"
 )

diff --git a/src/core/loggers.go → internal/core/loggers.go b/src/core/loggers.go → internal/core/loggers.go
diff --git a/src/servers/dnsserver.go → internal/servers/dnsserver.go b/src/servers/dnsserver.go → internal/servers/dnsserver.go
@@ -11,7 +11,7 @@ package servers
 import (
 	"errors"
 	"fmt"
-	"github.com/aacebedo/dnsdock/src/utils"
+	"github.com/aacebedo/dnsdock/internal/utils"
 	"github.com/miekg/dns"
 	"net"
 	"regexp"

diff --git a/src/servers/dnsserver_test.go → internal/servers/dnsserver_test.go b/src/servers/dnsserver_test.go → internal/servers/dnsserver_test.go
@@ -9,7 +9,7 @@
 package servers
 
 import (
-	"github.com/aacebedo/dnsdock/src/utils"
+	"github.com/aacebedo/dnsdock/internal/utils"
 	"github.com/miekg/dns"
 	"net"
 	"strings"

diff --git a/src/servers/http.go → internal/servers/http.go b/src/servers/http.go → internal/servers/http.go
@@ -10,7 +10,7 @@ package servers
 
 import (
 	"encoding/json"
-	"github.com/aacebedo/dnsdock/src/utils"
+	"github.com/aacebedo/dnsdock/internal/utils"
 	"github.com/gorilla/mux"
 	"net/http"
 )

diff --git a/src/servers/http_test.go → internal/servers/http_test.go b/src/servers/http_test.go → internal/servers/http_test.go
@@ -9,8 +9,8 @@
 package servers
 
 import (
-	"github.com/aacebedo/dnsdock/src/utils"
-	"io/ioutil"
+	"github.com/aacebedo/dnsdock/internal/utils"
+	"io"
 	"net/http"
 	"strings"
 	"testing"
@@ -66,7 +66,7 @@ func TestServiceRequests(t *testing.T) {
 			continue
 		}
 
-		actual, err := ioutil.ReadAll(resp.Body)
+		actual, err := io.ReadAll(resp.Body)
 		if err != nil {
 			t.Error(err)
 		}

diff --git a/src/servers/loggers.go → internal/servers/loggers.go b/src/servers/loggers.go → internal/servers/loggers.go
diff --git a/src/utils/config.go → internal/utils/config.go b/src/utils/config.go → internal/utils/config.go
diff --git a/src/utils/config_test.go → internal/utils/config_test.go b/src/utils/config_test.go → internal/utils/config_test.go
diff --git a/src/utils/loggers.go → internal/utils/loggers.go b/src/utils/loggers.go → internal/utils/loggers.go
@@ -10,7 +10,7 @@ package utils
 
 import (
 	"github.com/op/go-logging"
-	"io/ioutil"
+	"io"
 	"os"
 )
 
@@ -22,7 +22,7 @@ func InitLoggers(verbosity int) (err error) {
 
 	switch {
 	case verbosity == 0:
-		backend = logging.NewLogBackend(ioutil.Discard, "", 0)
+		backend = logging.NewLogBackend(io.Discard, "", 0)
 	case verbosity >= 1:
 		backend = logging.NewLogBackend(os.Stdout, "", 0)
 	}

diff --git a/src/main.go → main.go b/src/main.go → main.go
@@ -11,15 +11,15 @@ package main
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"github.com/aacebedo/dnsdock/src/core"
-	"github.com/aacebedo/dnsdock/src/servers"
-	"github.com/aacebedo/dnsdock/src/utils"
+	"github.com/aacebedo/dnsdock/internal/core"
+	"github.com/aacebedo/dnsdock/internal/servers"
+	"github.com/aacebedo/dnsdock/internal/utils"
 	"github.com/op/go-logging"
 	"io/ioutil"
 	"os"
 )
 // GitSummary contains the version number
-var GitSummary string 
+var GitSummary string
 var logger = logging.MustGetLogger("dnsdock.main")
 
 func main() {