From 59a111de395d979385762eb452e15f1144c89276 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Tue, 15 Dec 2020 21:56:53 -0800 Subject: [PATCH] Invite our lord and savior emperror back to the table --- api/api.go | 2 +- api/sftp_endpoints.go | 2 +- cmd/root.go | 22 ++++++++++------------ config/config.go | 2 +- config/config_system.go | 2 +- environment/docker/container.go | 2 +- environment/docker/power.go | 2 +- environment/docker/state.go | 2 +- environment/docker/stats.go | 2 +- environment/docker/stream.go | 2 +- go.mod | 1 - installer/installer.go | 2 +- parser/helpers.go | 2 +- parser/parser.go | 2 +- router/router_server.go | 2 +- router/router_server_files.go | 2 +- router/router_transfer.go | 2 +- router/websocket/websocket.go | 10 +++++----- server/archiver.go | 2 +- server/backup.go | 2 +- server/backup/archiver.go | 2 +- server/console.go | 2 +- server/errors.go | 2 +- server/filesystem/decompress.go | 2 +- server/filesystem/errors.go | 2 +- server/filesystem/filesystem.go | 2 +- server/filesystem/path_test.go | 2 +- server/install.go | 2 +- server/loader.go | 2 +- server/power.go | 2 +- server/server.go | 2 +- server/update.go | 2 +- sftp/sftp.go | 2 +- 33 files changed, 45 insertions(+), 48 deletions(-) diff --git a/api/api.go b/api/api.go index 48e724c..4b16abf 100644 --- a/api/api.go +++ b/api/api.go @@ -2,10 +2,10 @@ package api import ( "bytes" + "emperror.dev/errors" "encoding/json" "fmt" "github.com/apex/log" - "github.com/pkg/errors" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/system" "io" diff --git a/api/sftp_endpoints.go b/api/sftp_endpoints.go index 5dbbfa6..bc480eb 100644 --- a/api/sftp_endpoints.go +++ b/api/sftp_endpoints.go @@ -1,8 +1,8 @@ package api import ( + "emperror.dev/errors" "github.com/apex/log" - "github.com/pkg/errors" "regexp" ) diff --git a/cmd/root.go b/cmd/root.go index f0a66ce..b6ffe35 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -2,32 +2,30 @@ package cmd import ( "crypto/tls" + "emperror.dev/errors" "fmt" "github.com/NYTimes/logrotate" + "github.com/apex/log" "github.com/apex/log/handlers/multi" "github.com/docker/docker/client" "github.com/gammazero/workerpool" - "golang.org/x/crypto/acme" - "net/http" - "os" - "path" - "path/filepath" - "strings" - - "github.com/apex/log" "github.com/mitchellh/colorstring" - "github.com/pterodactyl/wings/loggers/cli" - "golang.org/x/crypto/acme/autocert" - - "github.com/pkg/errors" "github.com/pkg/profile" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/environment" + "github.com/pterodactyl/wings/loggers/cli" "github.com/pterodactyl/wings/router" "github.com/pterodactyl/wings/server" "github.com/pterodactyl/wings/sftp" "github.com/pterodactyl/wings/system" "github.com/spf13/cobra" + "golang.org/x/crypto/acme" + "golang.org/x/crypto/acme/autocert" + "net/http" + "os" + "path" + "path/filepath" + "strings" ) var ( diff --git a/config/config.go b/config/config.go index b5423c3..1675766 100644 --- a/config/config.go +++ b/config/config.go @@ -1,11 +1,11 @@ package config import ( + "emperror.dev/errors" "fmt" "github.com/cobaugh/osrelease" "github.com/creasty/defaults" "github.com/gbrlsnchs/jwt/v3" - "github.com/pkg/errors" "gopkg.in/yaml.v2" "io/ioutil" "os" diff --git a/config/config_system.go b/config/config_system.go index ac9021a..c5bd0b4 100644 --- a/config/config_system.go +++ b/config/config_system.go @@ -2,9 +2,9 @@ package config import ( "context" + "emperror.dev/errors" "fmt" "github.com/apex/log" - "github.com/pkg/errors" "html/template" "io/ioutil" "os" diff --git a/environment/docker/container.go b/environment/docker/container.go index 2397b28..d6b4524 100644 --- a/environment/docker/container.go +++ b/environment/docker/container.go @@ -4,6 +4,7 @@ import ( "bufio" "bytes" "context" + "emperror.dev/errors" "encoding/json" "fmt" "github.com/apex/log" @@ -12,7 +13,6 @@ import ( "github.com/docker/docker/api/types/mount" "github.com/docker/docker/client" "github.com/docker/docker/daemon/logger/jsonfilelog" - "github.com/pkg/errors" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/environment" "io" diff --git a/environment/docker/power.go b/environment/docker/power.go index aee5218..d8654c9 100644 --- a/environment/docker/power.go +++ b/environment/docker/power.go @@ -2,11 +2,11 @@ package docker import ( "context" + "emperror.dev/errors" "github.com/apex/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/client" - "github.com/pkg/errors" "github.com/pterodactyl/wings/api" "github.com/pterodactyl/wings/environment" "os" diff --git a/environment/docker/state.go b/environment/docker/state.go index 240eec5..ee03443 100644 --- a/environment/docker/state.go +++ b/environment/docker/state.go @@ -1,8 +1,8 @@ package docker import ( + "emperror.dev/errors" "fmt" - "github.com/pkg/errors" "github.com/pterodactyl/wings/environment" ) diff --git a/environment/docker/stats.go b/environment/docker/stats.go index 530b3e3..5637ba7 100644 --- a/environment/docker/stats.go +++ b/environment/docker/stats.go @@ -2,10 +2,10 @@ package docker import ( "context" + "emperror.dev/errors" "encoding/json" "github.com/apex/log" "github.com/docker/docker/api/types" - "github.com/pkg/errors" "github.com/pterodactyl/wings/environment" "io" "math" diff --git a/environment/docker/stream.go b/environment/docker/stream.go index 82b80ae..f387609 100644 --- a/environment/docker/stream.go +++ b/environment/docker/stream.go @@ -4,9 +4,9 @@ import ( "bufio" "bytes" "context" + "emperror.dev/errors" "encoding/json" "github.com/docker/docker/api/types" - "github.com/pkg/errors" "github.com/pterodactyl/wings/environment" "strconv" ) diff --git a/go.mod b/go.mod index 31a9967..d5293a4 100644 --- a/go.mod +++ b/go.mod @@ -58,7 +58,6 @@ require ( github.com/opencontainers/image-spec v1.0.1 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pierrec/lz4 v2.5.2+incompatible // indirect - github.com/pkg/errors v0.9.1 github.com/pkg/profile v1.5.0 github.com/pkg/sftp v1.11.0 github.com/prometheus/common v0.11.1 // indirect diff --git a/installer/installer.go b/installer/installer.go index 0fedff7..b046eca 100644 --- a/installer/installer.go +++ b/installer/installer.go @@ -1,10 +1,10 @@ package installer import ( + "emperror.dev/errors" "encoding/json" "github.com/asaskevich/govalidator" "github.com/buger/jsonparser" - "github.com/pkg/errors" "github.com/pterodactyl/wings/api" "github.com/pterodactyl/wings/environment" "github.com/pterodactyl/wings/server" diff --git a/parser/helpers.go b/parser/helpers.go index 4c3d3d5..37a4bd7 100644 --- a/parser/helpers.go +++ b/parser/helpers.go @@ -2,11 +2,11 @@ package parser import ( "bytes" + "emperror.dev/errors" "github.com/Jeffail/gabs/v2" "github.com/apex/log" "github.com/buger/jsonparser" "github.com/iancoleman/strcase" - "github.com/pkg/errors" "io/ioutil" "os" "regexp" diff --git a/parser/parser.go b/parser/parser.go index c7afcd6..a63b0da 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -2,13 +2,13 @@ package parser import ( "bufio" + "emperror.dev/errors" "encoding/json" "github.com/apex/log" "github.com/beevik/etree" "github.com/buger/jsonparser" "github.com/icza/dyno" "github.com/magiconair/properties" - "github.com/pkg/errors" "github.com/pterodactyl/wings/config" "gopkg.in/ini.v1" "gopkg.in/yaml.v2" diff --git a/router/router_server.go b/router/router_server.go index 71ed588..b65f5e6 100644 --- a/router/router_server.go +++ b/router/router_server.go @@ -3,9 +3,9 @@ package router import ( "bytes" "context" + "emperror.dev/errors" "github.com/apex/log" "github.com/gin-gonic/gin" - "github.com/pkg/errors" "github.com/pterodactyl/wings/router/tokens" "github.com/pterodactyl/wings/server" "net/http" diff --git a/router/router_server_files.go b/router/router_server_files.go index 0c10393..6edad0b 100644 --- a/router/router_server_files.go +++ b/router/router_server_files.go @@ -2,9 +2,9 @@ package router import ( "context" + "emperror.dev/errors" "github.com/apex/log" "github.com/gin-gonic/gin" - "github.com/pkg/errors" "github.com/pterodactyl/wings/router/tokens" "github.com/pterodactyl/wings/server" "github.com/pterodactyl/wings/server/filesystem" diff --git a/router/router_transfer.go b/router/router_transfer.go index 053cd8a..f009f99 100644 --- a/router/router_transfer.go +++ b/router/router_transfer.go @@ -4,12 +4,12 @@ import ( "bufio" "bytes" "crypto/sha256" + "emperror.dev/errors" "encoding/hex" "github.com/apex/log" "github.com/buger/jsonparser" "github.com/gin-gonic/gin" "github.com/mholt/archiver/v3" - "github.com/pkg/errors" "github.com/pterodactyl/wings/api" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/installer" diff --git a/router/websocket/websocket.go b/router/websocket/websocket.go index 82daec6..dd74484 100644 --- a/router/websocket/websocket.go +++ b/router/websocket/websocket.go @@ -2,13 +2,13 @@ package websocket import ( "context" + "emperror.dev/errors" "encoding/json" "fmt" "github.com/apex/log" "github.com/gbrlsnchs/jwt/v3" "github.com/google/uuid" "github.com/gorilla/websocket" - "github.com/pkg/errors" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/environment" "github.com/pterodactyl/wings/environment/docker" @@ -33,10 +33,10 @@ const ( type Handler struct { sync.RWMutex `json:"-"` - Connection *websocket.Conn `json:"-"` - jwt *tokens.WebsocketPayload - server *server.Server - uuid uuid.UUID + Connection *websocket.Conn `json:"-"` + jwt *tokens.WebsocketPayload + server *server.Server + uuid uuid.UUID } var ( diff --git a/server/archiver.go b/server/archiver.go index 6ba3bd0..f424963 100644 --- a/server/archiver.go +++ b/server/archiver.go @@ -2,9 +2,9 @@ package server import ( "crypto/sha256" + "emperror.dev/errors" "encoding/hex" "github.com/mholt/archiver/v3" - "github.com/pkg/errors" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/server/filesystem" "io" diff --git a/server/backup.go b/server/backup.go index ea353c5..147497f 100644 --- a/server/backup.go +++ b/server/backup.go @@ -2,8 +2,8 @@ package server import ( "bufio" + "emperror.dev/errors" "github.com/apex/log" - "github.com/pkg/errors" "github.com/pterodactyl/wings/api" "github.com/pterodactyl/wings/server/backup" "os" diff --git a/server/backup/archiver.go b/server/backup/archiver.go index c7ef45f..408f2b8 100644 --- a/server/backup/archiver.go +++ b/server/backup/archiver.go @@ -3,10 +3,10 @@ package backup import ( "archive/tar" "context" + "emperror.dev/errors" "github.com/apex/log" "github.com/juju/ratelimit" gzip "github.com/klauspost/pgzip" - "github.com/pkg/errors" "github.com/pterodactyl/wings/config" "github.com/remeh/sizedwaitgroup" "golang.org/x/sync/errgroup" diff --git a/server/console.go b/server/console.go index e6637ea..8fb19d3 100644 --- a/server/console.go +++ b/server/console.go @@ -2,9 +2,9 @@ package server import ( "context" + "emperror.dev/errors" "fmt" "github.com/mitchellh/colorstring" - "github.com/pkg/errors" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/system" "sync" diff --git a/server/errors.go b/server/errors.go index 5229a0c..826052e 100644 --- a/server/errors.go +++ b/server/errors.go @@ -1,7 +1,7 @@ package server import ( - "github.com/pkg/errors" + "emperror.dev/errors" ) var ErrIsRunning = errors.New("server is running") diff --git a/server/filesystem/decompress.go b/server/filesystem/decompress.go index 8663dd9..7ff4593 100644 --- a/server/filesystem/decompress.go +++ b/server/filesystem/decompress.go @@ -4,9 +4,9 @@ import ( "archive/tar" "archive/zip" "compress/gzip" + "emperror.dev/errors" "fmt" "github.com/mholt/archiver/v3" - "github.com/pkg/errors" "os" "path/filepath" "reflect" diff --git a/server/filesystem/errors.go b/server/filesystem/errors.go index 2f8cd52..b6bbb37 100644 --- a/server/filesystem/errors.go +++ b/server/filesystem/errors.go @@ -1,9 +1,9 @@ package filesystem import ( + "emperror.dev/errors" "fmt" "github.com/apex/log" - "github.com/pkg/errors" "os" "path/filepath" ) diff --git a/server/filesystem/filesystem.go b/server/filesystem/filesystem.go index 5679bfb..646db9f 100644 --- a/server/filesystem/filesystem.go +++ b/server/filesystem/filesystem.go @@ -2,9 +2,9 @@ package filesystem import ( "bufio" + "emperror.dev/errors" "github.com/gabriel-vasile/mimetype" "github.com/karrick/godirwalk" - "github.com/pkg/errors" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/system" "io" diff --git a/server/filesystem/path_test.go b/server/filesystem/path_test.go index 2bef006..49fb50b 100644 --- a/server/filesystem/path_test.go +++ b/server/filesystem/path_test.go @@ -2,8 +2,8 @@ package filesystem import ( "bytes" + "emperror.dev/errors" . "github.com/franela/goblin" - "github.com/pkg/errors" "os" "path/filepath" "testing" diff --git a/server/install.go b/server/install.go index 7ba50bd..007b3fd 100644 --- a/server/install.go +++ b/server/install.go @@ -4,12 +4,12 @@ import ( "bufio" "bytes" "context" + "emperror.dev/errors" "github.com/apex/log" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/mount" "github.com/docker/docker/client" - "github.com/pkg/errors" "github.com/pterodactyl/wings/api" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/environment" diff --git a/server/loader.go b/server/loader.go index 48c3d04..b05a379 100644 --- a/server/loader.go +++ b/server/loader.go @@ -1,12 +1,12 @@ package server import ( + "emperror.dev/errors" "encoding/json" "fmt" "github.com/apex/log" "github.com/creasty/defaults" "github.com/gammazero/workerpool" - "github.com/pkg/errors" "github.com/pterodactyl/wings/api" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/environment" diff --git a/server/power.go b/server/power.go index fec86c3..396595c 100644 --- a/server/power.go +++ b/server/power.go @@ -2,7 +2,7 @@ package server import ( "context" - "github.com/pkg/errors" + "emperror.dev/errors" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/environment" "github.com/pterodactyl/wings/server/filesystem" diff --git a/server/server.go b/server/server.go index 2af63cd..10945a2 100644 --- a/server/server.go +++ b/server/server.go @@ -2,9 +2,9 @@ package server import ( "context" + "emperror.dev/errors" "fmt" "github.com/apex/log" - "github.com/pkg/errors" "github.com/pterodactyl/wings/api" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/environment" diff --git a/server/update.go b/server/update.go index b235e02..dee759e 100644 --- a/server/update.go +++ b/server/update.go @@ -1,10 +1,10 @@ package server import ( + "emperror.dev/errors" "encoding/json" "github.com/buger/jsonparser" "github.com/imdario/mergo" - "github.com/pkg/errors" "github.com/pterodactyl/wings/environment" ) diff --git a/sftp/sftp.go b/sftp/sftp.go index a3635e8..995db58 100644 --- a/sftp/sftp.go +++ b/sftp/sftp.go @@ -1,8 +1,8 @@ package sftp import ( + "emperror.dev/errors" "github.com/apex/log" - "github.com/pkg/errors" "github.com/pterodactyl/wings/api" "github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/server"