clawbot
7a34fc999c
All checks were successful
Check / check (push) Successful in 4s
Bumps golangci-lint from v2.10.1 to v2.12.2 everywhere it is pinned and installs the canonical `.golangci.yml`, then fixes every finding the new linter surfaces so `make check` is green. ## Version pins - `Dockerfile` lint stage: `golangci/golangci-lint:v2.12.2` (Debian-based), tag plus digest pin - `script/bootstrap`: `GOLANGCI_LINT_VERSION=2.12.2` with updated `linux-amd64`/`linux-arm64` release-archive sha256 pins ## Config `.golangci.yml` replaced with the canonical config. Material change: the old file declared `version: "2"` but kept settings under the legacy top-level `linters-settings` key, which golangci-lint v2 ignores — so the intended thresholds (`lll` 88, `funlen` 80/50, `cyclop` 15, `dupl` 100) were not being applied. The canonical file moves them under `linters.settings` and drops `issues.exclude-use-default`. ## Lint fixes (216 findings) - `lll` (96): wrapped lines to the 88-column limit - `noctx` (46): `httptest.NewRequestWithContext` with `t.Context()` throughout the tests - `goconst` (24): shared constants for template/JSON keys in `internal/handlers` and repeated test literals - `gosec` (23): app-page redirects now go through a `redirectToApp` helper that path-escapes the app ID (G710 open redirect); `http.ServeFile` of the internally derived deployment log path annotated like the adjacent `os.Stat` (G703) - `dupl` (22): extracted a generic `findAllByAppID` in `internal/models`, a `deleteAppResource` helper in `internal/handlers`, a shared `parsePush` in `internal/service/webhook`, and table-driven/helper-based dedup in tests - `nolintlint` (5): removed `//nolint:funlen` directives made obsolete by the new limits (plus one more that became obsolete after refactoring) - `nilerr` (3, surfaced during fixing): resource-delete lookups now propagate the find error to the caller No behavior changes intended; all tests pass and `make check` is green. Note: golangci-lint v2.12 warns that `gomodguard` is deprecated in favor of `gomodguard_v2` — a future canonical-config update should address this centrally. Co-authored-by: sneak <sneak@sneak.berlin> Reviewed-on: #187 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
67 lines
1.8 KiB
Go
67 lines
1.8 KiB
Go
package deploy_test
|
|
|
|
import (
|
|
"context"
|
|
"log/slog"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"sneak.berlin/go/upaas/internal/config"
|
|
"sneak.berlin/go/upaas/internal/service/deploy"
|
|
)
|
|
|
|
func TestCleanupCancelledDeploy_RemovesBuildDir(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tmpDir := t.TempDir()
|
|
cfg := &config.Config{DataDir: tmpDir}
|
|
|
|
svc := deploy.NewTestServiceWithConfig(slog.Default(), cfg, nil)
|
|
|
|
// Create a fake build directory matching the deployment pattern
|
|
appName := "test-app"
|
|
buildDir := svc.GetBuildDirExported(appName)
|
|
require.NoError(t, os.MkdirAll(buildDir, 0o750))
|
|
|
|
// Create deployment-specific dir: <deploymentID>-<random>
|
|
deployDir := filepath.Join(buildDir, "42-abc123")
|
|
require.NoError(t, os.MkdirAll(deployDir, 0o750))
|
|
|
|
// Create a file inside to verify full removal
|
|
require.NoError(
|
|
t,
|
|
os.WriteFile(filepath.Join(deployDir, "work"), []byte("test"), 0o600),
|
|
)
|
|
|
|
// Also create a dir for a different deployment (should NOT be removed)
|
|
otherDir := filepath.Join(buildDir, "99-xyz789")
|
|
require.NoError(t, os.MkdirAll(otherDir, 0o750))
|
|
|
|
// Run cleanup for deployment 42
|
|
svc.CleanupCancelledDeploy(context.Background(), appName, 42, "")
|
|
|
|
// Deployment 42's dir should be gone
|
|
_, err := os.Stat(deployDir)
|
|
assert.True(t, os.IsNotExist(err), "deployment build dir should be removed")
|
|
|
|
// Deployment 99's dir should still exist
|
|
_, err = os.Stat(otherDir)
|
|
assert.NoError(t, err, "other deployment build dir should not be removed")
|
|
}
|
|
|
|
func TestCleanupCancelledDeploy_NoBuildDir(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
tmpDir := t.TempDir()
|
|
cfg := &config.Config{DataDir: tmpDir}
|
|
|
|
svc := deploy.NewTestServiceWithConfig(slog.Default(), cfg, nil)
|
|
|
|
// Should not panic when build dir doesn't exist
|
|
svc.CleanupCancelledDeploy(context.Background(), "nonexistent-app", 1, "")
|
|
}
|