diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 99f0d40..af3beaa 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -40,10 +40,10 @@ jobs: uses: actions/checkout@v6 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Log in to Docker Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: git.fossy.my.id username: ${{ secrets.DOCKER_USERNAME }} @@ -79,7 +79,7 @@ jobs: fi - name: Build and push Docker image (release) - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . push: true @@ -97,7 +97,7 @@ jobs: if: steps.version.outputs.IS_PRERELEASE == 'false' - name: Build and push Docker image (pre-release) - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . push: true diff --git a/.gitea/workflows/sonarqube.yml b/.gitea/workflows/sonarqube.yml index 3a224b3..382350e 100644 --- a/.gitea/workflows/sonarqube.yml +++ b/.gitea/workflows/sonarqube.yml @@ -43,7 +43,7 @@ jobs: --output.checkstyle.path=golangci-lint-report.xml - name: SonarQube Scan - uses: SonarSource/sonarqube-scan-action@v7.0.0 + uses: SonarSource/sonarqube-scan-action@v7.2.1 env: SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 4d8146a..6c7f4a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.0-alpine AS go_builder +FROM golang:1.26.2-alpine AS go_builder ARG VERSION=dev ARG BUILD_DATE=unknown diff --git a/go.mod b/go.mod index 41f5045..b8b51cf 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.26.0 require ( git.fossy.my.id/bagas/tunnel-please-grpc v1.5.0 - github.com/caddyserver/certmagic v0.25.1 + github.com/caddyserver/certmagic v0.25.3 github.com/charmbracelet/bubbles v1.0.0 github.com/charmbracelet/bubbletea v1.3.10 github.com/charmbracelet/lipgloss v1.1.0 @@ -12,15 +12,15 @@ require ( github.com/libdns/cloudflare v0.2.2 github.com/muesli/termenv v0.16.0 github.com/stretchr/testify v1.11.1 - golang.org/x/crypto v0.48.0 - google.golang.org/grpc v1.78.0 + golang.org/x/crypto v0.50.0 + google.golang.org/grpc v1.80.0 google.golang.org/protobuf v1.36.11 ) require ( github.com/atotto/clipboard v0.1.4 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect - github.com/caddyserver/zerossl v0.1.4 // indirect + github.com/caddyserver/zerossl v0.1.5 // indirect github.com/charmbracelet/colorprofile v0.4.1 // indirect github.com/charmbracelet/x/ansi v0.11.6 // indirect github.com/charmbracelet/x/cellbuf v0.0.15 // indirect @@ -36,8 +36,8 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-localereader v0.0.1 // indirect github.com/mattn/go-runewidth v0.0.19 // indirect - github.com/mholt/acmez/v3 v3.1.4 // indirect - github.com/miekg/dns v1.1.69 // indirect + github.com/mholt/acmez/v3 v3.1.6 // indirect + github.com/miekg/dns v1.1.72 // indirect github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect github.com/muesli/cancelreader v0.2.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -49,12 +49,12 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.1 // indirect go.uber.org/zap/exp v0.3.0 // indirect - golang.org/x/mod v0.32.0 // indirect - golang.org/x/net v0.49.0 // indirect - golang.org/x/sync v0.19.0 // indirect - golang.org/x/sys v0.41.0 // indirect - golang.org/x/text v0.34.0 // indirect - golang.org/x/tools v0.41.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect + golang.org/x/mod v0.35.0 // indirect + golang.org/x/net v0.53.0 // indirect + golang.org/x/sync v0.20.0 // indirect + golang.org/x/sys v0.43.0 // indirect + golang.org/x/text v0.36.0 // indirect + golang.org/x/tools v0.44.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 0797acc..b70f9a8 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,14 @@ github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3v github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E= github.com/caddyserver/certmagic v0.25.1 h1:4sIKKbOt5pg6+sL7tEwymE1x2bj6CHr80da1CRRIPbY= github.com/caddyserver/certmagic v0.25.1/go.mod h1:VhyvndxtVton/Fo/wKhRoC46Rbw1fmjvQ3GjHYSQTEY= +github.com/caddyserver/certmagic v0.25.2 h1:D7xcS7ggX/WEY54x0czj7ioTkmDWKIgxtIi2OcQclUc= +github.com/caddyserver/certmagic v0.25.2/go.mod h1:llW/CvsNmza8S6hmsuggsZeiX+uS27dkqY27wDIuBWg= +github.com/caddyserver/certmagic v0.25.3 h1:mGf5ba8F7xA4c5jfDZZbK2buY1VEkbnwpMDixaju94A= +github.com/caddyserver/certmagic v0.25.3/go.mod h1:YVs43D5+H/Dckt4bTga1KSO/xYfFBfVZainGDywYPAA= github.com/caddyserver/zerossl v0.1.4 h1:CVJOE3MZeFisCERZjkxIcsqIH4fnFdlYWnPYeFtBHRw= github.com/caddyserver/zerossl v0.1.4/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4= +github.com/caddyserver/zerossl v0.1.5 h1:dkvOjBAEEtY6LIGAHei7sw2UgqSD6TrWweXpV7lvEvE= +github.com/caddyserver/zerossl v0.1.5/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4= github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc= github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E= github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw= @@ -66,8 +72,12 @@ github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byF github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= github.com/mholt/acmez/v3 v3.1.4 h1:DyzZe/RnAzT3rpZj/2Ii5xZpiEvvYk3cQEN/RmqxwFQ= github.com/mholt/acmez/v3 v3.1.4/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ= +github.com/mholt/acmez/v3 v3.1.6 h1:eGVQNObP0pBN4sxqrXeg7MYqTOWyoiYpQqITVWlrevk= +github.com/mholt/acmez/v3 v3.1.6/go.mod h1:5nTPosTGosLxF3+LU4ygbgMRFDhbAVpqMI4+a4aHLBY= github.com/miekg/dns v1.1.69 h1:Kb7Y/1Jo+SG+a2GtfoFUfDkG//csdRPwRLkCsxDG9Sc= github.com/miekg/dns v1.1.69/go.mod h1:7OyjD9nEba5OkqQ/hB4fy3PIoxafSZJtducccIelz3g= +github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI= +github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs= github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI= github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= @@ -114,30 +124,66 @@ go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U= go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ= golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= +golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= +golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI= +golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= +golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= +golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= +golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI= +golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY= +golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= +golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= +golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= +golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= +golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= +golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA= +golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= +golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= +golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= +golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= +golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg= +golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k= +golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0= +golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s= +golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0= +golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= +golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b h1:Mv8VFug0MP9e5vUxfBcE3vUkV6CImK3cMNMIDFjmzxU= google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 h1:sNrWoksmOyF5bvJUcnmbeAmQi8baNhqg5IWaI3llQqU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc= google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U= +google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM= +google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go index 6c3a1f9..b02559c 100644 --- a/internal/bootstrap/bootstrap.go +++ b/internal/bootstrap/bootstrap.go @@ -15,10 +15,10 @@ import ( "tunnel_pls/internal/port" "tunnel_pls/internal/random" "tunnel_pls/internal/registry" + "tunnel_pls/internal/server" "tunnel_pls/internal/transport" + "tunnel_pls/internal/types" "tunnel_pls/internal/version" - "tunnel_pls/server" - "tunnel_pls/types" "golang.org/x/crypto/ssh" ) diff --git a/internal/bootstrap/bootstrap_test.go b/internal/bootstrap/bootstrap_test.go index 2453cde..f5a181e 100644 --- a/internal/bootstrap/bootstrap_test.go +++ b/internal/bootstrap/bootstrap_test.go @@ -14,8 +14,8 @@ import ( "tunnel_pls/internal/config" "tunnel_pls/internal/port" "tunnel_pls/internal/registry" - "tunnel_pls/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/session/slug" + "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 e69065d..5009185 100644 --- a/internal/grpc/client/client_test.go +++ b/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" diff --git a/internal/registry/registry.go b/internal/registry/registry.go index e12ea0b..a4f64a8 100644 --- a/internal/registry/registry.go +++ b/internal/registry/registry.go @@ -3,11 +3,11 @@ package registry import ( "fmt" "sync" - "tunnel_pls/session/forwarder" - "tunnel_pls/session/interaction" - "tunnel_pls/session/lifecycle" - "tunnel_pls/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/session/forwarder" + "tunnel_pls/internal/session/interaction" + "tunnel_pls/internal/session/lifecycle" + "tunnel_pls/internal/session/slug" + "tunnel_pls/internal/types" ) type Key = types.SessionKey diff --git a/internal/registry/registry_test.go b/internal/registry/registry_test.go index 484b4e9..9a80d47 100644 --- a/internal/registry/registry_test.go +++ b/internal/registry/registry_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" "tunnel_pls/internal/port" - "tunnel_pls/session/forwarder" - "tunnel_pls/session/interaction" - "tunnel_pls/session/lifecycle" - "tunnel_pls/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/session/forwarder" + "tunnel_pls/internal/session/interaction" + "tunnel_pls/internal/session/lifecycle" + "tunnel_pls/internal/session/slug" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/server/server.go b/internal/server/server.go similarity index 98% rename from server/server.go rename to internal/server/server.go index d3df5fd..480187b 100644 --- a/server/server.go +++ b/internal/server/server.go @@ -13,7 +13,7 @@ import ( "tunnel_pls/internal/port" "tunnel_pls/internal/random" "tunnel_pls/internal/registry" - "tunnel_pls/session" + "tunnel_pls/internal/session" "golang.org/x/crypto/ssh" ) diff --git a/server/server_test.go b/internal/server/server_test.go similarity index 99% rename from server/server_test.go rename to internal/server/server_test.go index a4d5c74..d4499a8 100644 --- a/server/server_test.go +++ b/internal/server/server_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" "tunnel_pls/internal/registry" - "tunnel_pls/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/session/slug" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/session/forwarder/forwarder.go b/internal/session/forwarder/forwarder.go similarity index 98% rename from session/forwarder/forwarder.go rename to internal/session/forwarder/forwarder.go index 03528c9..6af3bae 100644 --- a/session/forwarder/forwarder.go +++ b/internal/session/forwarder/forwarder.go @@ -10,8 +10,8 @@ import ( "strconv" "sync" "tunnel_pls/internal/config" - "tunnel_pls/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/session/slug" + "tunnel_pls/internal/types" "golang.org/x/crypto/ssh" ) diff --git a/session/forwarder/forwarder_test.go b/internal/session/forwarder/forwarder_test.go similarity index 99% rename from session/forwarder/forwarder_test.go rename to internal/session/forwarder/forwarder_test.go index 092d783..2a5c24d 100644 --- a/session/forwarder/forwarder_test.go +++ b/internal/session/forwarder/forwarder_test.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "testing" "time" - "tunnel_pls/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/session/slug" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/session/interaction/coming_soon.go b/internal/session/interaction/coming_soon.go similarity index 100% rename from session/interaction/coming_soon.go rename to internal/session/interaction/coming_soon.go diff --git a/session/interaction/commands.go b/internal/session/interaction/commands.go similarity index 100% rename from session/interaction/commands.go rename to internal/session/interaction/commands.go diff --git a/session/interaction/dashboard.go b/internal/session/interaction/dashboard.go similarity index 100% rename from session/interaction/dashboard.go rename to internal/session/interaction/dashboard.go diff --git a/session/interaction/interaction.go b/internal/session/interaction/interaction.go similarity index 98% rename from session/interaction/interaction.go rename to internal/session/interaction/interaction.go index 814cd67..1246cc6 100644 --- a/session/interaction/interaction.go +++ b/internal/session/interaction/interaction.go @@ -6,8 +6,8 @@ import ( "sync" "tunnel_pls/internal/config" "tunnel_pls/internal/random" - "tunnel_pls/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/session/slug" + "tunnel_pls/internal/types" "github.com/charmbracelet/bubbles/help" "github.com/charmbracelet/bubbles/key" diff --git a/session/interaction/interaction_test.go b/internal/session/interaction/interaction_test.go similarity index 99% rename from session/interaction/interaction_test.go rename to internal/session/interaction/interaction_test.go index 4992093..679ec8a 100644 --- a/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/session/interaction/model.go b/internal/session/interaction/model.go similarity index 98% rename from session/interaction/model.go rename to internal/session/interaction/model.go index c0d1672..6211556 100644 --- a/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/session/interaction/slug.go b/internal/session/interaction/slug.go similarity index 99% rename from session/interaction/slug.go rename to internal/session/interaction/slug.go index ff57cb1..6974474 100644 --- a/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/session/lifecycle/lifecycle.go b/internal/session/lifecycle/lifecycle.go similarity index 97% rename from session/lifecycle/lifecycle.go rename to internal/session/lifecycle/lifecycle.go index 2d9dd3e..286d8fb 100644 --- a/session/lifecycle/lifecycle.go +++ b/internal/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" ) diff --git a/session/lifecycle/lifecycle_test.go b/internal/session/lifecycle/lifecycle_test.go similarity index 99% rename from session/lifecycle/lifecycle_test.go rename to internal/session/lifecycle/lifecycle_test.go index 608b3a8..b8fc7bd 100644 --- a/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/session/session.go b/internal/session/session.go similarity index 98% rename from session/session.go rename to internal/session/session.go index cc27c4c..5978827 100644 --- a/session/session.go +++ b/internal/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/session/forwarder" - "tunnel_pls/session/interaction" - "tunnel_pls/session/lifecycle" - "tunnel_pls/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/types" "golang.org/x/crypto/ssh" ) diff --git a/session/session_test.go b/internal/session/session_test.go similarity index 99% rename from session/session_test.go rename to internal/session/session_test.go index 8a89125..9cff8be 100644 --- a/session/session_test.go +++ b/internal/session/session_test.go @@ -15,8 +15,8 @@ import ( "time" "tunnel_pls/internal/config" "tunnel_pls/internal/registry" - "tunnel_pls/session/lifecycle" - "tunnel_pls/types" + "tunnel_pls/internal/session/lifecycle" + "tunnel_pls/internal/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/session/slug/slug.go b/internal/session/slug/slug.go similarity index 100% rename from session/slug/slug.go rename to internal/session/slug/slug.go diff --git a/session/slug/slug_test.go b/internal/session/slug/slug_test.go similarity index 100% rename from session/slug/slug_test.go rename to internal/session/slug/slug_test.go 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 6801b22..0be77dc 100644 --- a/internal/transport/httphandler_test.go +++ b/internal/transport/httphandler_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" "tunnel_pls/internal/registry" - "tunnel_pls/session/forwarder" - "tunnel_pls/session/interaction" - "tunnel_pls/session/lifecycle" - "tunnel_pls/session/slug" - "tunnel_pls/types" + "tunnel_pls/internal/session/forwarder" + "tunnel_pls/internal/session/interaction" + "tunnel_pls/internal/session/lifecycle" + "tunnel_pls/internal/session/slug" + "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 diff --git a/renovate.json b/renovate.json index 4aceacc..92940fe 100644 --- a/renovate.json +++ b/renovate.json @@ -2,6 +2,8 @@ "extends": [ "config:recommended" ], + "prConcurrentLimit": 1, + "prHourlyLimit": 1, "packageRules": [ { "matchUpdateTypes": [ @@ -10,10 +12,11 @@ "pin", "digest" ], + "groupName": "all-dependencies", "automerge": true, - "baseBranchPatterns": [ - "staging" + "matchPackageNames": [ + "*" ] } ] -} +} \ No newline at end of file