diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go index 132578f..b02559c 100644 --- a/internal/bootstrap/bootstrap.go +++ b/internal/bootstrap/bootstrap.go @@ -17,8 +17,8 @@ import ( "tunnel_pls/internal/registry" "tunnel_pls/internal/server" "tunnel_pls/internal/transport" + "tunnel_pls/internal/types" "tunnel_pls/internal/version" - "tunnel_pls/types" "golang.org/x/crypto/ssh" ) diff --git a/internal/bootstrap/bootstrap_test.go b/internal/bootstrap/bootstrap_test.go index fc580a5..f5a181e 100644 --- a/internal/bootstrap/bootstrap_test.go +++ b/internal/bootstrap/bootstrap_test.go @@ -15,7 +15,7 @@ import ( "tunnel_pls/internal/port" "tunnel_pls/internal/registry" "tunnel_pls/internal/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/config/config.go b/internal/config/config.go index 3e6c9e1..f3876bf 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,6 +1,8 @@ package config -import "tunnel_pls/types" +import ( + "tunnel_pls/internal/types" +) type Config interface { Domain() string diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 85f93f3..af2e4f4 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -3,7 +3,7 @@ package config import ( "os" "testing" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/config/loader.go b/internal/config/loader.go index 5cbfe1f..c6cb909 100644 --- a/internal/config/loader.go +++ b/internal/config/loader.go @@ -6,7 +6,7 @@ import ( "os" "strconv" "strings" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/joho/godotenv" ) @@ -32,7 +32,7 @@ type config struct { bufferSize int headerSize int - + pprofEnabled bool pprofPort string diff --git a/internal/grpc/client/client.go b/internal/grpc/client/client.go index 3adcc57..8fb85fb 100644 --- a/internal/grpc/client/client.go +++ b/internal/grpc/client/client.go @@ -9,7 +9,7 @@ import ( "time" "tunnel_pls/internal/config" "tunnel_pls/internal/registry" - "tunnel_pls/types" + "tunnel_pls/internal/types" proto "git.fossy.my.id/bagas/tunnel-please-grpc/gen" "google.golang.org/grpc" diff --git a/internal/grpc/client/client_test.go b/internal/grpc/client/client_test.go index 0581d9a..5009185 100644 --- a/internal/grpc/client/client_test.go +++ b/internal/grpc/client/client_test.go @@ -11,10 +11,10 @@ import ( "tunnel_pls/internal/session/interaction" "tunnel_pls/internal/session/lifecycle" "tunnel_pls/internal/session/slug" + "tunnel_pls/internal/types" "tunnel_pls/internal/port" "tunnel_pls/internal/registry" - "tunnel_pls/types" proto "git.fossy.my.id/bagas/tunnel-please-grpc/gen" "github.com/stretchr/testify/assert" diff --git a/internal/registry/registry.go b/internal/registry/registry.go index 470ccf2..a4f64a8 100644 --- a/internal/registry/registry.go +++ b/internal/registry/registry.go @@ -7,7 +7,7 @@ import ( "tunnel_pls/internal/session/interaction" "tunnel_pls/internal/session/lifecycle" "tunnel_pls/internal/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/types" ) type Key = types.SessionKey diff --git a/internal/registry/registry_test.go b/internal/registry/registry_test.go index 7a2376f..9a80d47 100644 --- a/internal/registry/registry_test.go +++ b/internal/registry/registry_test.go @@ -9,7 +9,7 @@ import ( "tunnel_pls/internal/session/interaction" "tunnel_pls/internal/session/lifecycle" "tunnel_pls/internal/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/server/server_test.go b/internal/server/server_test.go index 2f53a3a..d4499a8 100644 --- a/internal/server/server_test.go +++ b/internal/server/server_test.go @@ -11,7 +11,7 @@ import ( "time" "tunnel_pls/internal/registry" "tunnel_pls/internal/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/session/forwarder/forwarder.go b/internal/session/forwarder/forwarder.go index d4e0a4d..6af3bae 100644 --- a/internal/session/forwarder/forwarder.go +++ b/internal/session/forwarder/forwarder.go @@ -11,7 +11,7 @@ import ( "sync" "tunnel_pls/internal/config" "tunnel_pls/internal/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/types" "golang.org/x/crypto/ssh" ) diff --git a/internal/session/forwarder/forwarder_test.go b/internal/session/forwarder/forwarder_test.go index 531b2cc..2a5c24d 100644 --- a/internal/session/forwarder/forwarder_test.go +++ b/internal/session/forwarder/forwarder_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" "tunnel_pls/internal/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/session/interaction/interaction.go b/internal/session/interaction/interaction.go index 0be9e48..1246cc6 100644 --- a/internal/session/interaction/interaction.go +++ b/internal/session/interaction/interaction.go @@ -7,7 +7,7 @@ import ( "tunnel_pls/internal/config" "tunnel_pls/internal/random" "tunnel_pls/internal/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/charmbracelet/bubbles/help" "github.com/charmbracelet/bubbles/key" diff --git a/internal/session/interaction/interaction_test.go b/internal/session/interaction/interaction_test.go index 4992093..679ec8a 100644 --- a/internal/session/interaction/interaction_test.go +++ b/internal/session/interaction/interaction_test.go @@ -7,7 +7,7 @@ import ( "net" "testing" "time" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/list" diff --git a/internal/session/interaction/model.go b/internal/session/interaction/model.go index c0d1672..6211556 100644 --- a/internal/session/interaction/model.go +++ b/internal/session/interaction/model.go @@ -4,7 +4,7 @@ import ( "fmt" "time" "tunnel_pls/internal/random" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/charmbracelet/bubbles/help" "github.com/charmbracelet/bubbles/key" diff --git a/internal/session/interaction/slug.go b/internal/session/interaction/slug.go index ff57cb1..6974474 100644 --- a/internal/session/interaction/slug.go +++ b/internal/session/interaction/slug.go @@ -3,7 +3,7 @@ package interaction import ( "fmt" "strings" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/textinput" diff --git a/internal/session/lifecycle/lifecycle.go b/internal/session/lifecycle/lifecycle.go index 5eb8fa8..286d8fb 100644 --- a/internal/session/lifecycle/lifecycle.go +++ b/internal/session/lifecycle/lifecycle.go @@ -7,9 +7,9 @@ import ( "sync" "time" "tunnel_pls/internal/session/slug" + "tunnel_pls/internal/types" portUtil "tunnel_pls/internal/port" - "tunnel_pls/types" "golang.org/x/crypto/ssh" ) diff --git a/internal/session/lifecycle/lifecycle_test.go b/internal/session/lifecycle/lifecycle_test.go index 608b3a8..b8fc7bd 100644 --- a/internal/session/lifecycle/lifecycle_test.go +++ b/internal/session/lifecycle/lifecycle_test.go @@ -6,7 +6,7 @@ import ( "io" "net" "testing" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/session/session.go b/internal/session/session.go index ac10ca6..5978827 100644 --- a/internal/session/session.go +++ b/internal/session/session.go @@ -17,7 +17,7 @@ import ( "tunnel_pls/internal/session/lifecycle" "tunnel_pls/internal/session/slug" "tunnel_pls/internal/transport" - "tunnel_pls/types" + "tunnel_pls/internal/types" "golang.org/x/crypto/ssh" ) diff --git a/internal/session/session_test.go b/internal/session/session_test.go index 14a73e0..9cff8be 100644 --- a/internal/session/session_test.go +++ b/internal/session/session_test.go @@ -16,7 +16,7 @@ import ( "tunnel_pls/internal/config" "tunnel_pls/internal/registry" "tunnel_pls/internal/session/lifecycle" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/transport/httphandler.go b/internal/transport/httphandler.go index 67aa6fb..bcb74e8 100644 --- a/internal/transport/httphandler.go +++ b/internal/transport/httphandler.go @@ -16,7 +16,7 @@ import ( "tunnel_pls/internal/http/stream" "tunnel_pls/internal/middleware" "tunnel_pls/internal/registry" - "tunnel_pls/types" + "tunnel_pls/internal/types" "golang.org/x/crypto/ssh" ) diff --git a/internal/transport/httphandler_test.go b/internal/transport/httphandler_test.go index aba99ae..0be77dc 100644 --- a/internal/transport/httphandler_test.go +++ b/internal/transport/httphandler_test.go @@ -15,7 +15,7 @@ import ( "tunnel_pls/internal/session/interaction" "tunnel_pls/internal/session/lifecycle" "tunnel_pls/internal/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/types" "golang.org/x/crypto/ssh" diff --git a/internal/transport/tls_test.go b/internal/transport/tls_test.go index 0c5510c..3de8066 100644 --- a/internal/transport/tls_test.go +++ b/internal/transport/tls_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" "tunnel_pls/internal/config" - "tunnel_pls/types" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/types/types.go b/internal/types/types.go similarity index 100% rename from types/types.go rename to internal/types/types.go