fankes/beszel
2
0
Fork 0
mirror of https://github.com/fankes/beszel.git synced 2025-10-18 09:19:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update /src to /internal

Browse Source
This commit is contained in:
henrygd
2025-09-09 13:35:34 -04:00
parent 8a13b05c20
commit c898a9ebbc
44 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/docker-images.yml vendored
View File

@@ -14,21 +14,21 @@ jobs:
include: include:
- image: henrygd/beszel - image: henrygd/beszel
context: ./ context: ./
dockerfile: ./src/dockerfile_hub dockerfile: ./internal/dockerfile_hub
registry: docker.io registry: docker.io
username_secret: DOCKERHUB_USERNAME username_secret: DOCKERHUB_USERNAME
password_secret: DOCKERHUB_TOKEN password_secret: DOCKERHUB_TOKEN
- image: henrygd/beszel-agent - image: henrygd/beszel-agent
context: ./ context: ./
dockerfile: ./src/dockerfile_agent dockerfile: ./internal/dockerfile_agent
registry: docker.io registry: docker.io
username_secret: DOCKERHUB_USERNAME username_secret: DOCKERHUB_USERNAME
password_secret: DOCKERHUB_TOKEN password_secret: DOCKERHUB_TOKEN
- image: henrygd/beszel-agent-nvidia - image: henrygd/beszel-agent-nvidia
context: ./ context: ./
dockerfile: ./src/dockerfile_agent_nvidia dockerfile: ./internal/dockerfile_agent_nvidia
platforms: linux/amd64 platforms: linux/amd64
registry: docker.io registry: docker.io
username_secret: DOCKERHUB_USERNAME username_secret: DOCKERHUB_USERNAME
@@ -36,21 +36,21 @@ jobs:
- image: ghcr.io/${{ github.repository }}/beszel - image: ghcr.io/${{ github.repository }}/beszel
context: ./ context: ./
dockerfile: ./src/dockerfile_hub dockerfile: ./internal/dockerfile_hub
registry: ghcr.io registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}
password_secret: GITHUB_TOKEN password_secret: GITHUB_TOKEN
- image: ghcr.io/${{ github.repository }}/beszel-agent - image: ghcr.io/${{ github.repository }}/beszel-agent
context: ./ context: ./
dockerfile: ./src/dockerfile_agent dockerfile: ./internal/dockerfile_agent
registry: ghcr.io registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}
password_secret: GITHUB_TOKEN password_secret: GITHUB_TOKEN
- image: ghcr.io/${{ github.repository }}/beszel-agent-nvidia - image: ghcr.io/${{ github.repository }}/beszel-agent-nvidia
context: ./ context: ./
dockerfile: ./src/dockerfile_agent_nvidia dockerfile: ./internal/dockerfile_agent_nvidia
platforms: linux/amd64 platforms: linux/amd64
registry: ghcr.io registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}
@@ -68,10 +68,10 @@ jobs:
uses: oven-sh/setup-bun@v2 uses: oven-sh/setup-bun@v2
- name: Install dependencies - name: Install dependencies
run: bun install --no-save --cwd ./src/site run: bun install --no-save --cwd ./internal/site
- name: Build site - name: Build site
run: bun run --cwd ./src/site build run: bun run --cwd ./internal/site build
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3

4
.github/workflows/release.yml vendored
View File

@@ -21,10 +21,10 @@ jobs:
uses: oven-sh/setup-bun@v2 uses: oven-sh/setup-bun@v2
- name: Install dependencies - name: Install dependencies
run: bun install --no-save --cwd ./src/site run: bun install --no-save --cwd ./internal/site
- name: Build site - name: Build site
run: bun run --cwd ./src/site build run: bun run --cwd ./internal/site build
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v5 uses: actions/setup-go@v5

2
.gitignore vendored
View File

@@ -14,7 +14,7 @@ node_modules
build build
*timestamp* *timestamp*
.swc .swc
src/site/src/locales/**/*.ts src/site/internal/locales/**/*.ts
*.bak *.bak
__debug_* __debug_*
agent/lhm/obj agent/lhm/obj

36
Makefile
View File

