Merge pull request 'refactor: move server package to internal' (#120) from refactor/move-server-to-internal into staging

Reviewed-on: #120

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"
 )

internal/bootstrap/bootstrap_test.go

@@ -14,8 +14,8 @@ import (
 	"tunnel_pls/internal/config"
 	"tunnel_pls/internal/port"
 	"tunnel_pls/internal/registry"
-	"tunnel_pls/internal/session/slug"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/config/config.go

@@ -1,8 +1,6 @@
 package config
 
-import (
-	"tunnel_pls/internal/types"
-)
+import "tunnel_pls/types"
 
 type Config interface {
 	Domain() string

internal/config/config_test.go

@@ -3,7 +3,7 @@ package config
 import (
 	"os"
 	"testing"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	"github.com/stretchr/testify/assert"
 )

internal/config/loader.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strconv"
 	"strings"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	"github.com/joho/godotenv"
 )
@@ -32,7 +32,7 @@ type config struct {
 
 	bufferSize int
 	headerSize int
-
+	
 	pprofEnabled bool
 	pprofPort    string
 

internal/grpc/client/client.go

@@ -9,7 +9,7 @@ import (
 	"time"
 	"tunnel_pls/internal/config"
 	"tunnel_pls/internal/registry"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	proto "git.fossy.my.id/bagas/tunnel-please-grpc/gen"
 	"google.golang.org/grpc"

internal/grpc/client/client_test.go

@@ -7,14 +7,14 @@ import (
 	"io"
 	"testing"
 	"time"
-	"tunnel_pls/internal/session/forwarder"
-	"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/session/forwarder"
+	"tunnel_pls/session/interaction"
+	"tunnel_pls/session/lifecycle"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 
 	proto "git.fossy.my.id/bagas/tunnel-please-grpc/gen"
 	"github.com/stretchr/testify/assert"

internal/registry/registry.go

@@ -3,11 +3,11 @@ package registry
 import (
 	"fmt"
 	"sync"
-	"tunnel_pls/internal/session/forwarder"
-	"tunnel_pls/internal/session/interaction"
-	"tunnel_pls/internal/session/lifecycle"
-	"tunnel_pls/internal/session/slug"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/session/forwarder"
+	"tunnel_pls/session/interaction"
+	"tunnel_pls/session/lifecycle"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 )
 
 type Key = types.SessionKey

internal/registry/registry_test.go

@@ -5,11 +5,11 @@ import (
 	"testing"
 	"time"
 	"tunnel_pls/internal/port"
-	"tunnel_pls/internal/session/forwarder"
-	"tunnel_pls/internal/session/interaction"
-	"tunnel_pls/internal/session/lifecycle"
-	"tunnel_pls/internal/session/slug"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/session/forwarder"
+	"tunnel_pls/session/interaction"
+	"tunnel_pls/session/lifecycle"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/server/server.go

@@ -13,7 +13,7 @@ import (
 	"tunnel_pls/internal/port"
 	"tunnel_pls/internal/random"
 	"tunnel_pls/internal/registry"
-	"tunnel_pls/internal/session"
+	"tunnel_pls/session"
 
 	"golang.org/x/crypto/ssh"
 )

internal/server/server_test.go

@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 	"tunnel_pls/internal/registry"
-	"tunnel_pls/internal/session/slug"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/transport/httphandler.go

@@ -16,7 +16,7 @@ import (
 	"tunnel_pls/internal/http/stream"
 	"tunnel_pls/internal/middleware"
 	"tunnel_pls/internal/registry"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	"golang.org/x/crypto/ssh"
 )

internal/transport/httphandler_test.go

@@ -11,11 +11,11 @@ import (
 	"testing"
 	"time"
 	"tunnel_pls/internal/registry"
-	"tunnel_pls/internal/session/forwarder"
-	"tunnel_pls/internal/session/interaction"
-	"tunnel_pls/internal/session/lifecycle"
-	"tunnel_pls/internal/session/slug"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/session/forwarder"
+	"tunnel_pls/session/interaction"
+	"tunnel_pls/session/lifecycle"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 
 	"golang.org/x/crypto/ssh"
 

internal/transport/tls_test.go

@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 	"tunnel_pls/internal/config"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

renovate.json

@@ -2,8 +2,6 @@
   "extends": [
     "config:recommended"
   ],
-  "prConcurrentLimit": 1,
-  "prHourlyLimit": 1,
   "packageRules": [
     {
       "matchUpdateTypes": [
@@ -12,11 +10,10 @@
         "pin",
         "digest"
       ],
-      "groupName": "all-dependencies",
       "automerge": true,
-      "matchPackageNames": [
-        "*"
+      "baseBranchPatterns": [
+        "staging"
       ]
     }
   ]
-}
+}

session/forwarder/forwarder.go

@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"sync"
 	"tunnel_pls/internal/config"
-	"tunnel_pls/internal/session/slug"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 
 	"golang.org/x/crypto/ssh"
 )

session/forwarder/forwarder_test.go

@@ -10,8 +10,8 @@ import (
 	"sync/atomic"
 	"testing"
 	"time"
-	"tunnel_pls/internal/session/slug"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

session/interaction/interaction.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 	"tunnel_pls/internal/config"
 	"tunnel_pls/internal/random"
-	"tunnel_pls/internal/session/slug"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 
 	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/key"

session/interaction/interaction_test.go

@@ -7,7 +7,7 @@ import (
 	"net"
 	"testing"
 	"time"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/list"

session/interaction/model.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 	"tunnel_pls/internal/random"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/key"

session/interaction/slug.go

@@ -3,7 +3,7 @@ package interaction
 import (
 	"fmt"
 	"strings"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/textinput"

session/lifecycle/lifecycle.go

@@ -6,10 +6,10 @@ import (
 	"net"
 	"sync"
 	"time"
-	"tunnel_pls/internal/session/slug"
-	"tunnel_pls/internal/types"
 
 	portUtil "tunnel_pls/internal/port"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 
 	"golang.org/x/crypto/ssh"
 )

session/lifecycle/lifecycle_test.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"net"
 	"testing"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

session/session.go

@@ -12,12 +12,12 @@ import (
 	portUtil "tunnel_pls/internal/port"
 	"tunnel_pls/internal/random"
 	"tunnel_pls/internal/registry"
-	"tunnel_pls/internal/session/forwarder"
-	"tunnel_pls/internal/session/interaction"
-	"tunnel_pls/internal/session/lifecycle"
-	"tunnel_pls/internal/session/slug"
 	"tunnel_pls/internal/transport"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/session/forwarder"
+	"tunnel_pls/session/interaction"
+	"tunnel_pls/session/lifecycle"
+	"tunnel_pls/session/slug"
+	"tunnel_pls/types"
 
 	"golang.org/x/crypto/ssh"
 )

session/session_test.go

@@ -15,8 +15,8 @@ import (
 	"time"
 	"tunnel_pls/internal/config"
 	"tunnel_pls/internal/registry"
-	"tunnel_pls/internal/session/lifecycle"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/session/lifecycle"
+	"tunnel_pls/types"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"