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

Reviewed-on: #120

.gitea/workflows/build.yml

@@ -9,6 +9,7 @@ jobs:
   test:
     name: Run Tests
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
@@ -28,168 +29,15 @@ jobs:
       - name: Run tests
         run: go test -v -p 4 ./...
 
-  build-amd64:
-    name: Build (linux/amd64)
-    runs-on: [ubuntu-latest, amd64]
-    needs: test
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
 
-      - name: Extract version
+  build-and-push:
-        id: version
+    name: Build and Push Docker Image
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
-          echo "COMMIT=${{ github.sha }}" >> $GITHUB_OUTPUT
-
-          if echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$'; then
-            echo "MAJOR=$(echo "$VERSION" | cut -d. -f1)" >> $GITHUB_OUTPUT
-            echo "MINOR=$(echo "$VERSION" | cut -d. -f2)" >> $GITHUB_OUTPUT
-            if echo "$VERSION" | grep -q '-'; then
-              echo "IS_PRERELEASE=true" >> $GITHUB_OUTPUT
-            else
-              echo "IS_PRERELEASE=false" >> $GITHUB_OUTPUT
-            fi
-          else
-            echo "Invalid version format: $VERSION"
-            exit 1
-          fi
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Docker Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.fossy.my.id
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          platforms: linux/amd64
-          outputs: >-
-            type=image,name=git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please,push-by-digest=true,name-canonical=true,push=true
-          build-args: |
-            VERSION=${{ steps.version.outputs.VERSION }}
-            BUILD_DATE=${{ steps.version.outputs.BUILD_DATE }}
-            COMMIT=${{ steps.version.outputs.COMMIT }}
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
-        with:
-          name: digests-linux-amd64
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  build-arm64:
-    name: Build (linux/arm64)
-    runs-on: [ubuntu-latest, arm64]
-    needs: test
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Extract version
-        id: version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
-          echo "COMMIT=${{ github.sha }}" >> $GITHUB_OUTPUT
-
-          if echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$'; then
-            echo "MAJOR=$(echo "$VERSION" | cut -d. -f1)" >> $GITHUB_OUTPUT
-            echo "MINOR=$(echo "$VERSION" | cut -d. -f2)" >> $GITHUB_OUTPUT
-            if echo "$VERSION" | grep -q '-'; then
-              echo "IS_PRERELEASE=true" >> $GITHUB_OUTPUT
-            else
-              echo "IS_PRERELEASE=false" >> $GITHUB_OUTPUT
-            fi
-          else
-            echo "Invalid version format: $VERSION"
-            exit 1
-          fi
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Docker Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.fossy.my.id
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          platforms: linux/arm64
-          outputs: >-
-            type=image,name=git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please,push-by-digest=true,name-canonical=true,push=true
-          build-args: |
-            VERSION=${{ steps.version.outputs.VERSION }}
-            BUILD_DATE=${{ steps.version.outputs.BUILD_DATE }}
-            COMMIT=${{ steps.version.outputs.COMMIT }}
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: https://github.com/christopherHX/gitea-upload-artifact@v4
-        with:
-          name: digests-linux-arm64
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-  merge:
-    name: Merge Multi-Arch Manifest
     runs-on: ubuntu-latest
-    needs: [build-amd64, build-arm64]
+    needs: test
+
     steps:
-      - name: Download all digests
+      - name: Checkout repository
-        uses: https://github.com/christopherHX/gitea-download-artifact@v4
+        uses: actions/checkout@v6
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-
-      - name: Extract version
-        id: version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-
-          if echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$'; then
-            echo "MAJOR=$(echo "$VERSION" | cut -d. -f1)" >> $GITHUB_OUTPUT
-            echo "MINOR=$(echo "$VERSION" | cut -d. -f2)" >> $GITHUB_OUTPUT
-            if echo "$VERSION" | grep -q '-'; then
-              echo "IS_PRERELEASE=true" >> $GITHUB_OUTPUT
-            else
-              echo "IS_PRERELEASE=false" >> $GITHUB_OUTPUT
-            fi
-          else
-            echo "Invalid version format: $VERSION"
-            exit 1
-          fi
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -201,23 +49,64 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Create and push manifest (release)
+      - name: Extract version and determine release type
-        working-directory: /tmp/digests
+        id: version
-        if: steps.version.outputs.IS_PRERELEASE == 'false'
         run: |