@@ -26,11 +26,11 @@ tidy:
build-web-ui: build-web-ui:
@if command -v bun >/dev/null 2>&1; then \ @if command -v bun >/dev/null 2>&1; then \
bun install --cwd ./src/site && \ bun install --cwd ./internal/site && \
bun run --cwd ./src/site build; \ bun run --cwd ./internal/site build; \
else \ else \
npm install --prefix ./src/site && \ npm install --prefix ./internal/site && \
npm run --prefix ./src/site build; \ npm run --prefix ./internal/site build; \
fi fi
# Conditional .NET build - only for Windows # Conditional .NET build - only for Windows
@@ -48,45 +48,45 @@ build-dotnet-conditional:
# Update build-agent to include conditional .NET build # Update build-agent to include conditional .NET build
build-agent: tidy build-dotnet-conditional build-agent: tidy build-dotnet-conditional
GOOS=$(OS) GOARCH=$(ARCH) go build -o ./build/beszel-agent_$(OS)_$(ARCH)$(EXE_EXT) -ldflags "-w -s" ./src/cmd/agent GOOS=$(OS) GOARCH=$(ARCH) go build -o ./build/beszel-agent_$(OS)_$(ARCH)$(EXE_EXT) -ldflags "-w -s" ./internal/cmd/agent
build-hub: tidy $(if $(filter false,$(SKIP_WEB)),build-web-ui) build-hub: tidy $(if $(filter false,$(SKIP_WEB)),build-web-ui)
GOOS=$(OS) GOARCH=$(ARCH) go build -o ./build/beszel_$(OS)_$(ARCH)$(EXE_EXT) -ldflags "-w -s" ./src/cmd/hub GOOS=$(OS) GOARCH=$(ARCH) go build -o ./build/beszel_$(OS)_$(ARCH)$(EXE_EXT) -ldflags "-w -s" ./internal/cmd/hub
build-hub-dev: tidy build-hub-dev: tidy
mkdir -p ./src/site/dist && touch ./src/site/dist/index.html mkdir -p ./internal/site/dist && touch ./internal/site/dist/index.html
GOOS=$(OS) GOARCH=$(ARCH) go build -tags development -o ./build/beszel-dev_$(OS)_$(ARCH)$(EXE_EXT) -ldflags "-w -s" ./src/cmd/hub GOOS=$(OS) GOARCH=$(ARCH) go build -tags development -o ./build/beszel-dev_$(OS)_$(ARCH)$(EXE_EXT) -ldflags "-w -s" ./internal/cmd/hub
build: build-agent build-hub build: build-agent build-hub
generate-locales: generate-locales:
@if [ ! -f ./src/site/src/locales/en/en.ts ]; then \ @if [ ! -f ./internal/site/internal/locales/en/en.ts ]; then \
echo "Generating locales..."; \ echo "Generating locales..."; \
command -v bun >/dev/null 2>&1 && cd ./src/site && bun install && bun run sync || cd ./src/site && npm install && npm run sync; \ command -v bun >/dev/null 2>&1 && cd ./internal/site && bun install && bun run sync || cd ./internal/site && npm install && npm run sync; \
fi fi
dev-server: generate-locales dev-server: generate-locales
cd ./src/site cd ./internal/site
@if command -v bun >/dev/null 2>&1; then \ @if command -v bun >/dev/null 2>&1; then \
cd ./src/site && bun run dev --host 0.0.0.0; \ cd ./internal/site && bun run dev --host 0.0.0.0; \
else \ else \
cd ./src/site && npm run dev --host 0.0.0.0; \ cd ./internal/site && npm run dev --host 0.0.0.0; \
fi fi
dev-hub: export ENV=dev dev-hub: export ENV=dev
dev-hub: dev-hub:
mkdir -p ./src/site/dist && touch ./src/site/dist/index.html mkdir -p ./internal/site/dist && touch ./internal/site/dist/index.html
@if command -v entr >/dev/null 2>&1; then \ @if command -v entr >/dev/null 2>&1; then \
find ./src/cmd/hub/*.go ./src/{alerts,hub,records,users}/*.go | entr -r -s "cd ./src/cmd/hub && go run -tags development . serve --http 0.0.0.0:8090"; \ find ./internal/cmd/hub/*.go ./internal/{alerts,hub,records,users}/*.go | entr -r -s "cd ./internal/cmd/hub && go run -tags development . serve --http 0.0.0.0:8090"; \
else \ else \
cd ./src/cmd/hub && go run -tags development . serve --http 0.0.0.0:8090; \ cd ./internal/cmd/hub && go run -tags development . serve --http 0.0.0.0:8090; \
fi fi
dev-agent: dev-agent:
@if command -v entr >/dev/null 2>&1; then \ @if command -v entr >/dev/null 2>&1; then \
find ./src/cmd/agent/*.go ./agent/*.go | entr -r go run github.com/henrygd/beszel/src/cmd/agent; \ find ./internal/cmd/agent/*.go ./agent/*.go | entr -r go run github.com/henrygd/beszel/internal/cmd/agent; \
else \ else \
go run github.com/henrygd/beszel/src/cmd/agent; \ go run github.com/henrygd/beszel/internal/cmd/agent; \
fi fi
build-dotnet: build-dotnet:

2
agent/agent.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/gliderlabs/ssh" "github.com/gliderlabs/ssh"
"github.com/henrygd/beszel" "github.com/henrygd/beszel"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/shirou/gopsutil/v4/host" "github.com/shirou/gopsutil/v4/host"
gossh "golang.org/x/crypto/ssh" gossh "golang.org/x/crypto/ssh"
) )

2
agent/agent_cache.go
View File

@@ -3,7 +3,7 @@ package agent
import ( import (
"time" "time"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
) )
// Not thread safe since we only access from gatherStats which is already locked // Not thread safe since we only access from gatherStats which is already locked

2
agent/agent_cache_test.go
View File

@@ -8,7 +8,7 @@ import (
"testing/synctest" "testing/synctest"
"time" "time"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
agent/client.go
View File

@@ -14,7 +14,7 @@ import (
"time" "time"
"github.com/henrygd/beszel" "github.com/henrygd/beszel"
"github.com/henrygd/beszel/src/common" "github.com/henrygd/beszel/internal/common"
"github.com/fxamacker/cbor/v2" "github.com/fxamacker/cbor/v2"
"github.com/lxzan/gws" "github.com/lxzan/gws"

2
agent/client_test.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/henrygd/beszel" "github.com/henrygd/beszel"
"github.com/henrygd/beszel/src/common" "github.com/henrygd/beszel/internal/common"
"github.com/fxamacker/cbor/v2" "github.com/fxamacker/cbor/v2"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
agent/disk.go
View File

@@ -8,7 +8,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/shirou/gopsutil/v4/disk" "github.com/shirou/gopsutil/v4/disk"
) )

2
agent/docker.go
View File

@@ -14,7 +14,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/henrygd/beszel/src/entities/container" "github.com/henrygd/beszel/internal/entities/container"
"github.com/blang/semver" "github.com/blang/semver"
) )

2
agent/gpu.go
View File

@@ -12,7 +12,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"golang.org/x/exp/slog" "golang.org/x/exp/slog"
) )

2
agent/gpu_test.go
View File

@@ -9,7 +9,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
agent/sensors.go
View File

@@ -10,7 +10,7 @@ import (
"strings" "strings"
"unicode/utf8" "unicode/utf8"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/shirou/gopsutil/v4/common" "github.com/shirou/gopsutil/v4/common"
"github.com/shirou/gopsutil/v4/sensors" "github.com/shirou/gopsutil/v4/sensors"

2
agent/sensors_test.go
View File

@@ -9,7 +9,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/shirou/gopsutil/v4/common" "github.com/shirou/gopsutil/v4/common"
"github.com/shirou/gopsutil/v4/sensors" "github.com/shirou/gopsutil/v4/sensors"

4
agent/server.go
View File

@@ -12,8 +12,8 @@ import (
"time" "time"
"github.com/henrygd/beszel" "github.com/henrygd/beszel"
"github.com/henrygd/beszel/src/common" "github.com/henrygd/beszel/internal/common"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/blang/semver" "github.com/blang/semver"
"github.com/fxamacker/cbor/v2" "github.com/fxamacker/cbor/v2"

4
agent/server_test.go
View File

@@ -13,8 +13,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/henrygd/beszel/src/entities/container" "github.com/henrygd/beszel/internal/entities/container"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/blang/semver" "github.com/blang/semver"
"github.com/fxamacker/cbor/v2" "github.com/fxamacker/cbor/v2"

2
agent/system.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/henrygd/beszel" "github.com/henrygd/beszel"
"github.com/henrygd/beszel/agent/battery" "github.com/henrygd/beszel/agent/battery"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/cpu"
"github.com/shirou/gopsutil/v4/disk" "github.com/shirou/gopsutil/v4/disk"

2
agent/update.go
View File

@@ -8,7 +8,7 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/henrygd/beszel/src/ghupdate" "github.com/henrygd/beszel/internal/ghupdate"
) )
// restarter knows how to restart the beszel-agent service. // restarter knows how to restart the beszel-agent service.

2
internal/alerts/alerts_system.go
View File

@@ -6,7 +6,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/pocketbase/dbx" "github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"

2
internal/alerts/alerts_test.go
View File

@@ -13,7 +13,7 @@ import (
"testing/synctest" "testing/synctest"
"time" "time"
beszelTests "github.com/henrygd/beszel/src/tests" beszelTests "github.com/henrygd/beszel/internal/tests"
"github.com/pocketbase/dbx" "github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"

4
internal/cmd/hub/hub.go
View File

@@ -8,8 +8,8 @@ import (
"time" "time"
"github.com/henrygd/beszel" "github.com/henrygd/beszel"
"github.com/henrygd/beszel/src/hub" "github.com/henrygd/beszel/internal/hub"
_ "github.com/henrygd/beszel/src/migrations" _ "github.com/henrygd/beszel/internal/migrations"
"github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase"
"github.com/pocketbase/pocketbase/plugins/migratecmd" "github.com/pocketbase/pocketbase/plugins/migratecmd"

2
internal/dockerfile_agent
View File

@@ -10,7 +10,7 @@ COPY . ./
# Build # Build
ARG TARGETOS TARGETARCH ARG TARGETOS TARGETARCH
RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./src/cmd/agent RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./internal/cmd/agent
RUN rm -rf /tmp/* RUN rm -rf /tmp/*

2
internal/dockerfile_hub
View File

@@ -17,7 +17,7 @@ RUN update-ca-certificates
# Build # Build
ARG TARGETOS TARGETARCH ARG TARGETOS TARGETARCH
RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /beszel ./src/cmd/hub RUN CGO_ENABLED=0 GOGC=75 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /beszel ./internal/cmd/hub
# ? ------------------------- # ? -------------------------
FROM scratch FROM scratch

2
internal/entities/system/system.go
View File

@@ -5,7 +5,7 @@ package system
import ( import (
"time" "time"
"github.com/henrygd/beszel/src/entities/container" "github.com/henrygd/beszel/internal/entities/container"
) )
type Stats struct { type Stats struct {

6
internal/hub/agent_connect.go
View File

@@ -8,9 +8,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/henrygd/beszel/src/common" "github.com/henrygd/beszel/internal/common"
"github.com/henrygd/beszel/src/hub/expirymap" "github.com/henrygd/beszel/internal/hub/expirymap"
"github.com/henrygd/beszel/src/hub/ws" "github.com/henrygd/beszel/internal/hub/ws"
"github.com/blang/semver" "github.com/blang/semver"
"github.com/lxzan/gws" "github.com/lxzan/gws"

4
internal/hub/agent_connect_test.go
View File

@@ -15,8 +15,8 @@ import (
"time" "time"
"github.com/henrygd/beszel/agent" "github.com/henrygd/beszel/agent"
"github.com/henrygd/beszel/src/common" "github.com/henrygd/beszel/internal/common"
"github.com/henrygd/beszel/src/hub/ws" "github.com/henrygd/beszel/internal/hub/ws"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"
pbtests "github.com/pocketbase/pocketbase/tests" pbtests "github.com/pocketbase/pocketbase/tests"

2
internal/hub/config/config.go
View File

@@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/pocketbase/dbx" "github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"

4
internal/hub/config/config_test.go
View File

@@ -8,9 +8,9 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/henrygd/beszel/src/tests" "github.com/henrygd/beszel/internal/tests"
"github.com/henrygd/beszel/src/hub/config" "github.com/henrygd/beszel/internal/hub/config"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

10
internal/hub/hub.go
View File

@@ -13,11 +13,11 @@ import (
"time" "time"
"github.com/henrygd/beszel" "github.com/henrygd/beszel"
"github.com/henrygd/beszel/src/alerts" "github.com/henrygd/beszel/internal/alerts"
"github.com/henrygd/beszel/src/hub/config" "github.com/henrygd/beszel/internal/hub/config"
"github.com/henrygd/beszel/src/hub/systems" "github.com/henrygd/beszel/internal/hub/systems"
"github.com/henrygd/beszel/src/records" "github.com/henrygd/beszel/internal/records"
"github.com/henrygd/beszel/src/users" "github.com/henrygd/beszel/internal/users"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase"

4
internal/hub/hub_test.go
View File

@@ -15,8 +15,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/henrygd/beszel/src/migrations" "github.com/henrygd/beszel/internal/migrations"
beszelTests "github.com/henrygd/beszel/src/tests" beszelTests "github.com/henrygd/beszel/internal/tests"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"
pbTests "github.com/pocketbase/pocketbase/tests" pbTests "github.com/pocketbase/pocketbase/tests"

2
internal/hub/hub_test_helpers.go
View File

@@ -3,7 +3,7 @@
package hub package hub
import "github.com/henrygd/beszel/src/hub/systems" import "github.com/henrygd/beszel/internal/hub/systems"
// TESTING ONLY: GetSystemManager returns the system manager // TESTING ONLY: GetSystemManager returns the system manager
func (h *Hub) GetSystemManager() *systems.SystemManager { func (h *Hub) GetSystemManager() *systems.SystemManager {

2
internal/hub/server_production.go
View File

@@ -9,7 +9,7 @@ import (
"strings" "strings"
"github.com/henrygd/beszel" "github.com/henrygd/beszel"
"github.com/henrygd/beszel/src/site" "github.com/henrygd/beszel/internal/site"
"github.com/pocketbase/pocketbase/apis" "github.com/pocketbase/pocketbase/apis"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"

4
internal/hub/systems/system.go
View File

@@ -10,9 +10,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/henrygd/beszel/src/hub/ws" "github.com/henrygd/beszel/internal/hub/ws"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/henrygd/beszel" "github.com/henrygd/beszel"

6
internal/hub/systems/system_manager.go
View File

@@ -5,11 +5,11 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/henrygd/beszel/src/hub/ws" "github.com/henrygd/beszel/internal/hub/ws"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/henrygd/beszel/src/common" "github.com/henrygd/beszel/internal/common"
"github.com/henrygd/beszel" "github.com/henrygd/beszel"

8
internal/hub/systems/systems_test.go
View File

@@ -10,10 +10,10 @@ import (
"testing/synctest" "testing/synctest"
"time" "time"
"github.com/henrygd/beszel/src/entities/container" "github.com/henrygd/beszel/internal/entities/container"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/henrygd/beszel/src/hub/systems" "github.com/henrygd/beszel/internal/hub/systems"
"github.com/henrygd/beszel/src/tests" "github.com/henrygd/beszel/internal/tests"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
internal/hub/systems/systems_test_helpers.go
View File

@@ -7,7 +7,7 @@ import (
"context" "context"
"fmt" "fmt"
entities "github.com/henrygd/beszel/src/entities/system" entities "github.com/henrygd/beszel/internal/entities/system"
) )
// TESTING ONLY: GetSystemCount returns the number of systems in the store // TESTING ONLY: GetSystemCount returns the number of systems in the store

2
internal/hub/update.go
View File

@@ -6,7 +6,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"github.com/henrygd/beszel/src/ghupdate" "github.com/henrygd/beszel/internal/ghupdate"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

4
internal/hub/ws/ws.go
View File

@@ -5,9 +5,9 @@ import (
"time" "time"
"weak" "weak"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/henrygd/beszel/src/common" "github.com/henrygd/beszel/internal/common"
"github.com/fxamacker/cbor/v2" "github.com/fxamacker/cbor/v2"
"github.com/lxzan/gws" "github.com/lxzan/gws"

2
internal/hub/ws/ws_test.go
View File

@@ -8,7 +8,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/henrygd/beszel/src/common" "github.com/henrygd/beszel/internal/common"
"github.com/fxamacker/cbor/v2" "github.com/fxamacker/cbor/v2"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

4
internal/records/records.go
View File

@@ -9,8 +9,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/henrygd/beszel/src/entities/container" "github.com/henrygd/beszel/internal/entities/container"
"github.com/henrygd/beszel/src/entities/system" "github.com/henrygd/beszel/internal/entities/system"
"github.com/pocketbase/dbx" "github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"

4
internal/records/records_test.go
View File

@@ -8,8 +8,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/henrygd/beszel/src/records" "github.com/henrygd/beszel/internal/records"
"github.com/henrygd/beszel/src/tests" "github.com/henrygd/beszel/internal/tests"
"github.com/pocketbase/dbx" "github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"

2
internal/tests/hub.go
View File

@@ -8,7 +8,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/henrygd/beszel/src/hub" "github.com/henrygd/beszel/internal/hub"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"
"github.com/pocketbase/pocketbase/tests" "github.com/pocketbase/pocketbase/tests"

2
internal/users/users.go
View File

@@ -5,7 +5,7 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/henrygd/beszel/src/migrations" "github.com/henrygd/beszel/internal/migrations"
"github.com/pocketbase/dbx" "github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/core" "github.com/pocketbase/pocketbase/core"