#30 move go code into server directory

fxnn · Nov 16, 2019 · 0fef190 · 0fef190
1 parent 4b71187
commit 0fef190
Show file tree

Hide file tree

Showing 42 changed files with 65 additions and 65 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,16 +12,16 @@ matrix:
       # HINT: this is only for interest -- decision to support new versions is made manually
 
 before_install:
-  - go get -t -v ./...
+  - go get -t -v ./server/...
   - go get github.com/pierrre/gotestcover
 
 script:
   # webapp build
   - npm -C webapp install && npm -C webapp run build
   # do regular coverage
-  - gotestcover -v -covermode=count -coverprofile=coverage.intrapackage.txt ./...
+  - gotestcover -v -covermode=count -coverprofile=coverage.intrapackage.txt ./server/...
   # do coverage for all packages and tests in `it` package
-  - go test -covermode=count -coverprofile=coverage.it.txt -coverpkg=./... ./it
+  - go test -covermode=count -coverprofile=coverage.it.txt -coverpkg=./server/... ./server/it
   # HINT: report merging is done by codecov.io script
 
 after_success:

diff --git a/application/config.go → server/application/config.go b/application/config.go → server/application/config.go
@@ -1,8 +1,8 @@
 package application
 
 import (
-	"github.com/fxnn/deadbox/config"
-	"github.com/fxnn/deadbox/crypto"
+	"github.com/fxnn/deadbox/server/config"
+	"github.com/fxnn/deadbox/server/crypto"
 )
 
 func ReadConfig() *config.Application {

diff --git a/application/crypto.go → server/application/crypto.go b/application/crypto.go → server/application/crypto.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/fxnn/deadbox/crypto"
-	"github.com/fxnn/deadbox/rest"
+	"github.com/fxnn/deadbox/server/crypto"
+	"github.com/fxnn/deadbox/server/rest"
 )
 
 func ReadOrCreateTLSCertFiles(

diff --git a/application/database.go → server/application/database.go b/application/database.go → server/application/database.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	"github.com/fxnn/deadbox/config"
+	"github.com/fxnn/deadbox/server/config"
 )
 
 func OpenDb(cfg *config.Application, name string) *bolt.DB {

diff --git a/application/file.go → server/application/file.go b/application/file.go → server/application/file.go
@@ -3,7 +3,7 @@ package application
 import (
 	"path/filepath"
 
-	"github.com/fxnn/deadbox/config"
+	"github.com/fxnn/deadbox/server/config"
 )
 
 const (

diff --git a/cmd/deadbox.go → server/cmd/deadbox.go b/cmd/deadbox.go → server/cmd/deadbox.go
@@ -7,12 +7,12 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/fxnn/deadbox/application"
-	"github.com/fxnn/deadbox/config"
-	"github.com/fxnn/deadbox/crypto"
-	"github.com/fxnn/deadbox/daemon"
-	"github.com/fxnn/deadbox/drop"
-	"github.com/fxnn/deadbox/worker"
+	"github.com/fxnn/deadbox/server/application"
+	"github.com/fxnn/deadbox/server/config"
+	"github.com/fxnn/deadbox/server/crypto"
+	"github.com/fxnn/deadbox/server/daemon"
+	"github.com/fxnn/deadbox/server/drop"
+	"github.com/fxnn/deadbox/server/worker"
 )
 
 func main() {

diff --git a/config/application.go → server/config/application.go b/config/application.go → server/config/application.go
diff --git a/config/drop.go → server/config/drop.go b/config/drop.go → server/config/drop.go
diff --git a/config/dummy.go → server/config/dummy.go b/config/dummy.go → server/config/dummy.go
@@ -5,8 +5,8 @@ import "net/url"
 func Dummy() *Application {
 	dropUrl, _ := url.Parse("https://localhost:" + DefaultPort)
 	w := Worker{
-		Name:    "Default Worker",
-		DropUrl: dropUrl,
+		Name:                                "Default Worker",
+		DropUrl:                             dropUrl,
 		UpdateRegistrationIntervalInSeconds: DefaultUpdateRegistrationIntervalInSeconds,
 		RegistrationTimeoutInSeconds:        DefaultRegistrationTimeoutInSeconds,
 		PrivateKeySize:                      DefaultPrivateKeySize,
@@ -20,11 +20,11 @@ func Dummy() *Application {
 		CertificateValidFor:       DefaultCertificateValidFor,
 	}
 	app := &Application{
-		DbPath:         "./",
-		PrivateKeyPath: "./",
-		CertPath:       "./",
-		Workers:        []Worker{w},
-		Drops:          []Drop{d},
+		DbPath:                             "./",
+		PrivateKeyPath:                     "./",
+		CertPath:                           "./",
+		Workers:                            []Worker{w},
+		Drops:                              []Drop{d},
 		PublicKeyFingerprintChallengeLevel: DefaultPublicKeyFingerprintChallengeLevel,
 		PublicKeyFingerprintLength:         DefaultPublicKeyFingerprintLength,
 	}

diff --git a/config/worker.go → server/config/worker.go b/config/worker.go → server/config/worker.go
diff --git a/crypto/aesplusrsa.go → server/crypto/aesplusrsa.go b/crypto/aesplusrsa.go → server/crypto/aesplusrsa.go
diff --git a/crypto/fingerprint.go → server/crypto/fingerprint.go b/crypto/fingerprint.go → server/crypto/fingerprint.go
diff --git a/crypto/fingerprint_test.go → server/crypto/fingerprint_test.go b/crypto/fingerprint_test.go → server/crypto/fingerprint_test.go
diff --git a/crypto/request.go → server/crypto/request.go b/crypto/request.go → server/crypto/request.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/model"
 )
 
 const (

diff --git a/crypto/rsacert.go → server/crypto/rsacert.go b/crypto/rsacert.go → server/crypto/rsacert.go
diff --git a/crypto/rsakey.go → server/crypto/rsakey.go b/crypto/rsakey.go → server/crypto/rsakey.go
diff --git a/crypto/verify.go → server/crypto/verify.go b/crypto/verify.go → server/crypto/verify.go
diff --git a/daemon/daemon.go → server/daemon/daemon.go b/daemon/daemon.go → server/daemon/daemon.go
diff --git a/drop/facade.go → server/drop/facade.go b/drop/facade.go → server/drop/facade.go
@@ -6,10 +6,10 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	"github.com/fxnn/deadbox/config"
-	"github.com/fxnn/deadbox/daemon"
-	"github.com/fxnn/deadbox/model"
-	"github.com/fxnn/deadbox/rest"
+	"github.com/fxnn/deadbox/server/config"
+	"github.com/fxnn/deadbox/server/daemon"
+	"github.com/fxnn/deadbox/server/model"
+	"github.com/fxnn/deadbox/server/rest"
 )
 
 type Daemonized interface {

diff --git a/drop/requests.go → server/drop/requests.go b/drop/requests.go → server/drop/requests.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/model"
 )
 
 type requests struct {

diff --git a/drop/responses.go → server/drop/responses.go b/drop/responses.go → server/drop/responses.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/model"
 	"github.com/fxnn/gone/log"
 )
 

diff --git a/drop/tx.go → server/drop/tx.go b/drop/tx.go → server/drop/tx.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/boltdb/bolt"
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/model"
 )
 
 const responseBucketName = "request"

diff --git a/drop/workers.go → server/drop/workers.go b/drop/workers.go → server/drop/workers.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/model"
 	"github.com/fxnn/gone/log"
 )
 

diff --git a/drop/workers_test.go → server/drop/workers_test.go b/drop/workers_test.go → server/drop/workers_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/model"
 )
 
 const testDbFilename = "./test.boltdb"