-          docker buildx imagetools create \
+          VERSION=${GITHUB_REF#refs/tags/v}
-            -t git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.VERSION }} \
+          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-            -t git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:release \
+          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
-            -t git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.MAJOR }}.${{ steps.version.outputs.MINOR }} \
+          echo "COMMIT=${{ github.sha }}" >> $GITHUB_OUTPUT
-            -t git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.MAJOR }} \
+          
-            -t git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:latest \
+          if echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$'; then
-            $(printf 'git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please@sha256:%s ' *)
+            MAJOR=$(echo "$VERSION" | cut -d. -f1)
+            MINOR=$(echo "$VERSION" | cut -d. -f2)
+            PATCH=$(echo "$VERSION" | cut -d. -f3 | cut -d- -f1)
+          
+            echo "MAJOR=$MAJOR" >> $GITHUB_OUTPUT
+            echo "MINOR=$MINOR" >> $GITHUB_OUTPUT
+            echo "PATCH=$PATCH" >> $GITHUB_OUTPUT
+          
+            if echo "$VERSION" | grep -q '-'; then
+              PRERELEASE_TAG=$(echo "$VERSION" | cut -d- -f2 | cut -d. -f1)
+              echo "IS_PRERELEASE=true" >> $GITHUB_OUTPUT
+              echo "PRERELEASE_TAG=$PRERELEASE_TAG" >> $GITHUB_OUTPUT
+            else
+              echo "IS_PRERELEASE=false" >> $GITHUB_OUTPUT
+            fi
+          else
+            echo "Invalid version format: $VERSION"
+            exit 1
+          fi
 
-      - name: Create and push manifest (pre-release)
+      - name: Build and push Docker image (release)
-        working-directory: /tmp/digests
+        uses: docker/build-push-action@v6
-        if: steps.version.outputs.IS_PRERELEASE == 'true'
+        with:
-        run: |
+          context: .
-          docker buildx imagetools create \
+          push: true
-            -t git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.VERSION }} \
+          tags: |
-            -t git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:staging \
+            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.VERSION }}
-            $(printf 'git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please@sha256:%s ' *)
+            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:release
+            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.MAJOR }}.${{ steps.version.outputs.MINOR }}
+            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.MAJOR }}
+            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:latest
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            VERSION=${{ steps.version.outputs.VERSION }}
+            BUILD_DATE=${{ steps.version.outputs.BUILD_DATE }}
+            COMMIT=${{ steps.version.outputs.COMMIT }}
+        if: steps.version.outputs.IS_PRERELEASE == 'false'
+
+      - name: Build and push Docker image (pre-release)
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: |
+            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.VERSION }}
+            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:staging
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            VERSION=${{ steps.version.outputs.VERSION }}
+            BUILD_DATE=${{ steps.version.outputs.BUILD_DATE }}
+            COMMIT=${{ steps.version.outputs.COMMIT }}
+        if: steps.version.outputs.IS_PRERELEASE == 'true'

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/session/slug"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/config/config.go

@@ -1,8 +1,6 @@
 package config
 
-import (
+import "tunnel_pls/types"
-	"tunnel_pls/internal/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/session/forwarder"
-	"tunnel_pls/internal/session/interaction"
+	"tunnel_pls/session/interaction"
-	"tunnel_pls/internal/session/lifecycle"
+	"tunnel_pls/session/lifecycle"
-	"tunnel_pls/internal/session/slug"
+	"tunnel_pls/session/slug"
-	"tunnel_pls/internal/types"
+	"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/session/forwarder"
-	"tunnel_pls/internal/session/interaction"
+	"tunnel_pls/session/interaction"
-	"tunnel_pls/internal/session/lifecycle"
+	"tunnel_pls/session/lifecycle"
-	"tunnel_pls/internal/session/slug"
+	"tunnel_pls/session/slug"
-	"tunnel_pls/internal/types"
+	"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/session/slug"
-	"tunnel_pls/internal/types"
+	"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/session/forwarder"
-	"tunnel_pls/internal/session/interaction"
+	"tunnel_pls/session/interaction"
-	"tunnel_pls/internal/session/lifecycle"
+	"tunnel_pls/session/lifecycle"
-	"tunnel_pls/internal/session/slug"
+	"tunnel_pls/session/slug"
-	"tunnel_pls/internal/types"
+	"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/session/slug"
-	"tunnel_pls/internal/types"
+	"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/session/slug"
-	"tunnel_pls/internal/types"
+	"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/session/slug"
-	"tunnel_pls/internal/types"
+	"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/session/lifecycle"
-	"tunnel_pls/internal/types"
+	"tunnel_pls/types"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"