Skip to content

Commit

Permalink
Migrate godest code to separate repository (#88)
Browse files Browse the repository at this point in the history 
* Move godest code to github.com/sargassum-world/godest

* Use the CSP builder from upgrading github.com/unrolled/secure

* Upgrade and tidy dependencies
  • Loading branch information
@ethanjli
ethanjli authored Sep 15, 2022
1 parent 313f1ca commit 8406d42
Show file tree
Hide file tree
Showing 82 changed files with 279 additions and 4,057 deletions.
4 changes: 3 additions & 1 deletion cmd/fluitans/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ func main() {
if err != nil {
e.Logger.Fatal(err)
}
server.Register(e)
if err = server.Register(e); err != nil {
e.Logger.Fatal(err)
}

// Run server
ctxRun, cancelRun := signal.NotifyContext(
Expand Down
23 changes: 12 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,48 @@ go 1.19

require (
github.com/Masterminds/sprig/v3 v3.2.2
github.com/alexedwards/argon2id v0.0.0-20211130144151-3585854a6387
github.com/benbjohnson/hashfs v0.2.1
github.com/bmatcuk/doublestar/v4 v4.2.0
github.com/deepmap/oapi-codegen v1.11.0
github.com/dgraph-io/ristretto v0.1.0
github.com/gorilla/csrf v1.7.1
github.com/gorilla/securecookie v1.1.1
github.com/gorilla/sessions v1.2.1
github.com/gorilla/websocket v1.5.0
github.com/labstack/echo/v4 v4.9.0
github.com/labstack/gommon v0.3.1
github.com/pkg/errors v0.9.1
github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b
github.com/twmb/murmur3 v1.1.6
github.com/unrolled/secure v1.12.0
github.com/vmihailenco/msgpack/v5 v5.3.5
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
github.com/sargassum-world/godest v0.2.0
github.com/unrolled/secure v1.13.0
golang.org/x/sync v0.0.0-20220907140024-f12130a52804
)

require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.1.1 // indirect
github.com/alexedwards/argon2id v0.0.0-20211130144151-3585854a6387 // indirect
github.com/bmatcuk/doublestar/v4 v4.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/securecookie v1.1.1 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/twmb/murmur3 v1.1.6 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.1 // indirect
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503 // indirect
golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c // indirect
golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64 // indirect
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
golang.org/x/sys v0.0.0-20220913175220-63ea55921009 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
)
22 changes: 12 additions & 10 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b/go.mod h1:wTPjTep
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
github.com/sargassum-world/godest v0.2.0 h1:wO+7iBmF1zp8r+foF4Uf4uL/eJOLx9zImdgzGwZtOw0=
github.com/sargassum-world/godest v0.2.0/go.mod h1:aU+8ELkLoNX+qQRYpJgJKOLJ5DxWmn+FVSM+ueTjtwY=
github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
Expand All @@ -157,8 +159,8 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
github.com/unrolled/secure v1.12.0 h1:7k3jcgLwfjiKkhQde6VbQ3D4KDLtDBqDd/hs3PPANDY=
github.com/unrolled/secure v1.12.0/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQtiAF7+40=
github.com/unrolled/secure v1.13.0 h1:sdr3Phw2+f8Px8HE5sd1EHdj1aV3yUwed/uZXChLFsk=
github.com/unrolled/secure v1.13.0/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQtiAF7+40=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4=
Expand All @@ -177,21 +179,21 @@ golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503 h1:vJ2V3lFLg+bBhgroYuRfyN583UzVveQmIXjc8T/y3to=
golang.org/x/crypto v0.0.0-20220824171710-5757bc0c5503/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220513224357-95641704303c/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c h1:JVAXQ10yGGVbSyoer5VILysz6YKjdNT2bsvlayjqhes=
golang.org/x/net v0.0.0-20220822230855-b0a4917ee28c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI=
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=
golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Expand All @@ -207,8 +209,8 @@ golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64 h1:UiNENfZ8gDvpiWw7IpOMQ27spWmThO1RwwdQVbJahJM=
golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220913175220-63ea55921009 h1:PuvuRMeLWqsf/ZdT1UUZz0syhioyv1mzuFZsXs4fvhw=
golang.org/x/sys v0.0.0-20220913175220-63ea55921009/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand Down
5 changes: 2 additions & 3 deletions internal/app/fluitans/auth/authz.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import (

"github.com/labstack/echo/v4"
"github.com/pkg/errors"

"github.com/sargassum-world/fluitans/pkg/godest/session"
"github.com/sargassum-world/fluitans/pkg/godest/turbostreams"
"github.com/sargassum-world/godest/session"
"github.com/sargassum-world/godest/turbostreams"
)

// Authorization
Expand Down
3 changes: 1 addition & 2 deletions internal/app/fluitans/auth/models.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ import (
"github.com/gorilla/csrf"
"github.com/gorilla/sessions"
"github.com/pkg/errors"

"github.com/sargassum-world/fluitans/pkg/godest/session"
"github.com/sargassum-world/godest/session"
)

type Auth struct {
Expand Down
7 changes: 3 additions & 4 deletions internal/app/fluitans/auth/routing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ import (
"github.com/gorilla/sessions"
"github.com/labstack/echo/v4"
"github.com/pkg/errors"

"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/session"
"github.com/sargassum-world/fluitans/pkg/godest/turbostreams"
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/session"
"github.com/sargassum-world/godest/turbostreams"
)

// HTTP
Expand Down
5 changes: 2 additions & 3 deletions internal/app/fluitans/auth/sessions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ import (

"github.com/gorilla/csrf"
"github.com/gorilla/sessions"

"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/session"
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/session"
)

func GetWithoutRequest(s sessions.Session, ss session.Store) (a Auth, err error) {
Expand Down
12 changes: 6 additions & 6 deletions internal/app/fluitans/client/globals.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ package client

import (
"github.com/pkg/errors"
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/actioncable"
"github.com/sargassum-world/godest/authn"
"github.com/sargassum-world/godest/clientcache"
"github.com/sargassum-world/godest/session"
"github.com/sargassum-world/godest/turbostreams"

"github.com/sargassum-world/fluitans/internal/app/fluitans/conf"
"github.com/sargassum-world/fluitans/internal/clients/desec"
"github.com/sargassum-world/fluitans/internal/clients/zerotier"
"github.com/sargassum-world/fluitans/internal/clients/ztcontrollers"
"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/actioncable"
"github.com/sargassum-world/fluitans/pkg/godest/authn"
"github.com/sargassum-world/fluitans/pkg/godest/clientcache"
"github.com/sargassum-world/fluitans/pkg/godest/session"
"github.com/sargassum-world/fluitans/pkg/godest/turbostreams"
)

type Globals struct {
Expand Down
3 changes: 1 addition & 2 deletions internal/app/fluitans/conf/cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ package conf
import (
"github.com/dgraph-io/ristretto"
"github.com/pkg/errors"

"github.com/sargassum-world/fluitans/pkg/godest/env"
"github.com/sargassum-world/godest/env"
)

const cacheEnvPrefix = "CACHE_"
Expand Down
3 changes: 1 addition & 2 deletions internal/app/fluitans/conf/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ package conf

import (
"github.com/pkg/errors"

"github.com/sargassum-world/fluitans/pkg/godest/env"
"github.com/sargassum-world/godest/env"
)

const httpEnvPrefix = "HTTP_"
Expand Down
6 changes: 3 additions & 3 deletions internal/app/fluitans/handling/turbostreams.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package handling

import (
"github.com/pkg/errors"
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/session"
"github.com/sargassum-world/godest/turbostreams"

"github.com/sargassum-world/fluitans/internal/app/fluitans/auth"
"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/session"
"github.com/sargassum-world/fluitans/pkg/godest/turbostreams"
)

// Rendering
Expand Down
6 changes: 3 additions & 3 deletions internal/app/fluitans/httperr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"github.com/gorilla/csrf"
"github.com/labstack/echo/v4"
"github.com/pkg/errors"
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/httperr"
"github.com/sargassum-world/godest/session"

"github.com/sargassum-world/fluitans/internal/app/fluitans/auth"
"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/httperr"
"github.com/sargassum-world/fluitans/pkg/godest/session"
)

type ErrorData struct {
Expand Down
3 changes: 1 addition & 2 deletions internal/app/fluitans/routes/assets/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import (
"time"

"github.com/labstack/echo/v4"

"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/godest"
)

const (
Expand Down
3 changes: 1 addition & 2 deletions internal/app/fluitans/routes/assets/templated.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ package assets

import (
"github.com/labstack/echo/v4"

"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/godest"
)

func (h *TemplatedHandlers) getWebmanifest() echo.HandlerFunc {
Expand Down
9 changes: 5 additions & 4 deletions internal/app/fluitans/routes/auth/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
package auth

import (
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/actioncable"
"github.com/sargassum-world/godest/authn"
"github.com/sargassum-world/godest/session"

"github.com/sargassum-world/fluitans/internal/app/fluitans/auth"
"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/actioncable"
"github.com/sargassum-world/fluitans/pkg/godest/authn"
"github.com/sargassum-world/fluitans/pkg/godest/session"
)

type Handlers struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/app/fluitans/routes/auth/sessions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/gorilla/csrf"
"github.com/gorilla/sessions"
"github.com/labstack/echo/v4"
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/session"

"github.com/sargassum-world/fluitans/internal/app/fluitans/auth"
"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/session"
)

type CSRFViewData struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/app/fluitans/routes/cable/cable.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (

"github.com/gorilla/sessions"
"github.com/labstack/echo/v4"
"github.com/sargassum-world/godest/actioncable"
"github.com/sargassum-world/godest/turbostreams"

"github.com/sargassum-world/fluitans/internal/app/fluitans/auth"
"github.com/sargassum-world/fluitans/pkg/godest/actioncable"
"github.com/sargassum-world/fluitans/pkg/godest/turbostreams"
)

func (h *Handlers) HandleCableGet() auth.HTTPHandlerFuncWithSession {
Expand Down
8 changes: 4 additions & 4 deletions internal/app/fluitans/routes/cable/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ package cable

import (
"github.com/gorilla/websocket"
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/actioncable"
"github.com/sargassum-world/godest/session"
"github.com/sargassum-world/godest/turbostreams"

"github.com/sargassum-world/fluitans/internal/app/fluitans/auth"
"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/actioncable"
"github.com/sargassum-world/fluitans/pkg/godest/session"
"github.com/sargassum-world/fluitans/pkg/godest/turbostreams"
)

type Handlers struct {
Expand Down
5 changes: 3 additions & 2 deletions internal/app/fluitans/routes/controllers/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
package controllers

import (
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/session"

"github.com/sargassum-world/fluitans/internal/app/fluitans/auth"
"github.com/sargassum-world/fluitans/internal/clients/zerotier"
"github.com/sargassum-world/fluitans/internal/clients/ztcontrollers"
"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/session"
)

type Handlers struct {
Expand Down
7 changes: 4 additions & 3 deletions internal/app/fluitans/routes/dns/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
package dns

import (
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/session"
"github.com/sargassum-world/godest/turbostreams"

"github.com/sargassum-world/fluitans/internal/app/fluitans/auth"
"github.com/sargassum-world/fluitans/internal/app/fluitans/handling"
"github.com/sargassum-world/fluitans/internal/clients/desec"
"github.com/sargassum-world/fluitans/internal/clients/zerotier"
"github.com/sargassum-world/fluitans/internal/clients/ztcontrollers"
"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/session"
"github.com/sargassum-world/fluitans/pkg/godest/turbostreams"
)

type Handlers struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/app/fluitans/routes/dns/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/labstack/echo/v4"
"github.com/pkg/errors"
"github.com/sargassum-world/godest/turbostreams"

"github.com/sargassum-world/fluitans/internal/app/fluitans/auth"
"github.com/sargassum-world/fluitans/internal/app/fluitans/client"
Expand All @@ -16,7 +17,6 @@ import (
"github.com/sargassum-world/fluitans/internal/clients/ztcontrollers"
"github.com/sargassum-world/fluitans/internal/models"
"github.com/sargassum-world/fluitans/pkg/desec"
"github.com/sargassum-world/fluitans/pkg/godest/turbostreams"
"github.com/sargassum-world/fluitans/pkg/slidingwindows"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/app/fluitans/routes/home/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package home

import (
"github.com/labstack/echo/v4"
"github.com/sargassum-world/godest"
"github.com/sargassum-world/godest/session"

"github.com/sargassum-world/fluitans/internal/app/fluitans/auth"
"github.com/sargassum-world/fluitans/pkg/godest"
"github.com/sargassum-world/fluitans/pkg/godest/session"
)

type Handlers struct {
Expand Down
Loading

0 comments on commit 8406d42

Please sign in to comment.