forked from sneak/upaas
## Summary Adds configurable Docker CPU and memory resource constraints per app, closes sneak/upaas#72. ## Changes ### Database - Migration `007_add_resource_limits.sql`: adds `cpu_limit` (REAL, nullable) and `memory_limit` (INTEGER in bytes, nullable) columns to the `apps` table ### Model (`internal/models/app.go`) - Added `CPULimit` (`sql.NullFloat64`) and `MemoryLimit` (`sql.NullInt64`) fields to `App` struct - Updated insert, update, scan, and column list to include the new fields ### Docker Client (`internal/docker/client.go`) - Added `CPULimit` (float64, CPU cores) and `MemoryLimit` (int64, bytes) to `CreateContainerOptions` - Added `cpuLimitToNanoCPUs()` conversion helper and `buildResources()` to construct `container.Resources` - Extracted `buildEnvSlice()` and `buildMounts()` helpers from `CreateContainer` for cleaner code - Resource limits are passed to Docker's `HostConfig.Resources` (NanoCPUs / Memory) ### Deploy Service (`internal/service/deploy/deploy.go`) - `buildContainerOptions` reads `CPULimit` and `MemoryLimit` from the app and passes them to `CreateContainerOptions` ### Handlers (`internal/handlers/app.go`) - `HandleAppUpdate` reads and validates `cpu_limit` and `memory_limit` form fields - Added `parseOptionalFloat64()` for CPU limit parsing (positive float or empty) - Added `parseOptionalMemoryBytes()` for memory parsing with unit suffixes (k/m/g) or plain bytes - Added `optionalNullString()` and `applyResourceLimits()` helpers to keep cyclomatic complexity in check ### Templates - `app_edit.html`: Added "Resource Limits" section with CPU limit (cores) and memory limit (with unit suffix) fields - `templates.go`: Added `formatMemoryBytes` template function for display (converts bytes → human-readable like `256m`, `1g`) ### Tests - `internal/docker/resource_limits_test.go`: Tests for `cpuLimitToNanoCPUs` conversion - `internal/handlers/resource_limits_test.go`: Tests for `parseOptionalFloat64` and `parseOptionalMemoryBytes` (happy paths, edge cases, validation) - `internal/models/models_test.go`: Tests for App model resource limit persistence (save/load, null defaults, clearing) - `internal/service/deploy/deploy_container_test.go`: Tests for container options with/without resource limits - `templates/templates_test.go`: Tests for `formatMemoryBytes` formatting ### README - Added "CPU and memory resource limits per app" to Features list ## Behavior - **CPU limit**: Specified in cores (e.g. `0.5` = half a core, `2` = two cores). Converted to Docker NanoCPUs internally. - **Memory limit**: Accepts plain bytes or suffixed values (`256m`, `1g`, `512k`). Stored as bytes in the database. - Both fields are **optional** — empty/unset means unlimited (no Docker constraint applied). - Limits are applied on every container creation: new deploys, rollbacks, and restarts that recreate the container. closes sneak/upaas#72 Co-authored-by: user <user@Mac.lan guest wan> Reviewed-on: sneak/upaas#165 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
196 lines
4.4 KiB
Go
196 lines
4.4 KiB
Go
package handlers //nolint:testpackage // tests unexported parsing functions
|
|
|
|
import (
|
|
"database/sql"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestParseOptionalFloat64(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
t.Run("empty string returns invalid", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalFloat64("")
|
|
require.NoError(t, err)
|
|
assert.False(t, result.Valid)
|
|
})
|
|
|
|
t.Run("whitespace only returns invalid", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalFloat64(" ")
|
|
require.NoError(t, err)
|
|
assert.False(t, result.Valid)
|
|
})
|
|
|
|
t.Run("valid float", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalFloat64("0.5")
|
|
require.NoError(t, err)
|
|
assert.True(t, result.Valid)
|
|
assert.InDelta(t, 0.5, result.Float64, 0.001)
|
|
})
|
|
|
|
t.Run("valid integer", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalFloat64("2")
|
|
require.NoError(t, err)
|
|
assert.True(t, result.Valid)
|
|
assert.InDelta(t, 2.0, result.Float64, 0.001)
|
|
})
|
|
|
|
t.Run("negative value rejected", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
_, err := parseOptionalFloat64("-1")
|
|
require.Error(t, err)
|
|
})
|
|
|
|
t.Run("zero value rejected", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
_, err := parseOptionalFloat64("0")
|
|
require.Error(t, err)
|
|
})
|
|
|
|
t.Run("non-numeric rejected", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
_, err := parseOptionalFloat64("abc")
|
|
require.Error(t, err)
|
|
})
|
|
}
|
|
|
|
func TestParseOptionalMemoryBytes(t *testing.T) { //nolint:funlen // table-driven test
|
|
t.Parallel()
|
|
|
|
t.Run("empty string returns invalid", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalMemoryBytes("")
|
|
require.NoError(t, err)
|
|
assert.False(t, result.Valid)
|
|
})
|
|
|
|
t.Run("whitespace only returns invalid", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalMemoryBytes(" ")
|
|
require.NoError(t, err)
|
|
assert.False(t, result.Valid)
|
|
})
|
|
|
|
t.Run("plain bytes", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalMemoryBytes("536870912")
|
|
require.NoError(t, err)
|
|
assert.True(t, result.Valid)
|
|
assert.Equal(t, int64(536870912), result.Int64)
|
|
})
|
|
|
|
t.Run("megabytes suffix", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalMemoryBytes("256m")
|
|
require.NoError(t, err)
|
|
assert.True(t, result.Valid)
|
|
assert.Equal(t, int64(256*1024*1024), result.Int64)
|
|
})
|
|
|
|
t.Run("megabytes suffix uppercase", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalMemoryBytes("256M")
|
|
require.NoError(t, err)
|
|
assert.True(t, result.Valid)
|
|
assert.Equal(t, int64(256*1024*1024), result.Int64)
|
|
})
|
|
|
|
t.Run("gigabytes suffix", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalMemoryBytes("1g")
|
|
require.NoError(t, err)
|
|
assert.True(t, result.Valid)
|
|
assert.Equal(t, int64(1024*1024*1024), result.Int64)
|
|
})
|
|
|
|
t.Run("kilobytes suffix", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalMemoryBytes("512k")
|
|
require.NoError(t, err)
|
|
assert.True(t, result.Valid)
|
|
assert.Equal(t, int64(512*1024), result.Int64)
|
|
})
|
|
|
|
t.Run("fractional gigabytes", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalMemoryBytes("1.5g")
|
|
require.NoError(t, err)
|
|
assert.True(t, result.Valid)
|
|
assert.Equal(t, int64(1.5*1024*1024*1024), result.Int64)
|
|
})
|
|
|
|
t.Run("negative value rejected", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
_, err := parseOptionalMemoryBytes("-256m")
|
|
require.Error(t, err)
|
|
})
|
|
|
|
t.Run("zero value rejected", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
_, err := parseOptionalMemoryBytes("0")
|
|
require.Error(t, err)
|
|
})
|
|
|
|
t.Run("invalid string rejected", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
_, err := parseOptionalMemoryBytes("abc")
|
|
require.Error(t, err)
|
|
})
|
|
|
|
t.Run("negative plain bytes rejected", func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
_, err := parseOptionalMemoryBytes("-100")
|
|
require.Error(t, err)
|
|
})
|
|
}
|
|
|
|
func TestAppResourceLimitsRoundTrip(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
// Test that parsing and formatting are consistent
|
|
tests := []struct {
|
|
input string
|
|
expected sql.NullInt64
|
|
format string
|
|
}{
|
|
{"256m", sql.NullInt64{Int64: 256 * 1024 * 1024, Valid: true}, "256m"},
|
|
{"1g", sql.NullInt64{Int64: 1024 * 1024 * 1024, Valid: true}, "1g"},
|
|
{"512k", sql.NullInt64{Int64: 512 * 1024, Valid: true}, "512k"},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.input, func(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
result, err := parseOptionalMemoryBytes(tt.input)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, tt.expected, result)
|
|
})
|
|
}
|
|
}
|