diff --git a/go.mod → server/go.mod b/go.mod → server/go.mod
@@ -1,4 +1,4 @@
-module github.com/fxnn/deadbox
+module github.com/fxnn/deadbox/server
 
 go 1.13
 

diff --git a/go.sum → server/go.sum b/go.sum → server/go.sum
diff --git a/it/registration_test.go → server/it/registration_test.go b/it/registration_test.go → server/it/registration_test.go
diff --git a/it/request_test.go → server/it/request_test.go b/it/request_test.go → server/it/request_test.go
@@ -7,9 +7,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/fxnn/deadbox/crypto"
-	"github.com/fxnn/deadbox/model"
-	"github.com/fxnn/deadbox/request/echo"
+	"github.com/fxnn/deadbox/server/crypto"
+	"github.com/fxnn/deadbox/server/model"
+	"github.com/fxnn/deadbox/server/request/echo"
 )
 
 const (

diff --git a/it/utils_test.go → server/it/utils_test.go b/it/utils_test.go → server/it/utils_test.go
@@ -8,13 +8,13 @@ import (
 	"time"
 
 	"github.com/boltdb/bolt"
-	"github.com/fxnn/deadbox/config"
-	"github.com/fxnn/deadbox/crypto"
-	"github.com/fxnn/deadbox/daemon"
-	"github.com/fxnn/deadbox/drop"
-	"github.com/fxnn/deadbox/model"
-	"github.com/fxnn/deadbox/rest"
-	"github.com/fxnn/deadbox/worker"
+	"github.com/fxnn/deadbox/server/config"
+	"github.com/fxnn/deadbox/server/crypto"
+	"github.com/fxnn/deadbox/server/daemon"
+	"github.com/fxnn/deadbox/server/drop"
+	"github.com/fxnn/deadbox/server/model"
+	"github.com/fxnn/deadbox/server/rest"
+	"github.com/fxnn/deadbox/server/worker"
 )
 
 const (
@@ -118,8 +118,8 @@ func runWorkerDaemon(t *testing.T) (worker.Daemonized, []byte) {
 	t.Helper()
 
 	cfg := &config.Worker{
-		Name:    workerName,
-		DropUrl: parseUrlOrPanic("http://localhost:" + port),
+		Name:                                workerName,
+		DropUrl:                             parseUrlOrPanic("http://localhost:" + port),
 		RegistrationTimeoutInSeconds:        config.DefaultRegistrationTimeoutInSeconds,
 		UpdateRegistrationIntervalInSeconds: config.DefaultUpdateRegistrationIntervalInSeconds,
 	}

diff --git a/model/json_test.go → server/model/json_test.go b/model/json_test.go → server/model/json_test.go
diff --git a/model/model.go → server/model/model.go b/model/model.go → server/model/model.go
diff --git a/request/echo/echo.go → server/request/echo/echo.go b/request/echo/echo.go → server/request/echo/echo.go
@@ -1,7 +1,7 @@
 package echo
 
 import (
-	"github.com/fxnn/deadbox/request"
+	"github.com/fxnn/deadbox/server/request"
 )
 
 const interfaceVersion = "1.0"

diff --git a/request/interface.go → server/request/interface.go b/request/interface.go → server/request/interface.go
diff --git a/rest/client.go → server/rest/client.go b/rest/client.go → server/rest/client.go
@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/fxnn/deadbox/crypto"
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/crypto"
+	"github.com/fxnn/deadbox/server/model"
 )
 
 // client implements a REST client to a drop server.

diff --git a/rest/router.go → server/rest/router.go b/rest/router.go → server/rest/router.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/model"
 	"github.com/gorilla/mux"
 )
 

diff --git a/rest/router_test.go → server/rest/router_test.go b/rest/router_test.go → server/rest/router_test.go
@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/model"
 )
 
 func TestGetAllWorkers(t *testing.T) {

diff --git a/rest/server.go → server/rest/server.go b/rest/server.go → server/rest/server.go
@@ -6,7 +6,7 @@ import (
 
 	"context"
 
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/model"
 )
 
 type Server struct {

diff --git a/rest/tls.go → server/rest/tls.go b/rest/tls.go → server/rest/tls.go
diff --git a/worker/facade.go → server/worker/facade.go b/worker/facade.go → server/worker/facade.go
@@ -9,11 +9,11 @@ import (
 	"log"
 
 	"github.com/boltdb/bolt"
-	"github.com/fxnn/deadbox/config"
-	"github.com/fxnn/deadbox/crypto"
-	"github.com/fxnn/deadbox/daemon"
-	"github.com/fxnn/deadbox/model"
-	"github.com/fxnn/deadbox/rest"
+	"github.com/fxnn/deadbox/server/config"
+	"github.com/fxnn/deadbox/server/crypto"
+	"github.com/fxnn/deadbox/server/daemon"
+	"github.com/fxnn/deadbox/server/model"
+	"github.com/fxnn/deadbox/server/rest"
 )
 
 const pollRequestInterval = 1 * time.Second
@@ -47,9 +47,9 @@ func New(c *config.Worker, id string, db *bolt.DB, privateKey *rsa.PrivateKey, f
 		privateKey:                 privateKey,
 		updateRegistrationInterval: time.Duration(c.UpdateRegistrationIntervalInSeconds) * time.Second,
 		registrations: registrations{
-			id:   model.WorkerId(id),
-			drop: drop,
-			name: c.Name,
+			id:                          model.WorkerId(id),
+			drop:                        drop,
+			name:                        c.Name,
 			registrationTimeoutDuration: time.Duration(c.RegistrationTimeoutInSeconds) * time.Second,
 		},
 		requests: requests{

diff --git a/worker/processors.go → server/worker/processors.go b/worker/processors.go → server/worker/processors.go
@@ -1,9 +1,9 @@
 package worker
 
 import (
-	"github.com/fxnn/deadbox/config"
-	"github.com/fxnn/deadbox/request"
-	"github.com/fxnn/deadbox/request/echo"
+	"github.com/fxnn/deadbox/server/config"
+	"github.com/fxnn/deadbox/server/request"
+	"github.com/fxnn/deadbox/server/request/echo"
 )
 
 type requestProcessors struct {

diff --git a/worker/registrations.go → server/worker/registrations.go b/worker/registrations.go → server/worker/registrations.go
@@ -5,7 +5,7 @@ import (
 
 	"fmt"
 
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/model"
 )
 
 type registrations struct {

diff --git a/worker/requests.go → server/worker/requests.go b/worker/requests.go → server/worker/requests.go
@@ -7,8 +7,8 @@ import (
 
 	"encoding/json"
 
-	"github.com/fxnn/deadbox/crypto"
-	"github.com/fxnn/deadbox/model"
+	"github.com/fxnn/deadbox/server/crypto"
+	"github.com/fxnn/deadbox/server/model"
 )
 
 const contentTypePlainText = "text/plain"