feat: Add ID option to plugin_worker command

- Add -id CLI flag to allow custom worker IDs
- Auto-generates ID if not specified (worker-{hostname}-{timestamp})
- ID defaults to empty string and is optional
- Log the custom ID when specified
- Update usage examples to show -id option
- Worker can now be identified by custom name in admin UI

.github/workflows/depsreview.yml

@@ -11,4 +11,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@05fe4576374b728f0c523d6a13d64c25081e0803
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261

.github/workflows/helm_ci.yml

@@ -119,7 +119,7 @@ jobs:
           echo "✅ All template rendering tests passed!"
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.14.0
+        uses: helm/kind-action@v1.13.0
 
       - name: Run chart-testing (install)
         run: ct install --target-branch ${{ github.event.repository.default_branch }} --all --chart-dirs k8s/charts

.github/workflows/plugin-workers.yml

@@ -1,41 +0,0 @@
-name: "Plugin Worker Integration Tests"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-permissions:
-  contents: read
-
-jobs:
-  plugin-worker:
-    name: "Plugin Worker: ${{ matrix.worker }}"
-    runs-on: ubuntu-22.04
-    timeout-minutes: 10
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - worker: erasure_coding
-            path: test/plugin_workers/erasure_coding
-          - worker: ec_repair
-            path: test/plugin_workers/ec_repair
-          - worker: vacuum
-            path: test/plugin_workers/vacuum
-          - worker: volume_balance
-            path: test/plugin_workers/volume_balance
-
-    steps:
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v6
-        with:
-          go-version: ^1.26
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v6
-
-      - name: Run plugin worker tests
-        run: go test -v ./${{ matrix.path }}

.github/workflows/s3-example-integration-tests.yml

@@ -39,14 +39,6 @@ jobs:
           echo "=== Running S3 Integration Tests ==="
           go test -v -timeout=60s -run TestS3Integration ./...
 
-      - name: Run S3 DeleteBucketNotEmpty Tests
-        timeout-minutes: 15
-        working-directory: test/s3/normal
-        run: |
-          set -x
-          echo "=== Running S3 DeleteBucketNotEmpty Tests ==="
-          go test -v -timeout=60s -run TestS3DeleteBucketNotEmpty ./...
-
       - name: Run IAM Integration Tests
         timeout-minutes: 15
         working-directory: test/s3/normal

Makefile

@@ -1,4 +1,4 @@
-.PHONY: test admin-generate admin-build admin-clean admin-dev admin-run admin-test admin-fmt admin-help weed-commands
+.PHONY: test admin-generate admin-build admin-clean admin-dev admin-run admin-test admin-fmt admin-help
 
 BINARY = weed
 ADMIN_DIR = weed/admin
@@ -11,9 +11,6 @@ all: install
 install: admin-generate
 	cd weed; go install
 
-weed-commands:
-	cd weed && $(MAKE) weed-db weed-sql
-
 warp_install:
 	go install github.com/minio/warp@v0.7.6
 
@@ -43,7 +40,7 @@ test: admin-generate
 # Admin component targets
 admin-generate:
 	@echo "Generating admin component templates..."
-	@cd $(ADMIN_DIR) && templ generate ./view
+	@templ generate
 
 admin-build: admin-generate
 	@echo "Building admin component..."

cmd/weed-db/main.go

@@ -1,7 +0,0 @@
-package main
-
-import "os"
-
-func main() {
-	os.Exit(Run(os.Args[1:]))
-}

cmd/weed-sql/main.go

@@ -1,7 +0,0 @@
-package main
-
-import "os"
-
-func main() {
-	os.Exit(Run(os.Args[1:]))
-}

docker/entrypoint.sh

@@ -20,17 +20,13 @@ if [ "$(id -u)" = "0" ]; then
   
   DATA_UID=$(stat -c '%u' /data 2>/dev/null)
   DATA_GID=$(stat -c '%g' /data 2>/dev/null)
-
-  # Only run chown -R if ownership doesn't already match (avoids expensive
-  # recursive chown on subsequent starts, and is a no-op on OpenShift when
-  # fsGroup has already set correct ownership on the PVC).
-  if [ "$DATA_UID" != "$SEAWEED_UID" ] || [ "$DATA_GID" != "$SEAWEED_GID" ]; then
+  
+  # Only run chown -R if ownership doesn't match (much faster for subsequent starts)
     echo "Fixing /data ownership for seaweed user (uid=$SEAWEED_UID, gid=$SEAWEED_GID)"
     if ! chown -R seaweed:seaweed /data; then
       echo "Warning: Failed to change ownership of /data. This may cause permission errors." >&2
       echo "If /data is read-only or has mount issues, the application may fail to start." >&2
     fi
-  fi
   
   # Use su-exec to drop privileges and run as seaweed user
   exec su-exec seaweed "$0" "$@"
@@ -58,7 +54,7 @@ isArgPassed() {
 case "$1" in
 
   'master')
-  	ARGS="-mdir=/data -volumeSizeLimitMB=1024"
+  	ARGS="-mdir=/data -volumePreallocate -volumeSizeLimitMB=1024"
   	shift
   	exec /usr/bin/weed -logtostderr=true master $ARGS $@
 	;;
@@ -73,9 +69,9 @@ case "$1" in
 	;;
 
   'server')
-  	ARGS="-dir=/data -volume.max=0 -master.volumeSizeLimitMB=1024"
+  	ARGS="-dir=/data -volume.max=0 -master.volumePreallocate -master.volumeSizeLimitMB=1024"
   	if isArgPassed "-volume.max" "$@"; then
-  	  ARGS="-dir=/data -master.volumeSizeLimitMB=1024"
+  	  ARGS="-dir=/data -master.volumePreallocate -master.volumeSizeLimitMB=1024"
   	fi
  	shift
   	exec /usr/bin/weed -logtostderr=true server $ARGS $@

docker/entrypoint_e2e.sh

@@ -33,7 +33,7 @@ isArgPassed() {
 case "$1" in
 
   'master')
-  	ARGS="-mdir=/data -volumeSizeLimitMB=1024"
+  	ARGS="-mdir=/data -volumePreallocate -volumeSizeLimitMB=1024"
   	shift
   	exec /usr/bin/weed -logtostderr=true master $ARGS "$@"
 	;;
@@ -48,9 +48,9 @@ case "$1" in
 	;;
 
   'server')
-  	ARGS="-dir=/data -volume.max=0 -master.volumeSizeLimitMB=1024"
+  	ARGS="-dir=/data -volume.max=0 -master.volumePreallocate -master.volumeSizeLimitMB=1024"
   	if isArgPassed "-volume.max" "$@"; then
-  	  ARGS="-dir=/data -master.volumeSizeLimitMB=1024"
+  	  ARGS="-dir=/data -master.volumePreallocate -master.volumeSizeLimitMB=1024"
   	fi
  	shift
   	exec /usr/bin/weed -logtostderr=true server $ARGS "$@"

docker/seaweedfs-dev-compose.yml

@@ -42,12 +42,3 @@ services:
       - master
       - volume
       - filer
-  admin:
-    image: chrislusf/seaweedfs:dev # use a remote dev image
-    ports:
-      - 23646:23646
-    command: 'admin -master=master:9333'
-    depends_on:
-      - master
-      - volume
-      - filer

go.mod

@@ -94,7 +94,7 @@ require (
 	gocloud.dev/pubsub/rabbitpubsub v0.44.0
 	golang.org/x/crypto v0.48.0
 	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
-	golang.org/x/image v0.36.0
+	golang.org/x/image v0.35.0
 	golang.org/x/net v0.49.0
 	golang.org/x/oauth2 v0.34.0
 	golang.org/x/sys v0.41.0
@@ -109,7 +109,7 @@ require (
 	modernc.org/b v1.0.0 // indirect
 	modernc.org/mathutil v1.7.1
 	modernc.org/memory v1.11.0 // indirect
-	modernc.org/sqlite v1.46.1
+	modernc.org/sqlite v1.44.3
 	modernc.org/strutil v1.2.1
 )
 
@@ -131,6 +131,8 @@ require (
 	github.com/cognusion/imaging v1.0.2
 	github.com/fluent/fluent-logger-golang v1.10.1
 	github.com/getsentry/sentry-go v0.42.0
+	github.com/gin-contrib/sessions v1.0.4
+	github.com/gin-gonic/gin v1.11.0
 	github.com/go-ldap/ldap/v3 v3.4.12
 	github.com/golang-jwt/jwt/v5 v5.3.1
 	github.com/google/flatbuffers/go v0.0.0-20230108230133-3b8644d32c50
@@ -143,10 +145,10 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.34
 	github.com/minio/crc64nvme v1.1.1
 	github.com/orcaman/concurrent-map/v2 v2.0.1
-	github.com/parquet-go/parquet-go v0.28.0
+	github.com/parquet-go/parquet-go v0.26.4
 	github.com/pkg/sftp v1.13.10
 	github.com/rabbitmq/amqp091-go v1.10.0
-	github.com/rclone/rclone v1.73.1
+	github.com/rclone/rclone v1.72.1
 	github.com/rdleal/intervalst v1.5.0
 	github.com/redis/go-redis/v9 v9.18.0
 	github.com/schollz/progressbar/v3 v3.19.0
@@ -178,7 +180,6 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest/to v0.4.1 // indirect
-	github.com/FilenCloudDienste/filen-sdk-go v0.0.37 // indirect
 	github.com/a1ex3/zstd-seekable-format-go/pkg v0.10.0 // indirect
 	github.com/anchore/go-lzo v0.1.0 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
@@ -211,8 +212,6 @@ require (
 	github.com/docker/docker v28.5.0+incompatible // indirect
 	github.com/docker/go-connections v0.6.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/dromara/dongle v1.0.1 // indirect
-	github.com/gin-gonic/gin v1.11.0 // indirect
 	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
 	github.com/go-git/go-billy/v5 v5.6.2 // indirect
 	github.com/goccy/go-yaml v1.18.0 // indirect
@@ -227,7 +226,6 @@ require (
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
-	github.com/internxt/rclone-adapter v0.0.0-20260213125353-6f59c89fcb7c // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
@@ -259,9 +257,8 @@ require (
 	github.com/pierrre/geohash v1.0.0 // indirect
 	github.com/pquerna/otp v1.5.0 // indirect
 	github.com/pterm/pterm v0.12.81 // indirect
+	github.com/quic-go/qpack v0.6.0 // indirect
 	github.com/quic-go/quic-go v0.57.0 // indirect
-	github.com/rclone/Proton-API-Bridge v1.0.1-0.20260127174007-77f974840d11 // indirect
-	github.com/rclone/go-proton-api v1.0.1-0.20260127173028-eb465cac3b18 // indirect
 	github.com/rogpeppe/go-internal v1.14.1 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
@@ -270,9 +267,8 @@ require (
 	github.com/substrait-io/substrait v0.69.0 // indirect
 	github.com/substrait-io/substrait-go/v4 v4.4.0 // indirect
 	github.com/substrait-io/substrait-protobuf/go v0.71.0 // indirect
-	github.com/twpayne/go-geom v1.6.1 // indirect
-	github.com/twpayne/go-kml/v3 v3.2.1 // indirect
-	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
+	github.com/twpayne/go-geom v1.4.1 // indirect
+	github.com/twpayne/go-kml v1.5.2 // indirect
 	github.com/ulikunitz/xz v0.5.15 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
@@ -283,7 +279,6 @@ require (
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0 // indirect
 	go.opentelemetry.io/otel/exporters/zipkin v1.36.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
-	go.uber.org/mock v0.5.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/mod v0.32.0 // indirect
@@ -298,7 +293,7 @@ require (
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect
 	cloud.google.com/go/iam v1.5.3 // indirect
 	cloud.google.com/go/monitoring v1.24.2 // indirect
-	filippo.io/edwards25519 v1.1.1 // indirect
+	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
@@ -346,12 +341,15 @@ require (
 	github.com/bradenaw/juniper v0.15.3 // indirect
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
 	github.com/buengese/sgzip v0.1.1 // indirect
+	github.com/bytedance/sonic v1.14.0 // indirect
+	github.com/bytedance/sonic/loader v0.3.0 // indirect
 	github.com/calebcase/tmpfile v1.0.3 // indirect
 	github.com/chilts/sid v0.0.0-20190607042430-660e94789ec9 // indirect
-	github.com/cloudflare/circl v1.6.3 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/cloudinary/cloudinary-go/v2 v2.13.0 // indirect
 	github.com/cloudsoda/go-smb2 v0.0.0-20250228001242-d4c70e6251cc // indirect
 	github.com/cloudsoda/sddl v0.0.0-20250224235906-926454e91efc // indirect
+	github.com/cloudwego/base64x v0.1.6 // indirect
 	github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect
 	github.com/colinmarc/hdfs/v2 v2.4.0 // indirect
 	github.com/creasty/defaults v1.8.0 // indirect
@@ -371,7 +369,8 @@ require (
 	github.com/flynn/noise v1.1.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.11 // indirect
 	github.com/geoffgarside/ber v1.2.0 // indirect
-	github.com/go-chi/chi/v5 v5.2.5 // indirect
+	github.com/gin-contrib/sse v1.1.0 // indirect
+	github.com/go-chi/chi/v5 v5.2.3 // indirect
 	github.com/go-darwin/apfs v0.0.0-20211011131704-f84b94dbf348 // indirect
 	github.com/go-jose/go-jose/v4 v4.1.3 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
@@ -390,9 +389,10 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
+	github.com/gorilla/context v1.1.2 // indirect
 	github.com/gorilla/schema v1.4.1 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
-	github.com/gorilla/sessions v1.4.0
+	github.com/gorilla/sessions v1.4.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -402,6 +402,8 @@ require (
 	github.com/hashicorp/go-msgpack/v2 v2.1.2 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
 	github.com/hashicorp/golang-lru v0.6.0 // indirect
+	github.com/henrybear327/Proton-API-Bridge v1.0.0 // indirect
+	github.com/henrybear327/go-proton-api v1.0.0 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
 	github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
@@ -443,7 +445,7 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14 // indirect
 	github.com/philhofer/fwd v1.2.0 // indirect
-	github.com/pierrec/lz4/v4 v4.1.25
+	github.com/pierrec/lz4/v4 v4.1.22
 	github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
 	github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c // indirect
 	github.com/pingcap/kvproto v0.0.0-20230403051650-e166ae588106 // indirect
@@ -459,7 +461,7 @@ require (
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
 	github.com/sagikazarmark/locafero v0.11.0 // indirect
 	github.com/samber/lo v1.52.0 // indirect
-	github.com/seaweedfs/cockroachdb-parser v0.0.0-20260225204133-2f342c5ea564
+	github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
 	github.com/sony/gobreaker v1.0.0 // indirect
 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
@@ -474,7 +476,9 @@ require (
 	github.com/tinylib/msgp v1.5.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.16 // indirect
 	github.com/tklauser/numcpus v0.11.0 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/twmb/murmur3 v1.1.8 // indirect
+	github.com/ugorji/go/codec v1.3.0 // indirect
 	github.com/unknwon/goconfig v1.0.0 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
@@ -500,6 +504,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.1 // indirect
+	golang.org/x/arch v0.20.0 // indirect
 	golang.org/x/term v0.40.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20251124214823-79d6a2a48846 // indirect

go.sum

@@ -547,8 +547,8 @@ cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcP
 dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
 dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw=
-filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
@@ -573,6 +573,7 @@ github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4 h1:jWQK1GI+LeGGUKBAD
 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4/go.mod h1:8mwH4klAm9DUgR2EEHyEEAQlRDvLPyg5fQry3y+cDew=
 github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.3 h1:sxgSqOB9CDToiaVFpxuvb5wGgGqWa3lCShcm5o0n3bE=
 github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.3/go.mod h1:XdED8i399lEVblYHTZM8eXaP07gv4Z58IL6ueMlVlrg=
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
 github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
@@ -589,14 +590,12 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Codefor/geohash v0.0.0-20140723084247-1b41c28e3a9d h1:iG9B49Q218F/XxXNRM7k/vWf7MKmLIS8AcJV9cGN4nA=
 github.com/Codefor/geohash v0.0.0-20140723084247-1b41c28e3a9d/go.mod h1:RVnhzAX71far8Kc3TQeA0k/dcaEKUnTDSOyet/JCmGI=
-github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
-github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
+github.com/DATA-DOG/go-sqlmock v1.3.2 h1:2L2f5t3kKnCLxnClDD/PrDfExFFa1wjESgxHG/B1ibo=
+github.com/DATA-DOG/go-sqlmock v1.3.2/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
 github.com/DefangLabs/secret-detector v0.0.0-20250403165618-22662109213e h1:rd4bOvKmDIx0WeTv9Qz+hghsgyjikFiPrseXHlKepO0=
 github.com/DefangLabs/secret-detector v0.0.0-20250403165618-22662109213e/go.mod h1:blbwPQh4DTlCZEfk1BLU4oMIhLda2U+A840Uag9DsZw=
-github.com/FilenCloudDienste/filen-sdk-go v0.0.37 h1:W8S9TrAyZ4//3PXsU6+Bi+fe/6uIL986GyS7PVzIDL4=
-github.com/FilenCloudDienste/filen-sdk-go v0.0.37/go.mod h1:0cBhKXQg49XbKZZfk5TCDa3sVLP+xMxZTWL+7KY0XR0=
 github.com/Files-com/files-sdk-go/v3 v3.2.264 h1:lMHTplAYI9FtmCo/QOcpRxmPA5REVAct1r2riQmDQKw=
 github.com/Files-com/files-sdk-go/v3 v3.2.264/go.mod h1:wGqkOzRu/ClJibvDgcfuJNAqI2nLhe8g91tPlDKRCdE=
 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 h1:sBEjpZlNHzK1voKq9695PJSX2o5NEXl7/OL3coiIY0c=
@@ -621,13 +620,19 @@ github.com/MarvinJWendt/testza v0.3.0/go.mod h1:eFcL4I0idjtIx8P9C6KkAuLgATNKpX4/
 github.com/MarvinJWendt/testza v0.4.2/go.mod h1:mSdhXiKH8sg/gQehJ63bINcCKp7RtYewEjXsvsVUPbE=
 github.com/MarvinJWendt/testza v0.5.2 h1:53KDo64C1z/h/d/stCYCPY69bt/OSwjq5KpFNwi+zB4=
 github.com/MarvinJWendt/testza v0.5.2/go.mod h1:xu53QFE5sCdjtMCKk8YMQ2MnymimEctc4n3EjyIYvEY=
+github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
 github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
+github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
 github.com/Max-Sum/base32768 v0.0.0-20230304063302-18e6ce5945fd h1:nzE1YQBdx1bq9IlZinHa+HVffy+NmVRoKr+wHN8fpLE=
 github.com/Max-Sum/base32768 v0.0.0-20230304063302-18e6ce5945fd/go.mod h1:C8yoIfvESpM3GD07OCHU7fqI7lhwyZ2Td1rbNbTAhnc=
+github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/ProtonMail/bcrypt v0.0.0-20210511135022-227b4adcab57/go.mod h1:HecWFHognK8GfRDGnFQbW/LiV7A3MX3gZVs45vk5h8I=
 github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf h1:yc9daCCYUefEs69zUkSzubzjBbL+cmOXgnmt9Fyd9ug=
@@ -668,10 +673,6 @@ github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm
 github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
-github.com/alecthomas/assert/v2 v2.10.0 h1:jjRCHsj6hBJhkmhznrCzoNpbA3zqy0fYiUcYZP/GkPY=
-github.com/alecthomas/assert/v2 v2.10.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
-github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -805,6 +806,7 @@ github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZw
 github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
 github.com/calebcase/tmpfile v1.0.3 h1:BZrOWZ79gJqQ3XbAQlihYZf/YCV0H4KPIdM5K5oMpJo=
 github.com/calebcase/tmpfile v1.0.3/go.mod h1:UAUc01aHeC+pudPagY/lWvt2qS9ZO5Zzof6/tIUzqeI=
+github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
@@ -832,8 +834,8 @@ github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEX
 github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
 github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
 github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
-github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
-github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
 github.com/cloudinary/cloudinary-go/v2 v2.13.0 h1:ugiQwb7DwpWQnete2AZkTh94MonZKmxD7hDGy1qTzDs=
 github.com/cloudinary/cloudinary-go/v2 v2.13.0/go.mod h1:ireC4gqVetsjVhYlwjUJwKTbZuWjEIynbR9zQTlqsvo=
 github.com/cloudsoda/go-smb2 v0.0.0-20250228001242-d4c70e6251cc h1:t8YjNUCt1DimB4HCIXBztwWMhgxr5yG5/YaRl9Afdfg=
@@ -880,6 +882,7 @@ github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVM
 github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
 github.com/containerd/containerd/v2 v2.0.5 h1:2vg/TjUXnaohAxiHnthQg8K06L9I4gdYEMcOLiMc8BQ=
 github.com/containerd/containerd/v2 v2.0.5/go.mod h1:Qqo0UN43i2fX1FLkrSTCg6zcHNfjN7gEnx3NPRZI+N0=
+github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y=
 github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
 github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
 github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
@@ -950,15 +953,15 @@ github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZ
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q=
+github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
 github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
 github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
 github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/dromara/dongle v1.0.1 h1:si/7UP/EXxnFVZok1cNos70GiMGxInAYMilHQFP5dJs=
-github.com/dromara/dongle v1.0.1/go.mod h1:ebFhTaDgxaDIKppycENTWlBsxz8mWCPWOLnsEgDpMv4=
 github.com/dropbox/dropbox-sdk-go-unofficial/v6 v6.0.5 h1:FT+t0UEDykcor4y3dMVKXIiWJETBpRgERYTGlmMd7HU=
 github.com/dropbox/dropbox-sdk-go-unofficial/v6 v6.0.5/go.mod h1:rSS3kM9XMzSQ6pw91Qgd6yB5jdt70N4OdtrAf74As5M=
 github.com/dsnet/try v0.0.3 h1:ptR59SsrcFUYbT/FhAbKTV6iLkeD6O18qfIWRml2fqI=
@@ -986,7 +989,6 @@ github.com/emersion/go-vcard v0.0.0-20241024213814-c9703dde27ff h1:4N8wnS3f1hNHS
 github.com/emersion/go-vcard v0.0.0-20241024213814-c9703dde27ff/go.mod h1:HMJKR5wlh/ziNp+sHEDV2ltblO4JD2+IdDOWtGcQBTM=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/emmansun/gmsm v0.15.5/go.mod h1:2m4jygryohSWkaSduFErgCwQKab5BNjURoFrn2DNwyU=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -1054,14 +1056,16 @@ github.com/geoffgarside/ber v1.2.0/go.mod h1:jVPKeCbj6MvQZhwLYsGwaGI52oUorHoHKNe
 github.com/getsentry/sentry-go v0.42.0 h1:eeFMACuZTbUQf90RE8dE4tXeSe4CZyfvR1MBL7RLEt8=
 github.com/getsentry/sentry-go v0.42.0/go.mod h1:eRXCoh3uvmjQLY6qu63BjUZnaBu5L5WhMV1RwYO8W5s=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gin-contrib/sessions v1.0.4 h1:ha6CNdpYiTOK/hTp05miJLbpTSNfOnFg5Jm2kbcqy8U=
+github.com/gin-contrib/sessions v1.0.4/go.mod h1:ccmkrb2z6iU2osiAHZG3x3J4suJK+OU27oqzlWOqQgs=
 github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
 github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
 github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk=
 github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls=
 github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ4S3TGls2FvczZtj5Re/2ZzkV9VwqPHH/3Bo=
 github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug=
-github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=
+github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
+github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/go-darwin/apfs v0.0.0-20211011131704-f84b94dbf348 h1:JnrjqG5iR07/8k7NqrLNilRsl3s1EPRQEGvbPyOce68=
 github.com/go-darwin/apfs v0.0.0-20211011131704-f84b94dbf348/go.mod h1:Czxo/d1g948LtrALAZdL04TL/HnkopquAjxYUuI02bo=
 github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
@@ -1270,6 +1274,7 @@ github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
 github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -1304,6 +1309,8 @@ github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
 github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
 github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
 github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
+github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o=
+github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E=
@@ -1383,12 +1390,18 @@ github.com/hashicorp/raft-boltdb/v2 v2.3.1 h1:ackhdCNPKblmOhjEU9+4lHSJYFkJd6Jqyv
 github.com/hashicorp/raft-boltdb/v2 v2.3.1/go.mod h1:n4S+g43dXF1tqDT+yzcXHhXM6y7MrlUd3TTwGRcUvQE=
 github.com/hashicorp/vault/api v1.22.0 h1:+HYFquE35/B74fHoIeXlZIP2YADVboaPjaSicHEZiH0=
 github.com/hashicorp/vault/api v1.22.0/go.mod h1:IUZA2cDvr4Ok3+NtK2Oq/r+lJeXkeCrHRmqdyWfpmGM=
+github.com/henrybear327/Proton-API-Bridge v1.0.0 h1:gjKAaWfKu++77WsZTHg6FUyPC5W0LTKWQciUm8PMZb0=
+github.com/henrybear327/Proton-API-Bridge v1.0.0/go.mod h1:gunH16hf6U74W2b9CGDaWRadiLICsoJ6KRkSt53zLts=
+github.com/henrybear327/go-proton-api v1.0.0 h1:zYi/IbjLwFAW7ltCeqXneUGJey0TN//Xo851a/BgLXw=
+github.com/henrybear327/go-proton-api v1.0.0/go.mod h1:w63MZuzufKcIZ93pwRgiOtxMXYafI8H74D77AxytOBc=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/huandu/xstrings v1.3.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
 github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/in-toto/in-toto-golang v0.5.0 h1:hb8bgwr0M2hGdDsLjkJ3ZqJ8JFLL/tgYdAxF/XEFBbY=
@@ -1397,8 +1410,6 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf h1:FtEj8sfIcaaBfAKrE1Cwb61YDtYq9JxChK1c7AKce7s=
 github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf/go.mod h1:yrqSXGoD/4EKfF26AOGzscPOgTTJcyAwM2rpixWT+t4=
-github.com/internxt/rclone-adapter v0.0.0-20260213125353-6f59c89fcb7c h1:r+KtxPyrhsYeNbsfeqTfEM8xRdwgV6LuNhLZxpXecb4=
-github.com/internxt/rclone-adapter v0.0.0-20260213125353-6f59c89fcb7c/go.mod h1:vdPya4AIcDjvng4ViaAzqjegJf0VHYpYHQguFx5xBp0=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@@ -1486,6 +1497,7 @@ github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu
 github.com/klauspost/reedsolomon v1.13.0 h1:E0Cmgf2kMuhZTj6eefnvpKC4/Q4jhCi9YIjcZjK4arc=
 github.com/klauspost/reedsolomon v1.13.0/go.mod h1:ggJT9lc71Vu+cSOPBlxGvBN6TfAS77qB4fp8vJ05NSA=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/koofr/go-httpclient v0.0.0-20240520111329-e20f8f203988 h1:CjEMN21Xkr9+zwPmZPaJJw+apzVbjGL5uK/6g9Q2jGU=
 github.com/koofr/go-httpclient v0.0.0-20240520111329-e20f8f203988/go.mod h1:/agobYum3uo/8V6yPVnq+R82pyVGCeuWW5arT4Txn8A=
@@ -1512,6 +1524,8 @@ github.com/lanrat/extsort v1.4.2 h1:akbLIdo4PhNZtvjpaWnbXtGMmLtnGzXplkzfgl+XTTY=
 github.com/lanrat/extsort v1.4.2/go.mod h1:hceP6kxKPKebjN1RVrDBXMXXECbaI41Y94tt6MDazc4=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.11.1 h1:wuChtj2hfsGmmx3nf1m7xC2XpK6OtelS2shMY+bGMtI=
 github.com/lib/pq v1.11.1/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA=
 github.com/linkedin/goavro/v2 v2.14.1 h1:/8VjDpd38PRsy02JS0jflAu7JZPfJcGTwqWgMkFS2iI=
@@ -1567,12 +1581,14 @@ github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
 github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
 github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY=
 github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mmcloughlin/geohash v0.9.0 h1:FihR004p/aE1Sju6gcVq5OLDqGcMnpBY+8moBqIsVOs=
 github.com/mmcloughlin/geohash v0.9.0/go.mod h1:oNZxQo5yWJh0eMQEP/8hwQuVx9Z9tjwFUqcTB1SmG0c=
 github.com/moby/buildkit v0.20.1 h1:sT0ZXhhNo5rVbMcYfgttma3TdUHfO5JjFA0UAL8p9fY=
@@ -1651,10 +1667,13 @@ github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGm
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
 github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
+github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
+github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
 github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
+github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
@@ -1664,14 +1683,15 @@ github.com/oracle/oci-go-sdk/v65 v65.104.0 h1:l9awEvzWvxmYhy/97A0hZ87pa7BncYXmcO
 github.com/oracle/oci-go-sdk/v65 v65.104.0/go.mod h1:oB8jFGVc/7/zJ+DbleE8MzGHjhs2ioCz5stRTdZdIcY=
 github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c=
 github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM=
+github.com/ory/dockertest/v3 v3.6.0/go.mod h1:4ZOpj8qBUmh8fcBSVzkH2bws2s91JdGvHUqan4GHEuQ=
 github.com/panjf2000/ants/v2 v2.11.3 h1:AfI0ngBoXJmYOpDh9m516vjqoUu2sLrIVgppI9TZVpg=
 github.com/panjf2000/ants/v2 v2.11.3/go.mod h1:8u92CYMUc6gyvTIw8Ru7Mt7+/ESnJahz5EVtqfrilek=
 github.com/parquet-go/bitpack v1.0.0 h1:AUqzlKzPPXf2bCdjfj4sTeacrUwsT7NlcYDMUQxPcQA=
 github.com/parquet-go/bitpack v1.0.0/go.mod h1:XnVk9TH+O40eOOmvpAVZ7K2ocQFrQwysLMnc6M/8lgs=
 github.com/parquet-go/jsonlite v1.0.0 h1:87QNdi56wOfsE5bdgas0vRzHPxfJgzrXGml1zZdd7VU=
 github.com/parquet-go/jsonlite v1.0.0/go.mod h1:nDjpkpL4EOtqs6NQugUsi0Rleq9sW/OtC1NnZEnxzF0=
-github.com/parquet-go/parquet-go v0.28.0 h1:ECyksyv8T2pOrlLsN7aWJIoQakyk/HtxQ2lchgS4els=
-github.com/parquet-go/parquet-go v0.28.0/go.mod h1:navtkAYr2LGoJVp141oXPlO/sxLvaOe3la2JEoD8+rg=
+github.com/parquet-go/parquet-go v0.26.4 h1:zJ3l8ef5WJZE2m63pKwyEJ2BhyDlgS0PfOEhuCQQU2A=
+github.com/parquet-go/parquet-go v0.26.4/go.mod h1:h9GcSt41Knf5qXI1tp1TfR8bDBUtvdUMzSKe26aZcHk=
 github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
@@ -1694,8 +1714,8 @@ github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2
 github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.25 h1:kocOqRffaIbU5djlIBr7Wh+cx82C0vtFb0fOurZHqD0=
-github.com/pierrec/lz4/v4 v4.1.25/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
+github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
+github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrre/compare v1.0.2 h1:k4IUsHgh+dbcAOIWCfxVa/7G6STjADH2qmhomv+1quc=
 github.com/pierrre/compare v1.0.2/go.mod h1:8UvyRHH+9HS8Pczdd2z5x/wvv67krDwVxoOndaIIDVU=
 github.com/pierrre/geohash v1.0.0 h1:f/zfjdV4rVofTCz1FhP07T+EMQAvcMM2ioGZVt+zqjI=
@@ -1788,12 +1808,8 @@ github.com/r3labs/sse v0.0.0-20210224172625-26fe804710bc h1:zAsgcP8MhzAbhMnB1QQ2
 github.com/r3labs/sse v0.0.0-20210224172625-26fe804710bc/go.mod h1:S8xSOnV3CgpNrWd0GQ/OoQfMtlg2uPRSuTzcSGrzwK8=
 github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
 github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
-github.com/rclone/Proton-API-Bridge v1.0.1-0.20260127174007-77f974840d11 h1:4MI2alxM/Ye2gIRBlYf28JGWTipZ4Zz7yAziPKrttjs=
-github.com/rclone/Proton-API-Bridge v1.0.1-0.20260127174007-77f974840d11/go.mod h1:3HLX7dwZgvB7nt+Yl/xdzVPcargQ1yBmJEUg3n+jMKM=
-github.com/rclone/go-proton-api v1.0.1-0.20260127173028-eb465cac3b18 h1:Lc+d3ISfQaMJKWZOE7z4ZSY4RVmdzbn1B0IM8xN18qM=
-github.com/rclone/go-proton-api v1.0.1-0.20260127173028-eb465cac3b18/go.mod h1:LB2kCEaZMzNn3ocdz+qYfxXmuLxxN0ka62KJd2x53Bc=
-github.com/rclone/rclone v1.73.1 h1:FCGZUd7sXO8+nIpbuXGPkd+f23o/ZACefrHtRGDAiDM=
-github.com/rclone/rclone v1.73.1/go.mod h1:T9HeSXv/SI9qJFkYLqsjY/5ljIFWJTVmTrG7H/4JrPY=
+github.com/rclone/rclone v1.72.1 h1:Cc/NshKd3/TP3CC0cx9Jg9nTLG8YQ8yLYMTm6Z/LdHk=
+github.com/rclone/rclone v1.72.1/go.mod h1:QjmSgz98CjQZZJhROIeYHYjpN5kN7rTA+jtChj/+3Do=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rdleal/intervalst v1.5.0 h1:SEB9bCFz5IqD1yhfH1Wv8IBnY/JQxDplwkxHjT6hamU=
@@ -1839,8 +1855,8 @@ github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71e
 github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
 github.com/schollz/progressbar/v3 v3.19.0 h1:Ea18xuIRQXLAUidVDox3AbwfUhD0/1IvohyTutOIFoc=
 github.com/schollz/progressbar/v3 v3.19.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
-github.com/seaweedfs/cockroachdb-parser v0.0.0-20260225204133-2f342c5ea564 h1:TgxPraf1NmF6XTcUG53ULpLQrKvhtUJxQ3hyekxSDNQ=
-github.com/seaweedfs/cockroachdb-parser v0.0.0-20260225204133-2f342c5ea564/go.mod h1:JSKCh6uCHBz91lQYFYHCyTrSVIPge4SUFVn28iwMNB0=
+github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138 h1:bX1vBF7GQjPeFQsCAZ8gCQGS/nJQnekL7gZ4Qg/pF4E=
+github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138/go.mod h1:JSKCh6uCHBz91lQYFYHCyTrSVIPge4SUFVn28iwMNB0=
 github.com/seaweedfs/go-fuse/v2 v2.9.1 h1:gnKmfrKreCRGJmekGz5WMnNZqXEf9s9+V2hdWQdvx88=
 github.com/seaweedfs/go-fuse/v2 v2.9.1/go.mod h1:zABdmWEa6A0bwaBeEOBUeUkGIZlxUhcdv+V1Dcc/U/I=
 github.com/seaweedfs/goexif v1.0.3 h1:ve/OjI7dxPW8X9YQsv3JuVMaxEyF9Rvfd04ouL+Bz30=
@@ -1860,6 +1876,7 @@ github.com/shibumi/go-pathspec v1.3.0/go.mod h1:Xutfslp817l2I1cZvgcfeMQJG5QnU2lh
 github.com/shirou/gopsutil/v4 v4.26.1 h1:TOkEyriIXk2HX9d4isZJtbjXbEjf5qyKPAzbzY0JWSo=
 github.com/shirou/gopsutil/v4 v4.26.1/go.mod h1:medLI9/UNAb0dOI9Q3/7yWSqKkj00u+1tgY8nvv41pc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -1890,6 +1907,7 @@ github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
 github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
 github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
 github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
@@ -1987,12 +2005,12 @@ github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/twmb/murmur3 v1.1.8 h1:8Yt9taO/WN3l08xErzjeschgZU2QSrwm1kclYq+0aRg=
 github.com/twmb/murmur3 v1.1.8/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
-github.com/twpayne/go-geom v1.6.1 h1:iLE+Opv0Ihm/ABIcvQFGIiFBXd76oBIar9drAwHFhR4=
-github.com/twpayne/go-geom v1.6.1/go.mod h1:Kr+Nly6BswFsKM5sd31YaoWS5PeDDH2NftJTK7Gd028=
-github.com/twpayne/go-kml/v3 v3.2.1 h1:xkTIJ7KMnHGKpHGf30e4XS3UT8o/5jD62hmdGJPf7Io=
-github.com/twpayne/go-kml/v3 v3.2.1/go.mod h1:lPWoJR3nQAdePBy3SrnniLdBLVQX0hlxrcziCx9XgT0=
-github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
-github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
+github.com/twpayne/go-geom v1.4.1 h1:LeivFqaGBRfyg0XJJ9pkudcptwhSSrYN9KZUW6HcgdA=
+github.com/twpayne/go-geom v1.4.1/go.mod h1:k/zktXdL+qnA6OgKsdEGUTA17jbQ2ZPTUa3CCySuGpE=
+github.com/twpayne/go-kml v1.5.2 h1:rFMw2/EwgkVssGS2MT6YfWSPZz6BgcJkLxQ53jnE8rQ=
+github.com/twpayne/go-kml v1.5.2/go.mod h1:kz8jAiIz6FIdU2Zjce9qGlVtgFYES9vt7BTPBHf5jl4=
+github.com/twpayne/go-polyline v1.0.0/go.mod h1:ICh24bcLYBX8CknfvNPKqoTbe+eg+MX1NPyJmSBo7pU=
+github.com/twpayne/go-waypoint v0.0.0-20200706203930-b263a7f6e4e8/go.mod h1:qj5pHncxKhu9gxtZEYWypA/z097sxhFlbTyOyt9gcnU=
 github.com/tylertreat/BoomFilters v0.0.0-20210315201527-1a82519a3e43 h1:QEePdg0ty2r0t1+qwfZmQ4OOl/MB2UXIeJSpIZv56lg=
 github.com/tylertreat/BoomFilters v0.0.0-20210315201527-1a82519a3e43/go.mod h1:OYRfF6eb5wY9VRFkXJH8FFBi3plw2v+giaIu7P054pM=
 github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
@@ -2196,13 +2214,13 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
@@ -2242,8 +2260,8 @@ golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeap
 golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
-golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc=
-golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4=
+golang.org/x/image v0.35.0 h1:LKjiHdgMtO8z7Fh18nGY6KDcoEtVfsgLDPeLyguqb7I=
+golang.org/x/image v0.35.0/go.mod h1:MwPLTVgvxSASsxdLzKrl8BRFuyqMyGhLwmC+TO1Sybk=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -2294,6 +2312,7 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -2423,6 +2442,7 @@ golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200121082415-34d275377bf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2569,6 +2589,7 @@ golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -2939,6 +2960,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
@@ -2948,6 +2970,7 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
 gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -3024,8 +3047,8 @@ modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
 modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
 modernc.org/sqlite v1.18.1/go.mod h1:6ho+Gow7oX5V+OiOQ6Tr4xeqbx13UZ6t+Fw9IRUG4d4=
-modernc.org/sqlite v1.46.1 h1:eFJ2ShBLIEnUWlLy12raN0Z1plqmFX9Qe3rjQTKt6sU=
-modernc.org/sqlite v1.46.1/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=
+modernc.org/sqlite v1.44.3 h1:+39JvV/HWMcYslAwRxHb8067w+2zowvFOUrOWIy9PjY=
+modernc.org/sqlite v1.44.3/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=
 modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
 modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
 modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=

k8s/charts/seaweedfs/README.md

@@ -212,9 +212,8 @@ To enable workers, add the following to your values.yaml:
 worker:
   enabled: true
   replicas: 2  # Scale based on workload
-  jobType: "vacuum,volume_balance,erasure_coding"  # Job types this worker can handle
-  maxDetect: 1  # Maximum concurrent detection requests
-  maxExecute: 4  # Maximum concurrent execution jobs per worker
+  capabilities: "vacuum,balance,erasure_coding"  # Tasks this worker can handle
+  maxConcurrent: 3  # Maximum concurrent tasks per worker
   
   # Working directory for task execution
   # Default: "/tmp/seaweedfs-worker"
@@ -249,14 +248,14 @@ worker:
       memory: "2Gi"
 ```
 
-### Worker Job Types
+### Worker Capabilities
 
-Workers can be configured with different job types:
+Workers can be configured with different capabilities:
 - **vacuum**: Reclaim deleted file space
-- **volume_balance**: Balance volumes across volume servers
+- **balance**: Balance volumes across volume servers
 - **erasure_coding**: Handle erasure coding operations
 
-You can configure workers with all job types or create specialized worker pools with specific job types.
+You can configure workers with all capabilities or create specialized worker pools with specific capabilities.
 
 ### Worker Deployment Strategy
 
@@ -265,11 +264,11 @@ For production deployments, consider:
 1. **Multiple Workers**: Deploy 2+ worker replicas for high availability
 2. **Resource Allocation**: Workers need sufficient CPU/memory for maintenance tasks
 3. **Storage**: Workers need temporary storage for vacuum and balance operations (size depends on volume size)
-4. **Specialized Workers**: Create separate worker deployments for different job types if needed
+4. **Specialized Workers**: Create separate worker deployments for different capabilities if needed
 
 Example specialized worker configuration:
 
-For specialized worker pools, deploy separate Helm releases with different job types:
+For specialized worker pools, deploy separate Helm releases with different capabilities:
 
 **values-worker-vacuum.yaml** (for vacuum operations):
 ```yaml
@@ -288,8 +287,8 @@ admin:
 worker:
   enabled: true
   replicas: 2
-  jobType: "vacuum"
-  maxExecute: 2
+  capabilities: "vacuum"
+  maxConcurrent: 2
   # REQUIRED: Point to the admin service of your main SeaweedFS release
   # Replace <namespace> with the namespace where your main seaweedfs is deployed
   # Example: If deploying in namespace "production":
@@ -314,8 +313,8 @@ admin:
 worker:
   enabled: true
   replicas: 1
-  jobType: "volume_balance"
-  maxExecute: 1
+  capabilities: "balance"
+  maxConcurrent: 1
   # REQUIRED: Point to the admin service of your main SeaweedFS release
   # Replace <namespace> with the namespace where your main seaweedfs is deployed
   # Example: If deploying in namespace "production":
@@ -324,7 +323,6 @@ worker:
 ```
 
 Deploy the specialized workers as separate releases:
-### Specialized Worker Deployment
 ```bash
 # Deploy vacuum workers
 helm install seaweedfs-worker-vacuum seaweedfs/seaweedfs -f values-worker-vacuum.yaml
@@ -333,22 +331,6 @@ helm install seaweedfs-worker-vacuum seaweedfs/seaweedfs -f values-worker-vacuum
 helm install seaweedfs-worker-balance seaweedfs/seaweedfs -f values-worker-balance.yaml
 ```
 
-## OpenShift Support
-
-SeaweedFS can be deployed on OpenShift or any cluster enforcing the Kubernetes "restricted" Pod Security Standard. By default, OpenShift blocks containers that run as root or use `hostPath` volumes.
-
-To deploy on OpenShift, use the provided `openshift-values.yaml` which overrides the default configuration to:
-1. Use `PersistentVolumeClaims` instead of `hostPath`.
-2. Enable `runAsNonRoot` and omit hardcoded UIDs to allow OpenShift to assign valid UIDs automatically.
-3. Apply appropriate `seccompProfile` and drop capabilities.
-
-Usage:
-```bash
-helm install seaweedfs seaweedfs/seaweedfs \
-  -n seaweedfs --create-namespace \
-  -f openshift-values.yaml
-```
-
 ## Enterprise
 
 For enterprise users, please visit [seaweedfs.com](https://seaweedfs.com) for the SeaweedFS Enterprise Edition, 

k8s/charts/seaweedfs/openshift-values.yaml

@@ -1,116 +0,0 @@
-# openshift-values.yaml
-#
-# Example overrides for deploying SeaweedFS on OpenShift (or any cluster
-# enforcing the Kubernetes "restricted" Pod Security Standard).
-#
-# OpenShift's default "restricted" SCC blocks containers that:
-#   - Run as UID 0 (root)
-#   - Request privilege escalation
-#   - Use hostPath volumes
-#   - Omit a seccompProfile
-#
-# These overrides satisfy all four requirements by:
-#   1. Replacing hostPath volumes with PersistentVolumeClaims (or emptyDir for logs)
-#   2. Enabling runAsNonRoot: true. By omitting runAsUser, OpenShift will
-#      automatically assign a valid UID from the namespace's allocated range.
-#   3. Dropping all Linux capabilities and setting allowPrivilegeEscalation: false
-#   4. Enabling RuntimeDefault seccompProfile
-#
-# Usage:
-#   helm install seaweedfs seaweedfs/seaweedfs \
-#     -n seaweedfs --create-namespace \
-#     -f openshift-values.yaml
-#
-# Adjust storageClass and sizes to match your cluster's available StorageClasses.
-# On OpenShift you can discover them with: oc get storageclass
-
-master:
-  data:
-    type: "persistentVolumeClaim"
-    size: "10Gi"
-    storageClass: ""        # leave empty to use the cluster default StorageClass
-
-  logs:
-    type: "emptyDir"        # avoids hostPath; use persistentVolumeClaim if you need log persistence
-
-  podSecurityContext:
-    enabled: true
-    # On OpenShift, we omit runAsUser/runAsGroup/fsGroup to let the admission
-    # controller assign them automatically based on the namespace's SCC.
-    runAsNonRoot: true
-
-  containerSecurityContext:
-    enabled: true
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop: ["ALL"]
-    runAsNonRoot: true
-    seccompProfile:
-      type: RuntimeDefault
-
-volume:
-  dataDirs:
-    - name: data1
-      type: "persistentVolumeClaim"
-      size: "100Gi"
-      storageClass: ""      # leave empty to use the cluster default StorageClass
-      maxVolumes: 0
-
-  logs:
-    type: "emptyDir"
-
-  podSecurityContext:
-    enabled: true
-    # On OpenShift, we omit runAsUser/runAsGroup/fsGroup to let the admission
-    # controller assign them automatically based on the namespace's SCC.
-    runAsNonRoot: true
-
-  containerSecurityContext:
-    enabled: true
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop: ["ALL"]
-    runAsNonRoot: true
-    seccompProfile:
-      type: RuntimeDefault
-
-filer:
-  data:
-    type: "persistentVolumeClaim"
-    size: "25Gi"
-    storageClass: ""        # leave empty to use the cluster default StorageClass
-
-  logs:
-    type: "emptyDir"
-
-  podSecurityContext:
-    enabled: true
-    # On OpenShift, we omit runAsUser/runAsGroup/fsGroup to let the admission
-    # controller assign them automatically based on the namespace's SCC.
-    runAsNonRoot: true
-
-  containerSecurityContext:
-    enabled: true
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop: ["ALL"]
-    runAsNonRoot: true
-    seccompProfile:
-      type: RuntimeDefault
-
-# S3 gateway (if enabled)
-s3:
-  podSecurityContext:
-    enabled: true
-    # On OpenShift, we omit runAsUser/runAsGroup/fsGroup to let the admission
-    # controller assign them automatically based on the namespace's SCC.
-    runAsNonRoot: true
-
-  containerSecurityContext:
-    enabled: true
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop: ["ALL"]
-    runAsNonRoot: true
-    seccompProfile:
-      type: RuntimeDefault

k8s/charts/seaweedfs/templates/s3/s3-secret.yaml

@@ -10,21 +10,10 @@
 {{- if and .Values.s3.reuseLegacySecret $existingSecret }}
 {{- $reuse = true }}
 {{- end }}
-{{- $creds := .Values.s3.credentials | default dict -}}
-{{- $adminCreds := $creds.admin | default dict -}}
-{{- $access_key_admin := $adminCreds.accessKey -}}
-{{- $secret_key_admin := $adminCreds.secretKey -}}
-{{- if not (and $access_key_admin $secret_key_admin) -}}
-  {{- $access_key_admin = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_access_key_id" "length" 20 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
-  {{- $secret_key_admin = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_secret_access_key" "length" 40 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
-{{- end -}}
-{{- $readCreds := $creds.read | default dict -}}
-{{- $access_key_read := $readCreds.accessKey -}}
-{{- $secret_key_read := $readCreds.secretKey -}}
-{{- if not (and $access_key_read $secret_key_read) -}}
-  {{- $access_key_read = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "read_access_key_id" "length" 20 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
-  {{- $secret_key_read = include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "read_secret_access_key" "length" 40 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
-{{- end -}}
+{{- $access_key_admin := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_access_key_id" "length" 20 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
+{{- $secret_key_admin := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "admin_secret_access_key" "length" 40 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
+{{- $access_key_read := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "read_access_key_id" "length" 20 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
+{{- $secret_key_read := include "getOrGeneratePassword" (dict "namespace" .Release.Namespace "secretName" $secretName "key" "read_secret_access_key" "length" 40 "existingSecret" (ternary $existingSecret nil $reuse)) -}}
 apiVersion: v1
 kind: Secret
 type: Opaque
@@ -54,4 +43,4 @@ stringData:
   s3_auditLogConfig.json: |
     {{ toJson .Values.s3.auditLogConfig | nindent 4 }}
   {{- end }}
-{{- end }}
+{{- end }}

k8s/charts/seaweedfs/templates/sftp/sftp-service.yaml

@@ -6,7 +6,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: sftp
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}

k8s/charts/seaweedfs/templates/shared/_helpers.tpl

@@ -135,9 +135,7 @@ Inject extra environment vars in the format key:value, if populated
 {{- $repositoryName := default .Values.image.repository .Values.global.repository | toString -}}
 {{- $name := .Values.global.imageName | toString -}}
 {{- $tag := default .Chart.AppVersion .Values.image.tag  | toString -}}
-{{- if .Values.image.repository -}}
-{{-   $name = $repositoryName -}}
-{{- else if $repositoryName -}}
+{{- if $repositoryName -}}
 {{-   $name = printf "%s/%s" (trimSuffix "/" $repositoryName) (base $name) -}}
 {{- end -}}
 {{- if $registryName -}}

k8s/charts/seaweedfs/templates/shared/service-account.yaml

@@ -3,10 +3,6 @@ kind: ServiceAccount
 metadata:
   name: {{ include "seaweedfs.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
-  {{- with .Values.global.serviceAccountAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" . }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

k8s/charts/seaweedfs/templates/volume/volume-service.yaml

@@ -12,7 +12,6 @@ metadata:
   namespace: {{ $.Release.Namespace }}
   labels:
     app.kubernetes.io/name: {{ template "seaweedfs.name" $ }}
-    app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/component: {{ $volumeName }}
     helm.sh/chart: {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
     app.kubernetes.io/managed-by: {{ $.Release.Service }}

k8s/charts/seaweedfs/templates/worker/worker-deployment.yaml

@@ -136,15 +136,11 @@ spec:
               {{- else }}
               -admin={{ template "seaweedfs.fullname" . }}-admin.{{ .Release.Namespace }}:{{ .Values.admin.port }}{{ if .Values.admin.grpcPort }}.{{ .Values.admin.grpcPort }}{{ end }} \
               {{- end }}
-              -jobType={{ .Values.worker.jobType }} \
-              -maxDetect={{ .Values.worker.maxDetect }} \
-              -maxExecute={{ .Values.worker.maxExecute }} \
-              -workingDir={{ .Values.worker.workingDir }}{{- if or .Values.worker.metricsPort .Values.worker.metricsIp .Values.worker.extraArgs }} \{{ end }}
+              -capabilities={{ .Values.worker.capabilities }} \
+              -maxConcurrent={{ .Values.worker.maxConcurrent }} \
+              -workingDir={{ .Values.worker.workingDir }}{{- if or .Values.worker.metricsPort .Values.worker.extraArgs }} \{{ end }}
               {{- if .Values.worker.metricsPort }}
-              -metricsPort={{ .Values.worker.metricsPort }}{{- if or .Values.worker.metricsIp .Values.worker.extraArgs }} \{{ end }}
-              {{- end }}
-              {{- if .Values.worker.metricsIp }}
-              -metricsIp={{ .Values.worker.metricsIp }}{{- if .Values.worker.extraArgs }} \{{ end }}
+              -metricsPort={{ .Values.worker.metricsPort }}{{- if .Values.worker.extraArgs }} \{{ end }}
               {{- end }}
               {{- range $index, $arg := .Values.worker.extraArgs }}
               {{ $arg }}{{- if lt $index (sub (len $.Values.worker.extraArgs) 1) }} \{{ end }}

k8s/charts/seaweedfs/values.yaml

@@ -20,7 +20,6 @@ global:
       filerRead: false
   # we will use this serviceAccountName for all ClusterRoles/ClusterRoleBindings
   serviceAccountName: "seaweedfs"
-  serviceAccountAnnotations: {}
   automountServiceAccountToken: true
   certificates:
     duration: 87600h
@@ -891,10 +890,6 @@ filer:
     # set to the name of an existing kubernetes Secret with the s3 json config file
     # should have a secret key called seaweedfs_s3_config with an inline json configure
     existingConfigSecret: null
-    # To provide explicit credentials for the S3 gateway, set them under
-    # the top-level s3.credentials key (not filer.s3.credentials).
-    # The s3-secret.yaml template only reads from .Values.s3.credentials.
-    # See: s3.credentials.admin.accessKey, s3.credentials.read.accessKey
     auditLogConfig: {}
     # You may specify buckets to be created during the install or upgrade process.
     # Buckets may be exposed publicly by setting `anonymousRead` to `true`
@@ -923,16 +918,6 @@ s3:
   # set to the name of an existing kubernetes Secret with the s3 json config file
   # should have a secret key called seaweedfs_s3_config with an inline json config
   existingConfigSecret: null
-  # Optionally provide explicit credentials for the S3 gateway.
-  # When set, these are used in the generated s3 secret instead of
-  # auto-generating random credentials.
-  # credentials:
-  #   admin:
-  #     accessKey: ""
-  #     secretKey: ""
-  #   read:
-  #     accessKey: ""
-  #     secretKey: ""
   auditLogConfig: {}
   # You may specify buckets to be created during the install or upgrade process.
   # Buckets may be exposed publicly by setting `anonymousRead` to `true`
@@ -1285,20 +1270,17 @@ worker:
   replicas: 1
   loggingOverrideLevel: null
   metricsPort: 9327
-  metricsIp: ""  # If empty, defaults to 0.0.0.0
 
   # Admin server to connect to
   adminServer: ""
 
-  # Worker job types - comma-separated list
-  # Available: vacuum, volume_balance, erasure_coding
-  jobType: "vacuum,volume_balance,erasure_coding"
+  # Worker capabilities - comma-separated list
+  # Available: vacuum, balance, erasure_coding
+  # Default: "vacuum,balance,erasure_coding" (all capabilities)
+  capabilities: "vacuum,balance,erasure_coding"
 
-  # Maximum number of concurrent detection requests
-  maxDetect: 1
-
-  # Maximum number of concurrent execution jobs
-  maxExecute: 4
+  # Maximum number of concurrent tasks
+  maxConcurrent: 3
 
   # Working directory for task execution
   workingDir: "/tmp/seaweedfs-worker"
@@ -1436,10 +1418,6 @@ allInOne:
     # Set to the name of an existing kubernetes Secret with the s3 json config file
     # should have a secret key called seaweedfs_s3_config with an inline json config
     existingConfigSecret: null
-    # To provide explicit credentials for the S3 gateway, set them under
-    # the top-level s3.credentials key (not allInOne.s3.credentials).
-    # The s3-secret.yaml template only reads from .Values.s3.credentials.
-    # See: s3.credentials.admin.accessKey, s3.credentials.read.accessKey
     auditLogConfig: null  # S3 audit log configuration (null inherits from s3.auditLogConfig)
     # You may specify buckets to be created during the install process.
     # Buckets may be exposed publicly by setting `anonymousRead` to `true`

telemetry/test/integration.go

@@ -148,7 +148,7 @@ func waitForServer(url string, timeout time.Duration) bool {
 func testProtobufMarshaling() error {
 	// Test protobuf marshaling/unmarshaling
 	testData := &proto.TelemetryData{
-		TopologyId:        "test-cluster-12345",
+		ClusterId:         "test-cluster-12345",
 		Version:           "test-3.45",
 		Os:                "linux/amd64",
 		VolumeServerCount: 2,

test/erasure_coding/admin_dockertest/ec_integration_test.go

@@ -2,11 +2,13 @@ package admin_dockertest
 
 import (
 	"bytes"
-	crand "crypto/rand"
 	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
+	"math/rand"
 	"net/http"
+	"net/url"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -159,95 +161,129 @@ func TestEcEndToEnd(t *testing.T) {
 
 	client := &http.Client{}
 
-	// 1. Configure plugin job types for fast EC detection/execution.
-	t.Log("Configuring plugin job types via API...")
+	// 1. Configure Global Maintenance (Scan Interval = 1s) via API
+	t.Log("Configuring Global Maintenance via API...")
 
-	// Disable volume balance to reduce interference for this EC-focused test.
-	balanceConfig := map[string]interface{}{
-		"job_type": "volume_balance",
-		"admin_runtime": map[string]interface{}{
-			"enabled": false,
-		},
-	}
-	jsonBody, err := json.Marshal(balanceConfig)
-	if err != nil {
-		t.Fatalf("Failed to marshal volume_balance config: %v", err)
-	}
-	req, err := http.NewRequest("PUT", AdminUrl+"/api/plugin/job-types/volume_balance/config", bytes.NewBuffer(jsonBody))
-	if err != nil {
-		t.Fatalf("Failed to create volume_balance config request: %v", err)
-	}
-	req.Header.Set("Content-Type", "application/json")
+	// 1.1 Fetch current config
+	req, _ := http.NewRequest("GET", AdminUrl+"/api/maintenance/config", nil)
 	resp, err := client.Do(req)
 	if err != nil {
-		t.Fatalf("Failed to update volume_balance config: %v", err)
+		t.Fatalf("Failed to get global config: %v", err)
 	}
 	if resp.StatusCode != http.StatusOK {
 		body, _ := io.ReadAll(resp.Body)
-		t.Fatalf("Failed to update volume_balance config (status %d): %s", resp.StatusCode, string(body))
+		t.Fatalf("Failed to get global config (status %d): %s", resp.StatusCode, string(body))
+	}
+
+	var globalConfig map[string]interface{}
+	if err := json.NewDecoder(resp.Body).Decode(&globalConfig); err != nil {
+		t.Fatalf("Failed to decode global config: %v", err)
 	}
 	resp.Body.Close()
 
-	ecConfig := map[string]interface{}{
-		"job_type": "erasure_coding",
-		"admin_runtime": map[string]interface{}{
-			"enabled":                          true,
-			"detection_interval_seconds":       1,
-			"global_execution_concurrency":     4,
-			"per_worker_execution_concurrency": 4,
-			"max_jobs_per_detection":           100,
-		},
-		"worker_config_values": map[string]interface{}{
-			"quiet_for_seconds": map[string]interface{}{
-				"int64_value": "1",
-			},
-			"min_interval_seconds": map[string]interface{}{
-				"int64_value": "1",
-			},
-			"min_size_mb": map[string]interface{}{
-				"int64_value": "1",
-			},
-			"fullness_ratio": map[string]interface{}{
-				"double_value": 0.0001,
-			},
-		},
+	// 1.2 Modify config
+	globalConfig["enabled"] = true
+	globalConfig["scan_interval_seconds"] = 1
+
+	// Ensure policy structure exists
+	if globalConfig["policy"] == nil {
+		globalConfig["policy"] = map[string]interface{}{}
 	}
-	jsonBody, err = json.Marshal(ecConfig)
-	if err != nil {
-		t.Fatalf("Failed to marshal erasure_coding config: %v", err)
+	policy, _ := globalConfig["policy"].(map[string]interface{})
+
+	// Ensure task_policies structure exists
+	if policy["task_policies"] == nil {
+		policy["task_policies"] = map[string]interface{}{}
 	}
-	req, err = http.NewRequest("PUT", AdminUrl+"/api/plugin/job-types/erasure_coding/config", bytes.NewBuffer(jsonBody))
-	if err != nil {
-		t.Fatalf("Failed to create erasure_coding config request: %v", err)
+	taskPolicies, _ := policy["task_policies"].(map[string]interface{})
+
+	// Disable balance tasks to avoid interference with EC test
+	if taskPolicies["balance"] == nil {
+		taskPolicies["balance"] = map[string]interface{}{}
 	}
+	balancePolicy, _ := taskPolicies["balance"].(map[string]interface{})
+	balancePolicy["enabled"] = false
+
+	// Set global max concurrent
+	policy["global_max_concurrent"] = 4
+	globalConfig["policy"] = policy
+
+	// Explicitly set required fields
+	requiredFields := map[string]float64{
+		"worker_timeout_seconds":   300,
+		"task_timeout_seconds":     7200,
+		"retry_delay_seconds":      900,
+		"cleanup_interval_seconds": 86400,
+		"task_retention_seconds":   604800,
+		"max_retries":              3,
+	}
+	for field, val := range requiredFields {
+		if _, ok := globalConfig[field]; !ok || globalConfig[field] == 0 {
+			globalConfig[field] = val
+		}
+	}
+
+	// 1.3 Update config
+	jsonBody, _ := json.Marshal(globalConfig)
+	req, _ = http.NewRequest("PUT", AdminUrl+"/api/maintenance/config", bytes.NewBuffer(jsonBody))
 	req.Header.Set("Content-Type", "application/json")
 	resp, err = client.Do(req)
 	if err != nil {
-		t.Fatalf("Failed to update erasure_coding config: %v", err)
+		t.Fatalf("Failed to update global config: %v", err)
 	}
 	if resp.StatusCode != http.StatusOK {
 		body, _ := io.ReadAll(resp.Body)
-		t.Fatalf("Failed to update erasure_coding config (status %d): %s", resp.StatusCode, string(body))
+		t.Fatalf("Failed to update global config (status %d): %s", resp.StatusCode, string(body))
 	}
 	resp.Body.Close()
 
-	// 2. Upload a file
+	// 2. Configure EC Task (Short intervals) via Form API
+	t.Log("Configuring EC Task via Form API...")
+	formData := url.Values{}
+	formData.Set("enabled", "true")
+	formData.Set("scan_interval_seconds", "1")
+	formData.Set("repeat_interval_seconds", "1")
+	formData.Set("check_interval_seconds", "1")
+	formData.Set("max_concurrent", "4")
+	formData.Set("quiet_for_seconds_value", "1")
+	formData.Set("quiet_for_seconds_unit", "seconds")
+	formData.Set("min_size_mb", "1")
+	formData.Set("fullness_ratio", "0.0001")
+
+	req, _ = http.NewRequest("POST", AdminUrl+"/maintenance/config/erasure_coding", strings.NewReader(formData.Encode()))
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	resp, err = client.Do(req)
+	if err != nil {
+		t.Fatalf("Failed to update EC config: %v", err)
+	}
+	if resp.StatusCode != 200 && resp.StatusCode != 303 {
+		body, _ := io.ReadAll(resp.Body)
+		t.Fatalf("Failed to update EC config (status %d): %s", resp.StatusCode, string(body))
+	}
+	resp.Body.Close()
+	t.Log("EC Task Configuration updated")
+
+	// 3. Restart Admin to pick up Global Config (Scan Interval)
+	if len(runningCmds) > 0 {
+		adminCmd := runningCmds[len(runningCmds)-1]
+		t.Log("Restarting Admin Server to apply configuration...")
+		stopWeed(t, adminCmd)
+		time.Sleep(10 * time.Second)
+		startWeed(t, "admin_restarted", "admin", "-master=localhost:9333", "-port=23646", "-port.grpc=33646", "-dataDir=./tmp/admin")
+		waitForUrl(t, AdminUrl+"/health", 60)
+	}
+
+	// 4. Upload a file
 	fileSize := 5 * 1024 * 1024
 	data := make([]byte, fileSize)
-	crand.Read(data)
+	rand.Read(data)
 	fileName := fmt.Sprintf("ec_test_file_%d", time.Now().Unix())
 	t.Logf("Uploading %d bytes file %s to Filer...", fileSize, fileName)
 	uploadUrl := FilerUrl + "/" + fileName
 
 	var uploadErr error
 	for i := 0; i < 10; i++ {
-		req, err := http.NewRequest("PUT", uploadUrl, bytes.NewBuffer(data))
-		if err != nil {
-			uploadErr = err
-			t.Logf("Upload attempt %d failed to create request: %v", i+1, err)
-			time.Sleep(2 * time.Second)
-			continue
-		}
+		req, _ := http.NewRequest("PUT", uploadUrl, bytes.NewBuffer(data))
 		resp, err := client.Do(req)
 		if err == nil {
 			if resp.StatusCode == 201 {
@@ -270,17 +306,17 @@ func TestEcEndToEnd(t *testing.T) {
 	}
 	t.Log("Upload successful")
 
-	// 3. Verify EC Encoding
+	// 5. Verify EC Encoding
 	t.Log("Waiting for EC encoding (checking Master topology)...")
 	startTime := time.Now()
 	ecVerified := false
 	var lastBody []byte
 
 	for time.Since(startTime) < 300*time.Second {
-		// 3.1 Check Master Topology
+		// 5.1 Check Master Topology
 		resp, err := http.Get(MasterUrl + "/dir/status")
 		if err == nil {
-			lastBody, _ = io.ReadAll(resp.Body)
+			lastBody, _ = ioutil.ReadAll(resp.Body)
 			resp.Body.Close()
 
 			// Check total EC shards
@@ -300,8 +336,8 @@ func TestEcEndToEnd(t *testing.T) {
 			}
 		}
 
-		// 3.2 Debug: Check workers and jobs
-		wResp, wErr := http.Get(AdminUrl + "/api/plugin/workers")
+		// 5.2 Debug: Check workers and tasks
+		wResp, wErr := http.Get(AdminUrl + "/api/maintenance/workers")
 		workerCount := 0
 		if wErr == nil {
 			var workers []interface{}
@@ -310,7 +346,7 @@ func TestEcEndToEnd(t *testing.T) {
 			workerCount = len(workers)
 		}
 
-		tResp, tErr := http.Get(AdminUrl + "/api/plugin/jobs?limit=1000")
+		tResp, tErr := http.Get(AdminUrl + "/api/maintenance/tasks")
 		taskCount := 0
 		if tErr == nil {
 			var tasks []interface{}

test/foundationdb/foundationdb_concurrent_test.go

@@ -1,4 +1,5 @@
 //go:build foundationdb
+// +build foundationdb
 
 package foundationdb
 

test/foundationdb/foundationdb_integration_test.go

@@ -1,4 +1,5 @@
 //go:build foundationdb
+// +build foundationdb
 
 package foundationdb
 

test/kafka/Dockerfile.kafka-gateway

@@ -16,9 +16,8 @@ RUN go mod download
 # Copy source code
 COPY . .
 
-# Build the weed binaries with Kafka gateway support
+# Build the weed binary with Kafka gateway support
 RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o weed ./weed
-RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o weed-sql ./cmd/weed-sql
 
 # Final stage
 FROM alpine:latest
@@ -33,9 +32,8 @@ RUN addgroup -g 1000 seaweedfs && \
 # Set working directory
 WORKDIR /usr/bin
 
-# Copy binaries from builder
+# Copy binary from builder
 COPY --from=builder /app/weed .
-COPY --from=builder /app/weed-sql .
 
 # Create data directory
 RUN mkdir -p /data && chown seaweedfs:seaweedfs /data

test/kafka/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/seaweedfs/seaweedfs v0.0.0-00010101000000-000000000000
 	github.com/segmentio/kafka-go v0.4.49
 	github.com/stretchr/testify v1.11.1
-	google.golang.org/grpc v1.78.0
+	google.golang.org/grpc v1.77.0
 )
 
 replace github.com/seaweedfs/seaweedfs => ../../
@@ -17,15 +17,14 @@ require (
 	cloud.google.com/go/auth v0.17.0 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.3 // indirect
-	github.com/Azure/go-ntlmssp v0.1.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.3 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.2 // indirect
+	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
-	github.com/FilenCloudDienste/filen-sdk-go v0.0.37 // indirect
-	github.com/Files-com/files-sdk-go/v3 v3.2.264 // indirect
+	github.com/Files-com/files-sdk-go/v3 v3.2.218 // indirect
 	github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
 	github.com/Max-Sum/base32768 v0.0.0-20230304063302-18e6ce5945fd // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -36,58 +35,51 @@ require (
 	github.com/ProtonMail/go-srp v0.0.7 // indirect
 	github.com/ProtonMail/gopenpgp/v2 v2.9.0 // indirect
 	github.com/PuerkitoBio/goquery v1.10.3 // indirect
-	github.com/a1ex3/zstd-seekable-format-go/pkg v0.10.0 // indirect
 	github.com/abbot/go-http-auth v0.4.0 // indirect
-	github.com/anchore/go-lzo v0.1.0 // indirect
 	github.com/andybalholm/brotli v1.2.0 // indirect
 	github.com/andybalholm/cascadia v1.3.3 // indirect
 	github.com/appscode/go-querystring v0.0.0-20170504095604-0126cfb3f1dc // indirect
+	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/aws/aws-sdk-go v1.55.8 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.41.1 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.41.0 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.32.7 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.7 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.32.6 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.19.6 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.3 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.15 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.95.0 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.15 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.93.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 // indirect
 	github.com/aws/smithy-go v1.24.0 // indirect
-	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/boombuler/barcode v1.1.0 // indirect
 	github.com/bradenaw/juniper v0.15.3 // indirect
 	github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect
 	github.com/buengese/sgzip v0.1.1 // indirect
-	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/bufbuild/protocompile v0.14.1 // indirect
 	github.com/calebcase/tmpfile v1.0.3 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chilts/sid v0.0.0-20190607042430-660e94789ec9 // indirect
-	github.com/clipperhouse/stringish v0.1.1 // indirect
-	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
-	github.com/cloudflare/circl v1.6.3 // indirect
-	github.com/cloudinary/cloudinary-go/v2 v2.13.0 // indirect
+	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/cloudinary/cloudinary-go/v2 v2.12.0 // indirect
 	github.com/cloudsoda/go-smb2 v0.0.0-20250228001242-d4c70e6251cc // indirect
 	github.com/cloudsoda/sddl v0.0.0-20250224235906-926454e91efc // indirect
 	github.com/cognusion/imaging v1.0.2 // indirect
 	github.com/colinmarc/hdfs/v2 v2.4.0 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
-	github.com/coreos/go-systemd/v22 v22.6.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/creasty/defaults v1.8.0 // indirect
 	github.com/cronokirby/saferith v0.33.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/diskfs/go-diskfs v1.7.0 // indirect
-	github.com/dromara/dongle v1.0.1 // indirect
 	github.com/dropbox/dropbox-sdk-go-unofficial/v6 v6.0.5 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/eapache/go-resiliency v1.7.0 // indirect
@@ -99,26 +91,25 @@ require (
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/flynn/noise v1.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.11 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
 	github.com/geoffgarside/ber v1.2.0 // indirect
-	github.com/go-chi/chi/v5 v5.2.5 // indirect
+	github.com/go-chi/chi/v5 v5.2.2 // indirect
 	github.com/go-darwin/apfs v0.0.0-20211011131704-f84b94dbf348 // indirect
-	github.com/go-git/go-billy/v5 v5.6.2 // indirect
 	github.com/go-jose/go-jose/v4 v4.1.3 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
-	github.com/go-openapi/errors v0.22.4 // indirect
-	github.com/go-openapi/strfmt v0.25.0 // indirect
+	github.com/go-openapi/errors v0.22.2 // indirect
+	github.com/go-openapi/strfmt v0.23.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.28.0 // indirect
+	github.com/go-playground/validator/v10 v10.27.0 // indirect
 	github.com/go-resty/resty/v2 v2.16.5 // indirect
 	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
-	github.com/gofrs/flock v0.13.0 // indirect
+	github.com/gofrs/flock v0.12.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
+	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/btree v1.1.3 // indirect
@@ -133,83 +124,78 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/internxt/rclone-adapter v0.0.0-20260213125353-6f59c89fcb7c // indirect
+	github.com/henrybear327/Proton-API-Bridge v1.0.0 // indirect
+	github.com/henrybear327/go-proton-api v1.0.0 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
 	github.com/jcmturner/gofork v1.7.6 // indirect
 	github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
 	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
-	github.com/jhump/protoreflect v1.18.0 // indirect
-	github.com/jhump/protoreflect/v2 v2.0.0-beta.1 // indirect
+	github.com/jhump/protoreflect v1.17.0 // indirect
 	github.com/jlaffaye/ftp v0.2.1-0.20240918233326-1b970516f5d3 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/jtolio/noiseconn v0.0.0-20231127013910-f6d9ecbf1de7 // indirect
 	github.com/jzelinskie/whirlpool v0.0.0-20201016144138-0675e54bb004 // indirect
 	github.com/karlseguin/ccache/v2 v2.0.8 // indirect
-	github.com/klauspost/compress v1.18.4 // indirect
+	github.com/klauspost/compress v1.18.2 // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
-	github.com/klauspost/reedsolomon v1.13.0 // indirect
+	github.com/klauspost/reedsolomon v1.12.6 // indirect
 	github.com/koofr/go-httpclient v0.0.0-20240520111329-e20f8f203988 // indirect
 	github.com/koofr/go-koofrclient v0.0.0-20221207135200-cbd7fc9ad6a6 // indirect
 	github.com/kr/fs v0.1.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
-	github.com/lanrat/extsort v1.4.2 // indirect
+	github.com/lanrat/extsort v1.4.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lpar/date v1.0.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect
-	github.com/mailru/easyjson v0.9.1 // indirect
+	github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.19 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/ncw/swift/v2 v2.0.5 // indirect
+	github.com/ncw/swift/v2 v2.0.4 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
-	github.com/oracle/oci-go-sdk/v65 v65.104.0 // indirect
+	github.com/oracle/oci-go-sdk/v65 v65.98.0 // indirect
 	github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
 	github.com/panjf2000/ants/v2 v2.11.3 // indirect
-	github.com/parquet-go/bitpack v1.0.0 // indirect
-	github.com/parquet-go/jsonlite v1.0.0 // indirect
-	github.com/parquet-go/parquet-go v0.26.4 // indirect
+	github.com/parquet-go/parquet-go v0.26.3 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14 // indirect
 	github.com/peterh/liner v1.2.2 // indirect
-	github.com/petermattis/goid v0.0.0-20260113132338-7c7de50cc741 // indirect
-	github.com/pierrec/lz4/v4 v4.1.25 // indirect
+	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/sftp v1.13.10 // indirect
 	github.com/pkg/xattr v0.4.12 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
-	github.com/pquerna/otp v1.5.0 // indirect
 	github.com/prometheus/client_golang v1.23.2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.67.2 // indirect
+	github.com/prometheus/common v0.66.1 // indirect
 	github.com/prometheus/procfs v0.19.2 // indirect
 	github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8 // indirect
-	github.com/quic-go/qpack v0.6.0 // indirect
-	github.com/rclone/Proton-API-Bridge v1.0.1-0.20260127174007-77f974840d11 // indirect
-	github.com/rclone/go-proton-api v1.0.1-0.20260127173028-eb465cac3b18 // indirect
-	github.com/rclone/rclone v1.73.1 // indirect
+	github.com/rclone/rclone v1.71.2 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
 	github.com/rdleal/intervalst v1.5.0 // indirect
-	github.com/relvacode/iso8601 v1.7.0 // indirect
+	github.com/relvacode/iso8601 v1.6.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rfjakob/eme v1.1.2 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
 	github.com/sagikazarmark/locafero v0.11.0 // indirect
-	github.com/samber/lo v1.52.0 // indirect
+	github.com/samber/lo v1.51.0 // indirect
 	github.com/seaweedfs/goexif v1.0.3 // indirect
-	github.com/shirou/gopsutil/v4 v4.26.1 // indirect
-	github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af // indirect
+	github.com/shirou/gopsutil/v4 v4.25.11 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
 	github.com/smarty/assertions v1.16.0 // indirect
 	github.com/sony/gobreaker v1.0.0 // indirect
 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
-	github.com/spacemonkeygo/monkit/v3 v3.0.25-0.20251022131615-eb24eb109368 // indirect
+	github.com/spacemonkeygo/monkit/v3 v3.0.24 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect
@@ -217,18 +203,15 @@ require (
 	github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 // indirect
-	github.com/t3rm1n4l/go-mega v0.0.0-20251031123324-a804aaa87491 // indirect
+	github.com/t3rm1n4l/go-mega v0.0.0-20250926104142-ccb8d3498e6c // indirect
 	github.com/tklauser/go-sysconf v0.3.16 // indirect
 	github.com/tklauser/numcpus v0.11.0 // indirect
-	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
 	github.com/tylertreat/BoomFilters v0.0.0-20210315201527-1a82519a3e43 // indirect
-	github.com/ulikunitz/xz v0.5.15 // indirect
 	github.com/unknwon/goconfig v1.0.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/viant/ptrie v1.0.1 // indirect
-	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
@@ -237,24 +220,24 @@ require (
 	github.com/zeebo/blake3 v0.2.4 // indirect
 	github.com/zeebo/errs v1.4.0 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
-	go.etcd.io/bbolt v1.4.3 // indirect
+	go.etcd.io/bbolt v1.4.2 // indirect
 	go.mongodb.org/mongo-driver v1.17.6 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
 	go.opentelemetry.io/otel v1.38.0 // indirect
 	go.opentelemetry.io/otel/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/trace v1.38.0 // indirect
-	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
-	golang.org/x/image v0.36.0 // indirect
-	golang.org/x/net v0.49.0 // indirect
+	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/exp v0.0.0-20250811191247-51f88131bc50 // indirect
+	golang.org/x/image v0.34.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
 	golang.org/x/oauth2 v0.34.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/sys v0.41.0 // indirect
-	golang.org/x/term v0.40.0 // indirect
-	golang.org/x/text v0.34.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/term v0.38.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
 	golang.org/x/time v0.14.0 // indirect
 	google.golang.org/api v0.258.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
@@ -267,7 +250,7 @@ require (
 	modernc.org/mathutil v1.7.1 // indirect
 	moul.io/http2curl/v2 v2.3.0 // indirect
 	sigs.k8s.io/yaml v1.6.0 // indirect
-	storj.io/common v0.0.0-20251107171817-6221ae45072c // indirect
+	storj.io/common v0.0.0-20250808122759-804533d519c1 // indirect
 	storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55 // indirect
 	storj.io/eventkit v0.0.0-20250410172343-61f26d3de156 // indirect
 	storj.io/infectious v0.0.2 // indirect

test/kafka/go.sum

@@ -13,7 +13,8 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV
 cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
 cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go/auth v0.17.0 h1:74yCm7hCj2rUyyAocqnFzsAYXgJhrG26XCFimrc/Kz4=
+cloud.google.com/go/auth v0.16.5 h1:mFWNQ2FEVWAliEQWpAdH80omXFokmrnbDhUS9cBywsI=
+cloud.google.com/go/auth v0.16.5/go.mod h1:utzRfHMP+Vv0mpOkTRQoWD2q3BatTOoWbA7gCc2dUhQ=
 cloud.google.com/go/auth v0.17.0/go.mod h1:6wv/t5/6rOPAX4fJiRjKkJCvswLwdet7G8+UGXt7nCQ=
 cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
 cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
@@ -37,8 +38,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0/go.mod h1:t76Ruy8AHvUAC8GfMWJMa0ElSbuIcO03NLpynfbgsPA=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 h1:JXg2dwJUmPB9JmtVmdEB16APJ7jurfbY5jnfXpJoRMc=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0/go.mod h1:YD5h/ldMsG0XiIw7PdyNhLxaM317eFh5yNLccNfGdyw=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1/go.mod h1:IYus9qsFobWIc2YVwe/WPjcnyCkPKtnHAqUYeebc8z0=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
@@ -47,22 +48,20 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDo
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 h1:/Zt+cDPnpC3OVDm/JKLOs7M2DKmLRIIp3XIx9pHHiig=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1/go.mod h1:Ng3urmn6dYe8gnbCMoHHVl5APYz2txho3koEkV2o2HA=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4 h1:jWQK1GI+LeGGUKBADtcH2rRqPxYB1Ljwms5gFA2LqrM=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4/go.mod h1:8mwH4klAm9DUgR2EEHyEEAQlRDvLPyg5fQry3y+cDew=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.3 h1:sxgSqOB9CDToiaVFpxuvb5wGgGqWa3lCShcm5o0n3bE=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.3/go.mod h1:XdED8i399lEVblYHTZM8eXaP07gv4Z58IL6ueMlVlrg=
-github.com/Azure/go-ntlmssp v0.1.0 h1:DjFo6YtWzNqNvQdrwEyr/e4nhU3vRiwenz5QX7sFz+A=
-github.com/Azure/go-ntlmssp v0.1.0/go.mod h1:NYqdhxd/8aAct/s4qSYZEerdPuH1liG2/X9DiVTbhpk=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.3 h1:ZJJNFaQ86GVKQ9ehwqyAFE6pIfyicpuJ8IkVaPBc6/4=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.3/go.mod h1:URuDvhmATVKqHBH9/0nOiNKk0+YcwfQ3WkK5PqHKxc8=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.2 h1:l3SabZmNuXCMCbQUIeR4W6/N4j8SeH/lwX+a6leZhHo=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azfile v1.5.2/go.mod h1:k+mEZ4f1pVqZTRqtSDW2AhZ/3wT5qLpsUA75C/k7dtE=
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
 github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
 github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/FilenCloudDienste/filen-sdk-go v0.0.37 h1:W8S9TrAyZ4//3PXsU6+Bi+fe/6uIL986GyS7PVzIDL4=
-github.com/FilenCloudDienste/filen-sdk-go v0.0.37/go.mod h1:0cBhKXQg49XbKZZfk5TCDa3sVLP+xMxZTWL+7KY0XR0=
-github.com/Files-com/files-sdk-go/v3 v3.2.264 h1:lMHTplAYI9FtmCo/QOcpRxmPA5REVAct1r2riQmDQKw=
-github.com/Files-com/files-sdk-go/v3 v3.2.264/go.mod h1:wGqkOzRu/ClJibvDgcfuJNAqI2nLhe8g91tPlDKRCdE=
+github.com/Files-com/files-sdk-go/v3 v3.2.218 h1:tIvcbHXNY/bq+Sno6vajOJOxhe5XbU59Fa1ohOybK+s=
+github.com/Files-com/files-sdk-go/v3 v3.2.218/go.mod h1:E0BaGQbcMUcql+AfubCR/iasWKBxX5UZPivnQGC2z0M=
 github.com/IBM/go-sdk-core/v5 v5.21.0 h1:DUnYhvC4SoC8T84rx5omnhY3+xcQg/Whyoa3mDPIMkk=
 github.com/IBM/go-sdk-core/v5 v5.21.0/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
 github.com/IBM/sarama v1.46.0 h1:+YTM1fNd6WKMchlnLKRUB5Z0qD4M8YbvwIIPLvJD53s=
@@ -90,69 +89,63 @@ github.com/ProtonMail/gopenpgp/v2 v2.9.0 h1:ruLzBmwe4dR1hdnrsEJ/S7psSBmV15gFttFU
 github.com/ProtonMail/gopenpgp/v2 v2.9.0/go.mod h1:IldDyh9Hv1ZCCYatTuuEt1XZJ0OPjxLpTarDfglih7s=
 github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
 github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
-github.com/a1ex3/zstd-seekable-format-go/pkg v0.10.0 h1:iLDOF0rdGTrol/q8OfPIIs5kLD8XvA2q75o6Uq/tgak=
-github.com/a1ex3/zstd-seekable-format-go/pkg v0.10.0/go.mod h1:DrEWcQJjz7t5iF2duaiyhg4jyoF0kxOD6LtECNGkZ/Q=
 github.com/aalpar/deheap v0.0.0-20210914013432-0cc84d79dec3 h1:hhdWprfSpFbN7lz3W1gM40vOgvSh1WCSMxYD6gGB4Hs=
 github.com/aalpar/deheap v0.0.0-20210914013432-0cc84d79dec3/go.mod h1:XaUnRxSCYgL3kkgX0QHIV0D+znljPIDImxlv2kbGv0Y=
 github.com/abbot/go-http-auth v0.4.0 h1:QjmvZ5gSC7jm3Zg54DqWE/T5m1t2AfDu6QlXJT0EVT0=
 github.com/abbot/go-http-auth v0.4.0/go.mod h1:Cz6ARTIzApMJDzh5bRMSUou6UMSp0IEXg9km/ci7TJM=
-github.com/anchore/go-lzo v0.1.0 h1:NgAacnzqPeGH49Ky19QKLBZEuFRqtTG9cdaucc3Vncs=
-github.com/anchore/go-lzo v0.1.0/go.mod h1:3kLx0bve2oN1iDwgM1U5zGku1Tfbdb0No5qp1eL1fIk=
 github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
 github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
 github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
 github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
 github.com/appscode/go-querystring v0.0.0-20170504095604-0126cfb3f1dc h1:LoL75er+LKDHDUfU5tRvFwxH0LjPpZN8OoG8Ll+liGU=
 github.com/appscode/go-querystring v0.0.0-20170504095604-0126cfb3f1dc/go.mod h1:w648aMHEgFYS6xb0KVMMtZ2uMeemhiKCuD2vj6gY52A=
+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
+github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ=
 github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk=
-github.com/aws/aws-sdk-go-v2 v1.41.1 h1:ABlyEARCDLN034NhxlRUSZr4l71mh+T5KAeGh6cerhU=
-github.com/aws/aws-sdk-go-v2 v1.41.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
+github.com/aws/aws-sdk-go-v2 v1.41.0 h1:tNvqh1s+v0vFYdA1xq0aOJH+Y5cRyZ5upu6roPgPKd4=
+github.com/aws/aws-sdk-go-v2 v1.41.0/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4/go.mod h1:IOAPF6oT9KCsceNTvvYMNHy0+kMF8akOjeDvPENWxp4=
-github.com/aws/aws-sdk-go-v2/config v1.32.7 h1:vxUyWGUwmkQ2g19n7JY/9YL8MfAIl7bTesIUykECXmY=
-github.com/aws/aws-sdk-go-v2/config v1.32.7/go.mod h1:2/Qm5vKUU/r7Y+zUk/Ptt2MDAEKAfUtKc1+3U1Mo3oY=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.7 h1:tHK47VqqtJxOymRrNtUXN5SP/zUTvZKeLx4tH6PGQc8=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.7/go.mod h1:qOZk8sPDrxhf+4Wf4oT2urYJrYt3RejHSzgAquYeppw=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 h1:I0GyV8wiYrP8XpA70g1HBcQO1JlQxCMTW9npl5UbDHY=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17/go.mod h1:tyw7BOl5bBe/oqvoIeECFJjMdzXoa/dfVz3QQ5lgHGA=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.4 h1:2fjfz3/G9BRvIKuNZ655GwzpklC2kEH0cowZQGO7uBg=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.4/go.mod h1:Ymws824lvMypLFPwyyUXM52SXuGgxpu0+DISLfKvB+c=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 h1:xOLELNKGp2vsiteLsvLPwxC+mYmO6OZ8PYgiuPJzF8U=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17/go.mod h1:5M5CI3D12dNOtH3/mk6minaRwI2/37ifCURZISxA/IQ=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 h1:WWLqlh79iO48yLkj1v3ISRNiv+3KdQoZ6JWyfcsyQik=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17/go.mod h1:EhG22vHRrvF8oXSTYStZhJc1aUgKtnJe+aOiFEV90cM=
+github.com/aws/aws-sdk-go-v2/config v1.32.6 h1:hFLBGUKjmLAekvi1evLi5hVvFQtSo3GYwi+Bx4lpJf8=
+github.com/aws/aws-sdk-go-v2/config v1.32.6/go.mod h1:lcUL/gcd8WyjCrMnxez5OXkO3/rwcNmvfno62tnXNcI=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.6 h1:F9vWao2TwjV2MyiyVS+duza0NIRtAslgLUM0vTA1ZaE=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.6/go.mod h1:SgHzKjEVsdQr6Opor0ihgWtkWdfRAIwxYzSJ8O85VHY=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16 h1:80+uETIWS1BqjnN9uJ0dBUaETh+P1XwFy5vwHwK5r9k=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.16/go.mod h1:wOOsYuxYuB/7FlnVtzeBYRcjSRtQpAW0hCP7tIULMwo=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 h1:0SzCLoPRSK3qSydsaFQWugP+lOBCTPwfcBOm6222+UA=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4/go.mod h1:JAet9FsBHjfdI+TnMBX4ModNNaQHAd3dc/Bk+cNsxeM=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.3/go.mod h1:br7KA6edAAqDGUYJ+zVVPAyMrPhnN+zdt17yTUT6FPw=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 h1:rgGwPzb82iBYSvHMHXc8h9mRoOUBZIGFgKb9qniaZZc=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16/go.mod h1:L/UxsGeKpGoIj6DxfhOWHWQ/kGKcd4I1VncE4++IyKA=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 h1:1jtGzuV7c82xnqOVfx2F0xmJcOw5374L7N6juGW6x6U=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16/go.mod h1:M2E5OQf+XLe+SZGmmpaI2yy+J326aFf6/+54PoxSANc=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16 h1:CjMzUs78RDDv4ROu3JnJn/Ig1r6ZD7/T2DXLLRpejic=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16/go.mod h1:uVW4OLBqbJXSHJYA9svT9BluSvvwbzLQ2Crf6UPzR3c=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.15 h1:NLYTEyZmVZo0Qh183sC8nC+ydJXOOeIL/qI/sS3PdLY=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.15/go.mod h1:Z803iB3B0bc8oJV8zH2PERLRfQUJ2n2BXISpsA4+O1M=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEdJbzUCEWkVXEXoqlXV72J5keC1GvILMOuD00E=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 h1:DIBqIrJ7hv+e4CmIk2z3pyKT+3B6qVMgRsawHiR3qso=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7/go.mod h1:vLm00xmBke75UmpNvOcZQ/Q30ZFjbczeLFqGx5urmGo=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 h1:RuNSMoozM8oXlgLG/n6WLaFGoea7/CddrCfIiSA+xdY=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17/go.mod h1:F2xxQ9TZz5gDWsclCtPQscGpP0VUOc8RqgFM3vDENmU=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 h1:NSbvS17MlI2lurYgXnCOLvCFX38sBW4eiVER7+kkgsU=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16/go.mod h1:SwT8Tmqd4sA6G1qaGdzWCJN99bUmPGHfRwwq3G5Qb+A=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.95.0 h1:MIWra+MSq53CFaXXAywB2qg9YvVZifkk6vEGl/1Qor0=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.95.0/go.mod h1:79S2BdqCJpScXZA2y+cpZuocWsjGjJINyXnOsf5DTz8=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 h1:VrhDvQib/i0lxvr3zqlUwLwJP4fpmpyD9wYG1vfSu+Y=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.5/go.mod h1:k029+U8SY30/3/ras4G/Fnv/b88N4mAfliNn08Dem4M=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 h1:v6EiMvhEYBoHABfbGB4alOYmCIrcgyPPiBE1wZAEbqk=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.9/go.mod h1:yifAsgBxgJWn3ggx70A3urX2AN49Y5sJTD1UQFlfqBw=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 h1:gd84Omyu9JLriJVCbGApcLzVR3XtmC4ZDPcAI6Ftvds=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13/go.mod h1:sTGThjphYE4Ohw8vJiRStAcu3rbjtXRsdNB0TvZ5wwo=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 h1:5fFjR/ToSOzB2OQ/XqWpZBmNvmP/pJ1jOWYlFDJTjRQ=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.6/go.mod h1:qgFDZQSD/Kys7nJnVqYlWKnh0SSdMjAi0uSwON4wgYQ=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.6 h1:P1MU/SuhadGvg2jtviDXPEejU3jBNhoeeAlRadHzvHI=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.6/go.mod h1:5KYaMG6wmVKMFBSfWoyG/zH8pWwzQFnKgpoSRlXHKdQ=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 h1:oHjJHeUy0ImIV0bsrX0X91GkV5nJAyv1l1CC9lnO0TI=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16/go.mod h1:iRSNGgOYmiYwSCXxXaKb9HfOEj40+oTKn8pTxMlYkRM=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.15 h1:wsSQ4SVz5YE1crz0Ap7VBZrV4nNqZt4CIBBT8mnwoNc=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.15/go.mod h1:I7sditnFGtYMIqPRU1QoHZAUrXkGp4SczmlLwrNPlD0=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.93.0 h1:IrbE3B8O9pm3lsg96AXIN5MXX4pECEuExh/A0Du3AuI=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.93.0/go.mod h1:/sJLzHtiiZvs6C1RbxS/anSAFwZD6oC6M/kotQzOiLw=
+github.com/aws/aws-sdk-go-v2/service/signin v1.0.4 h1:HpI7aMmJ+mm1wkSHIA2t5EaFFv5EFYXePW30p1EIrbQ=
+github.com/aws/aws-sdk-go-v2/service/signin v1.0.4/go.mod h1:C5RdGMYGlfM0gYq/tifqgn4EbyX99V15P2V3R+VHbQU=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.8 h1:aM/Q24rIlS3bRAhTyFurowU8A0SMyGDtEOY/l/s/1Uw=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.8/go.mod h1:+fWt2UHSb4kS7Pu8y+BMBvJF0EWx+4H0hzNwtDNRTrg=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12 h1:AHDr0DaHIAo8c9t1emrzAlVDFp+iMMKnPdYy6XO4MCE=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.12/go.mod h1:GQ73XawFFiWxyWXMHWfhiomvP3tXtdNar/fi8z18sx0=
+github.com/aws/aws-sdk-go-v2/service/sts v1.41.5 h1:SciGFVNZ4mHdm7gpD1dgZYnCuVdX1s+lFTg4+4DOy70=
+github.com/aws/aws-sdk-go-v2/service/sts v1.41.5/go.mod h1:iW40X4QBmUxdP+fZNOpfmkdMZqsovezbAeO+Ubiv2pk=
 github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk=
 github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
-github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
-github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/boombuler/barcode v1.1.0 h1:ChaYjBR63fr4LFyGn8E8nt7dBSt3MiU3zMOZqFvVkHo=
-github.com/boombuler/barcode v1.1.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/bradenaw/juniper v0.15.3 h1:RHIAMEDTpvmzV1wg1jMAHGOoI2oJUSPx3lxRldXnFGo=
 github.com/bradenaw/juniper v0.15.3/go.mod h1:UX4FX57kVSaDp4TPqvSjkAAewmRFAfXf27BOs5z9dq8=
 github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 h1:GKTyiRCL6zVf5wWaqKnf+7Qs6GbEPfd4iMOitWzXJx8=
@@ -161,13 +154,11 @@ github.com/buengese/sgzip v0.1.1 h1:ry+T8l1mlmiWEsDrH/YHZnCVWD2S3im1KLsyO+8ZmTU=
 github.com/buengese/sgzip v0.1.1/go.mod h1:i5ZiXGF3fhV7gL1xaRRL1nDnmpNj0X061FQzOS8VMas=
 github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw=
 github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c=
-github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
-github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
-github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
-github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
-github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
-github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
+github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=
+github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA=
+github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA=
+github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
 github.com/calebcase/tmpfile v1.0.3 h1:BZrOWZ79gJqQ3XbAQlihYZf/YCV0H4KPIdM5K5oMpJo=
 github.com/calebcase/tmpfile v1.0.3/go.mod h1:UAUc01aHeC+pudPagY/lWvt2qS9ZO5Zzof6/tIUzqeI=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -179,21 +170,17 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
-github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
-github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
-github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
 github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
-github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
-github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
-github.com/cloudinary/cloudinary-go/v2 v2.13.0 h1:ugiQwb7DwpWQnete2AZkTh94MonZKmxD7hDGy1qTzDs=
-github.com/cloudinary/cloudinary-go/v2 v2.13.0/go.mod h1:ireC4gqVetsjVhYlwjUJwKTbZuWjEIynbR9zQTlqsvo=
+github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
+github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cloudinary/cloudinary-go/v2 v2.12.0 h1:uveBJeNpJztKDwFW/B+Wuklq584hQmQXlo+hGTSOGZ8=
+github.com/cloudinary/cloudinary-go/v2 v2.12.0/go.mod h1:ireC4gqVetsjVhYlwjUJwKTbZuWjEIynbR9zQTlqsvo=
 github.com/cloudsoda/go-smb2 v0.0.0-20250228001242-d4c70e6251cc h1:t8YjNUCt1DimB4HCIXBztwWMhgxr5yG5/YaRl9Afdfg=
 github.com/cloudsoda/go-smb2 v0.0.0-20250228001242-d4c70e6251cc/go.mod h1:CgWpFCFWzzEA5hVkhAc6DZZzGd3czx+BblvOzjmg6KA=
 github.com/cloudsoda/sddl v0.0.0-20250224235906-926454e91efc h1:0xCWmFKBmarCqqqLeM7jFBSw/Or81UEElFqO8MY+GDs=
 github.com/cloudsoda/sddl v0.0.0-20250224235906-926454e91efc/go.mod h1:uvR42Hb/t52HQd7x5/ZLzZEK8oihrFpgnodIJ1vte2E=
-github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
-github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
+github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
+github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cognusion/imaging v1.0.2 h1:BQwBV8V8eF3+dwffp8Udl9xF1JKh5Z0z5JkJwAi98Mc=
 github.com/cognusion/imaging v1.0.2/go.mod h1:mj7FvH7cT2dlFogQOSUQRtotBxJ4gFQ2ySMSmBm5dSk=
@@ -201,8 +188,8 @@ github.com/colinmarc/hdfs/v2 v2.4.0 h1:v6R8oBx/Wu9fHpdPoJJjpGSUxo8NhHIwrwsfhFvU9
 github.com/colinmarc/hdfs/v2 v2.4.0/go.mod h1:0NAO+/3knbMx6+5pCv+Hcbaz4xn/Zzbn9+WIib2rKVI=
 github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
 github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
-github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo=
-github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creasty/defaults v1.8.0 h1:z27FJxCAa0JKt3utc0sCImAEb+spPucmKoOdLHvHYKk=
 github.com/creasty/defaults v1.8.0/go.mod h1:iGzKe6pbEHnpMPtfDXZEr0NVxWnPTjb1bbDy08fPzYM=
 github.com/cronokirby/saferith v0.33.0 h1:TgoQlfsD4LIwx71+ChfRcIpjkw+RPOapDEVxa+LhwLo=
@@ -213,14 +200,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/diskfs/go-diskfs v1.7.0 h1:vonWmt5CMowXwUc79jWyGrf2DIMeoOjkLlMnQYGVOs8=
-github.com/diskfs/go-diskfs v1.7.0/go.mod h1:LhQyXqOugWFRahYUSw47NyZJPezFzB9UELwhpszLP/k=
-github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c=
-github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/dromara/dongle v1.0.1 h1:si/7UP/EXxnFVZok1cNos70GiMGxInAYMilHQFP5dJs=
-github.com/dromara/dongle v1.0.1/go.mod h1:ebFhTaDgxaDIKppycENTWlBsxz8mWCPWOLnsEgDpMv4=
 github.com/dropbox/dropbox-sdk-go-unofficial/v6 v6.0.5 h1:FT+t0UEDykcor4y3dMVKXIiWJETBpRgERYTGlmMd7HU=
 github.com/dropbox/dropbox-sdk-go-unofficial/v6 v6.0.5/go.mod h1:rSS3kM9XMzSQ6pw91Qgd6yB5jdt70N4OdtrAf74As5M=
 github.com/dsnet/try v0.0.3 h1:ptR59SsrcFUYbT/FhAbKTV6iLkeD6O18qfIWRml2fqI=
@@ -235,13 +216,10 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=
 github.com/ebitengine/purego v0.9.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
-github.com/elliotwutingfeng/asciiset v0.0.0-20230602022725-51bbb787efab h1:h1UgjJdAAhj+uPL68n7XASS6bU+07ZX1WJvVS2eyoeY=
-github.com/elliotwutingfeng/asciiset v0.0.0-20230602022725-51bbb787efab/go.mod h1:GLo/8fDswSAniFG+BFIaiSPcK610jyzgEhWYPQwuQdw=
 github.com/emersion/go-message v0.18.2 h1:rl55SQdjd9oJcIoQNhubD2Acs1E6IzlZISRTK7x/Lpg=
 github.com/emersion/go-message v0.18.2/go.mod h1:XpJyL70LwRvq2a8rVbHXikPgKj8+aI0kGdHlg16ibYA=
 github.com/emersion/go-vcard v0.0.0-20241024213814-c9703dde27ff h1:4N8wnS3f1hNHSmFD5zgFkWCyA4L1kCDkImPAtK7D6tg=
 github.com/emersion/go-vcard v0.0.0-20241024213814-c9703dde27ff/go.mod h1:HMJKR5wlh/ziNp+sHEDV2ltblO4JD2+IdDOWtGcQBTM=
-github.com/emmansun/gmsm v0.15.5/go.mod h1:2m4jygryohSWkaSduFErgCwQKab5BNjURoFrn2DNwyU=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -259,22 +237,20 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/gabriel-vasile/mimetype v1.4.11 h1:AQvxbp830wPhHTqc1u7nzoLT+ZFxGY7emj5DR5DYFik=
-github.com/gabriel-vasile/mimetype v1.4.11/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
+github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
+github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
 github.com/geoffgarside/ber v1.2.0 h1:/loowoRcs/MWLYmGX9QtIAbA+V/FrnVLsMMPhwiRm64=
 github.com/geoffgarside/ber v1.2.0/go.mod h1:jVPKeCbj6MvQZhwLYsGwaGI52oUorHoHKNecGT85ZCc=
-github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
-github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
+github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
+github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
 github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk=
 github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls=
-github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug=
-github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=
+github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618=
+github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/go-darwin/apfs v0.0.0-20211011131704-f84b94dbf348 h1:JnrjqG5iR07/8k7NqrLNilRsl3s1EPRQEGvbPyOce68=
 github.com/go-darwin/apfs v0.0.0-20211011131704-f84b94dbf348/go.mod h1:Czxo/d1g948LtrALAZdL04TL/HnkopquAjxYUuI02bo=
 github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
 github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
-github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UNbRM=
-github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -288,20 +264,18 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
-github.com/go-openapi/errors v0.22.4 h1:oi2K9mHTOb5DPW2Zjdzs/NIvwi2N3fARKaTJLdNabaM=
-github.com/go-openapi/errors v0.22.4/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk=
-github.com/go-openapi/strfmt v0.25.0 h1:7R0RX7mbKLa9EYCTHRcCuIPcaqlyQiWNPTXwClK0saQ=
-github.com/go-openapi/strfmt v0.25.0/go.mod h1:nNXct7OzbwrMY9+5tLX4I21pzcmE6ccMGXl3jFdPfn8=
-github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls=
-github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54=
+github.com/go-openapi/errors v0.22.2 h1:rdxhzcBUazEcGccKqbY1Y7NS8FDcMyIRr0934jrYnZg=
+github.com/go-openapi/errors v0.22.2/go.mod h1:+n/5UdIqdVnLIJ6Q9Se8HNGUXYaY6CN8ImWzfi/Gzp0=
+github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c=
+github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688=
-github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
+github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4=
+github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
 github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM=
 github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
@@ -312,14 +286,16 @@ github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
 github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
-github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw=
-github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
+github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
 github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
-github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
+github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
+github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -379,14 +355,15 @@ github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
 github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.7 h1:zrn2Ee/nWmHulBx5sAVrGgAa0f2/R35S4DJwfFaUPFQ=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
 github.com/googleapis/enterprise-certificate-proxy v0.3.7/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.15.0 h1:SyjDc1mGgZU5LncH8gimWo9lW1DtIfPibOG81vgd/bo=
 github.com/googleapis/gax-go/v2 v2.15.0/go.mod h1:zVVkkxAQHa1RQpg9z2AUCMnKhi0Qld9rcmyfL1OZhoc=
-github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
-github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
+github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
+github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E=
@@ -413,14 +390,14 @@ github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/C
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/henrybear327/Proton-API-Bridge v1.0.0 h1:gjKAaWfKu++77WsZTHg6FUyPC5W0LTKWQciUm8PMZb0=
+github.com/henrybear327/Proton-API-Bridge v1.0.0/go.mod h1:gunH16hf6U74W2b9CGDaWRadiLICsoJ6KRkSt53zLts=
+github.com/henrybear327/go-proton-api v1.0.0 h1:zYi/IbjLwFAW7ltCeqXneUGJey0TN//Xo851a/BgLXw=
+github.com/henrybear327/go-proton-api v1.0.0/go.mod h1:w63MZuzufKcIZ93pwRgiOtxMXYafI8H74D77AxytOBc=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/internxt/rclone-adapter v0.0.0-20260213125353-6f59c89fcb7c h1:r+KtxPyrhsYeNbsfeqTfEM8xRdwgV6LuNhLZxpXecb4=
-github.com/internxt/rclone-adapter v0.0.0-20260213125353-6f59c89fcb7c/go.mod h1:vdPya4AIcDjvng4ViaAzqjegJf0VHYpYHQguFx5xBp0=
 github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
 github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
 github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
@@ -433,10 +410,8 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6
 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
 github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
 github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
-github.com/jhump/protoreflect v1.18.0 h1:TOz0MSR/0JOZ5kECB/0ufGnC2jdsgZ123Rd/k4Z5/2w=
-github.com/jhump/protoreflect v1.18.0/go.mod h1:ezWcltJIVF4zYdIFM+D/sHV4Oh5LNU08ORzCGfwvTz8=
-github.com/jhump/protoreflect/v2 v2.0.0-beta.1 h1:Dw1rslK/VotaUGYsv53XVWITr+5RCPXfvvlGrM/+B6w=
-github.com/jhump/protoreflect/v2 v2.0.0-beta.1/go.mod h1:D9LBEowZyv8/iSu97FU2zmXG3JxVTmNw21mu63niFzU=
+github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94=
+github.com/jhump/protoreflect v1.17.0/go.mod h1:h9+vUUL38jiBzck8ck+6G/aeMX8Z4QUY/NiJPwPNi+8=
 github.com/jlaffaye/ftp v0.2.1-0.20240918233326-1b970516f5d3 h1:ZxO6Qr2GOXPdcW80Mcn3nemvilMPvpWqxrNfK2ZnNNs=
 github.com/jlaffaye/ftp v0.2.1-0.20240918233326-1b970516f5d3/go.mod h1:dvLUr/8Fs9a2OBrEnCC5duphbkz/k/mSy5OkXg3PAgI=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -461,12 +436,12 @@ github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRt
 github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
-github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
+github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
+github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
-github.com/klauspost/reedsolomon v1.13.0 h1:E0Cmgf2kMuhZTj6eefnvpKC4/Q4jhCi9YIjcZjK4arc=
-github.com/klauspost/reedsolomon v1.13.0/go.mod h1:ggJT9lc71Vu+cSOPBlxGvBN6TfAS77qB4fp8vJ05NSA=
+github.com/klauspost/reedsolomon v1.12.6 h1:8pqE9aECQG/ZFitiUD1xK/E83zwosBAZtE3UbuZM8TQ=
+github.com/klauspost/reedsolomon v1.12.6/go.mod h1:ggJT9lc71Vu+cSOPBlxGvBN6TfAS77qB4fp8vJ05NSA=
 github.com/koofr/go-httpclient v0.0.0-20240520111329-e20f8f203988 h1:CjEMN21Xkr9+zwPmZPaJJw+apzVbjGL5uK/6g9Q2jGU=
 github.com/koofr/go-httpclient v0.0.0-20240520111329-e20f8f203988/go.mod h1:/agobYum3uo/8V6yPVnq+R82pyVGCeuWW5arT4Txn8A=
 github.com/koofr/go-koofrclient v0.0.0-20221207135200-cbd7fc9ad6a6 h1:FHVoZMOVRA+6/y4yRlbiR3WvsrOcKBd/f64H7YiWR2U=
@@ -483,37 +458,35 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/lanrat/extsort v1.4.2 h1:akbLIdo4PhNZtvjpaWnbXtGMmLtnGzXplkzfgl+XTTY=
-github.com/lanrat/extsort v1.4.2/go.mod h1:hceP6kxKPKebjN1RVrDBXMXXECbaI41Y94tt6MDazc4=
+github.com/lanrat/extsort v1.4.0 h1:jysS/Tjnp7mBwJ6NG8SY+XYFi8HF3LujGbqY9jOWjco=
+github.com/lanrat/extsort v1.4.0/go.mod h1:hceP6kxKPKebjN1RVrDBXMXXECbaI41Y94tt6MDazc4=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/linkedin/goavro/v2 v2.14.1 h1:/8VjDpd38PRsy02JS0jflAu7JZPfJcGTwqWgMkFS2iI=
 github.com/linkedin/goavro/v2 v2.14.1/go.mod h1:KXx+erlq+RPlGSPmLF7xGo6SAbh8sCQ53x064+ioxhk=
 github.com/lpar/date v1.0.0 h1:bq/zVqFTUmsxvd/CylidY4Udqpr9BOFrParoP6p0x/I=
 github.com/lpar/date v1.0.0/go.mod h1:KjYe0dDyMQTgpqcUz4LEIeM5VZwhggjVx/V2dtc8NSo=
-github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 h1:PwQumkgq4/acIiZhtifTV5OUqqiP82UAl0h87xj/l9k=
-github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
-github.com/mailru/easyjson v0.9.1 h1:LbtsOm5WAswyWbvTEOqhypdPeZzHavpZx96/n553mR8=
-github.com/mailru/easyjson v0.9.1/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
+github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 h1:PpXWgLPs+Fqr325bN2FD2ISlRRztXibcX6e8f5FR5Dc=
+github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
-github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
-github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
+github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY=
+github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/ncw/swift/v2 v2.0.5 h1:9o5Gsd7bInAFEqsGPcaUdsboMbqf8lnNtxqWKFT9iz8=
-github.com/ncw/swift/v2 v2.0.5/go.mod h1:cbAO76/ZwcFrFlHdXPjaqWZ9R7Hdar7HpjRXBfbjigk=
+github.com/ncw/swift/v2 v2.0.4 h1:hHWVFxn5/YaTWAASmn4qyq2p6OyP/Hm3vMLzkjEqR7w=
+github.com/ncw/swift/v2 v2.0.4/go.mod h1:cbAO76/ZwcFrFlHdXPjaqWZ9R7Hdar7HpjRXBfbjigk=
 github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
 github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
@@ -527,18 +500,15 @@ github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGm
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
 github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
-github.com/oracle/oci-go-sdk/v65 v65.104.0 h1:l9awEvzWvxmYhy/97A0hZ87pa7BncYXmcO/S8+rvgK0=
-github.com/oracle/oci-go-sdk/v65 v65.104.0/go.mod h1:oB8jFGVc/7/zJ+DbleE8MzGHjhs2ioCz5stRTdZdIcY=
+github.com/oracle/oci-go-sdk/v65 v65.98.0 h1:ZKsy97KezSiYSN1Fml4hcwjpO+wq01rjBkPqIiUejVc=
+github.com/oracle/oci-go-sdk/v65 v65.98.0/go.mod h1:RGiXfpDDmRRlLtqlStTzeBjjdUNXyqm3KXKyLCm3A/Q=
 github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c=
 github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM=
 github.com/panjf2000/ants/v2 v2.11.3 h1:AfI0ngBoXJmYOpDh9m516vjqoUu2sLrIVgppI9TZVpg=
 github.com/panjf2000/ants/v2 v2.11.3/go.mod h1:8u92CYMUc6gyvTIw8Ru7Mt7+/ESnJahz5EVtqfrilek=
-github.com/parquet-go/bitpack v1.0.0 h1:AUqzlKzPPXf2bCdjfj4sTeacrUwsT7NlcYDMUQxPcQA=
-github.com/parquet-go/bitpack v1.0.0/go.mod h1:XnVk9TH+O40eOOmvpAVZ7K2ocQFrQwysLMnc6M/8lgs=
-github.com/parquet-go/jsonlite v1.0.0 h1:87QNdi56wOfsE5bdgas0vRzHPxfJgzrXGml1zZdd7VU=
-github.com/parquet-go/jsonlite v1.0.0/go.mod h1:nDjpkpL4EOtqs6NQugUsi0Rleq9sW/OtC1NnZEnxzF0=
-github.com/parquet-go/parquet-go v0.26.4 h1:zJ3l8ef5WJZE2m63pKwyEJ2BhyDlgS0PfOEhuCQQU2A=
-github.com/parquet-go/parquet-go v0.26.4/go.mod h1:h9GcSt41Knf5qXI1tp1TfR8bDBUtvdUMzSKe26aZcHk=
+github.com/parquet-go/parquet-go v0.25.1 h1:l7jJwNM0xrk0cnIIptWMtnSnuxRkwq53S+Po3KG8Xgo=
+github.com/parquet-go/parquet-go v0.25.1/go.mod h1:AXBuotO1XiBtcqJb/FKFyjBG4aqa3aQAAWF3ZPzCanY=
+github.com/parquet-go/parquet-go v0.26.3/go.mod h1:h9GcSt41Knf5qXI1tp1TfR8bDBUtvdUMzSKe26aZcHk=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
@@ -547,10 +517,8 @@ github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14 h1:XeOYlK9W1uC
 github.com/pengsrc/go-shared v0.2.1-0.20190131101655-1999055a4a14/go.mod h1:jVblp62SafmidSkvWrXyxAme3gaTfEtWwRPGz5cpvHg=
 github.com/peterh/liner v1.2.2 h1:aJ4AOodmL+JxOZZEL2u9iJf8omNRpqHc/EbrK+3mAXw=
 github.com/peterh/liner v1.2.2/go.mod h1:xFwJyiKIXJZUKItq5dGHZSTBRAuG/CpeNpWLyiNRNwI=
-github.com/petermattis/goid v0.0.0-20260113132338-7c7de50cc741 h1:KPpdlQLZcHfTMQRi6bFQ7ogNO0ltFT4PmtwTLW4W+14=
-github.com/petermattis/goid v0.0.0-20260113132338-7c7de50cc741/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
-github.com/pierrec/lz4/v4 v4.1.25 h1:kocOqRffaIbU5djlIBr7Wh+cx82C0vtFb0fOurZHqD0=
-github.com/pierrec/lz4/v4 v4.1.25/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
+github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
+github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7/go.mod h1:zO8QMzTeZd5cpnIkz/Gn6iK0jDfGicM1nynOkkPIl28=
@@ -565,15 +533,13 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
 github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/pquerna/otp v1.5.0 h1:NMMR+WrmaqXU4EzdGJEE1aUUI0AMRzsp96fFFWNPwxs=
-github.com/pquerna/otp v1.5.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
 github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
 github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
 github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
-github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8=
-github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko=
+github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
+github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
 github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
 github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
 github.com/putdotio/go-putio/putio v0.0.0-20200123120452-16d982cac2b8 h1:Y258uzXU/potCYnQd1r6wlAnoMB68BiCkCcCnKx1SH8=
@@ -582,22 +548,21 @@ github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
 github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
 github.com/quic-go/quic-go v0.57.0 h1:AsSSrrMs4qI/hLrKlTH/TGQeTMY0ib1pAOX7vA3AdqE=
 github.com/quic-go/quic-go v0.57.0/go.mod h1:ly4QBAjHA2VhdnxhojRsCUOeJwKYg+taDlos92xb1+s=
-github.com/rclone/Proton-API-Bridge v1.0.1-0.20260127174007-77f974840d11 h1:4MI2alxM/Ye2gIRBlYf28JGWTipZ4Zz7yAziPKrttjs=
-github.com/rclone/Proton-API-Bridge v1.0.1-0.20260127174007-77f974840d11/go.mod h1:3HLX7dwZgvB7nt+Yl/xdzVPcargQ1yBmJEUg3n+jMKM=
-github.com/rclone/go-proton-api v1.0.1-0.20260127173028-eb465cac3b18 h1:Lc+d3ISfQaMJKWZOE7z4ZSY4RVmdzbn1B0IM8xN18qM=
-github.com/rclone/go-proton-api v1.0.1-0.20260127173028-eb465cac3b18/go.mod h1:LB2kCEaZMzNn3ocdz+qYfxXmuLxxN0ka62KJd2x53Bc=
-github.com/rclone/rclone v1.73.1 h1:FCGZUd7sXO8+nIpbuXGPkd+f23o/ZACefrHtRGDAiDM=
-github.com/rclone/rclone v1.73.1/go.mod h1:T9HeSXv/SI9qJFkYLqsjY/5ljIFWJTVmTrG7H/4JrPY=
+github.com/rclone/rclone v1.71.2 h1:3Jk5xNPFrZhVABRuN/OPvApuZQddpE2tkhYMuEn1Ud4=
+github.com/rclone/rclone v1.71.2/go.mod h1:dCK9FzPDlpkbQJ9M7MmWsmv3X5nibfWe+ogJXu6gSgM=
 github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 h1:bsUq1dX0N8AOIL7EB/X911+m4EHsnWEHeJ0c+3TTBrg=
 github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rdleal/intervalst v1.5.0 h1:SEB9bCFz5IqD1yhfH1Wv8IBnY/JQxDplwkxHjT6hamU=
 github.com/rdleal/intervalst v1.5.0/go.mod h1:xO89Z6BC+LQDH+IPQQw/OESt5UADgFD41tYMUINGpxQ=
-github.com/relvacode/iso8601 v1.7.0 h1:BXy+V60stMP6cpswc+a93Mq3e65PfXCgDFfhvNNGrdo=
-github.com/relvacode/iso8601 v1.7.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I=
+github.com/relvacode/iso8601 v1.6.0 h1:eFXUhMJN3Gz8Rcq82f9DTMW0svjtAVuIEULglM7QHTU=
+github.com/relvacode/iso8601 v1.6.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rfjakob/eme v1.1.2 h1:SxziR8msSOElPayZNFfQw4Tjx/Sbaeeh3eRvrHVMUs4=
 github.com/rfjakob/eme v1.1.2/go.mod h1:cVvpasglm/G3ngEfcfT/Wt0GwhkuO32pf/poW6Nyk1k=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
@@ -605,18 +570,18 @@ github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDj
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
 github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
 github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik=
-github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw=
-github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
+github.com/samber/lo v1.51.0 h1:kysRYLbHy/MB7kQZf5DSN50JHmMsNEdeY24VzJFu7wI=
+github.com/samber/lo v1.51.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
 github.com/seaweedfs/goexif v1.0.3 h1:ve/OjI7dxPW8X9YQsv3JuVMaxEyF9Rvfd04ouL+Bz30=
 github.com/seaweedfs/goexif v1.0.3/go.mod h1:Oni780Z236sXpIQzk1XoJlTwqrJ02smEin9zQeff7Fk=
 github.com/segmentio/kafka-go v0.4.49 h1:GJiNX1d/g+kG6ljyJEoi9++PUMdXGAxb7JGPiDCuNmk=
 github.com/segmentio/kafka-go v0.4.49/go.mod h1:Y1gn60kzLEEaW28YshXyk2+VCUKbJ3Qr6DrnT3i4+9E=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil/v4 v4.26.1 h1:TOkEyriIXk2HX9d4isZJtbjXbEjf5qyKPAzbzY0JWSo=
-github.com/shirou/gopsutil/v4 v4.26.1/go.mod h1:medLI9/UNAb0dOI9Q3/7yWSqKkj00u+1tgY8nvv41pc=
+github.com/shirou/gopsutil/v4 v4.25.11 h1:X53gB7muL9Gnwwo2evPSE+SfOrltMoR6V3xJAXZILTY=
+github.com/shirou/gopsutil/v4 v4.25.11/go.mod h1:EivAfP5x2EhLp2ovdpKSozecVXn1TmuG7SMzs/Wh4PU=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af h1:Sp5TG9f7K39yfB+If0vjp97vuT74F72r8hfRpP8jLU0=
-github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/smarty/assertions v1.16.0 h1:EvHNkdRA4QHMrn75NZSoUQ/mAUXAYWfatfB01yTCzfY=
@@ -625,18 +590,17 @@ github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sS
 github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60=
 github.com/snabb/httpreaderat v1.0.1 h1:whlb+vuZmyjqVop8x1EKOg05l2NE4z9lsMMXjmSUCnY=
 github.com/snabb/httpreaderat v1.0.1/go.mod h1:lpbGrKDWF37yvRbtRvQsbesS6Ty5c83t8ztannPoMsA=
+github.com/sony/gobreaker v0.5.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
 github.com/sony/gobreaker v1.0.0 h1:feX5fGGXSl3dYd4aHZItw+FpHLvvoaqkawKjVNiFMNQ=
 github.com/sony/gobreaker v1.0.0/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
 github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=
 github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U=
-github.com/spacemonkeygo/monkit/v3 v3.0.25-0.20251022131615-eb24eb109368 h1:GyYC5Ntqk/yy9lEIGE7chdIvt4zP44taycwd9YDSGdc=
-github.com/spacemonkeygo/monkit/v3 v3.0.25-0.20251022131615-eb24eb109368/go.mod h1:XkZYGzknZwkD0AKUnZaSXhRiVTLCkq7CWVa3IsE72gA=
+github.com/spacemonkeygo/monkit/v3 v3.0.24 h1:cKixJ+evHnfJhWNyIZjBy5hoW8LTWmrJXPo18tzLNrk=
+github.com/spacemonkeygo/monkit/v3 v3.0.24/go.mod h1:XkZYGzknZwkD0AKUnZaSXhRiVTLCkq7CWVa3IsE72gA=
 github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
 github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
 github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
 github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
-github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
-github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
 github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
 github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
@@ -658,14 +622,15 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 h1:1oFLiOyVl+W7bnBzGhf7BbIv9loSFQcieWWYIjLqcAw=
 github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA=
-github.com/t3rm1n4l/go-mega v0.0.0-20251031123324-a804aaa87491 h1:rrGZv6xYk37hx0tW2sYfgbO0PqStbHqz6Bq6oc9Hurg=
-github.com/t3rm1n4l/go-mega v0.0.0-20251031123324-a804aaa87491/go.mod h1:ykucQyiE9Q2qx1wLlEtZkkNn1IURib/2O+Mvd25i1Fo=
+github.com/t3rm1n4l/go-mega v0.0.0-20250926104142-ccb8d3498e6c h1:BLopNCyqewbE8+BtlIp/Juzu8AJGxz0gHdGADnsblVc=
+github.com/t3rm1n4l/go-mega v0.0.0-20250926104142-ccb8d3498e6c/go.mod h1:ykucQyiE9Q2qx1wLlEtZkkNn1IURib/2O+Mvd25i1Fo=
 github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502/go.mod h1:p9lPsd+cx33L3H9nNoecRRxPssFKUwwI50I3pZ0yT+8=
 github.com/tklauser/go-sysconf v0.3.16 h1:frioLaCQSsF5Cy1jgRBrzr6t502KIIwQ0MArYICU0nA=
 github.com/tklauser/go-sysconf v0.3.16/go.mod h1:/qNL9xxDhc7tx3HSRsLWNnuzbVfh3e7gh/BmM179nYI=
@@ -673,14 +638,10 @@ github.com/tklauser/numcpus v0.11.0 h1:nSTwhKH5e1dMNsCdVBukSZrURJRoHbSEQjdEbY+9R
 github.com/tklauser/numcpus v0.11.0/go.mod h1:z+LwcLq54uWZTX0u/bGobaV34u6V7KNlTZejzM6/3MQ=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
-github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
 github.com/tylertreat/BoomFilters v0.0.0-20210315201527-1a82519a3e43 h1:QEePdg0ty2r0t1+qwfZmQ4OOl/MB2UXIeJSpIZv56lg=
 github.com/tylertreat/BoomFilters v0.0.0-20210315201527-1a82519a3e43/go.mod h1:OYRfF6eb5wY9VRFkXJH8FFBi3plw2v+giaIu7P054pM=
-github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
-github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
-github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
+github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
 github.com/unknwon/goconfig v1.0.0 h1:rS7O+CmUdli1T+oDm7fYj1MwqNWtEJfNj+FqcUHML8U=
 github.com/unknwon/goconfig v1.0.0/go.mod h1:qu2ZQ/wcC/if2u32263HTVC39PeOQRSmidQk3DuDFQ8=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
@@ -691,8 +652,6 @@ github.com/viant/ptrie v1.0.1 h1:3fFC8XqCSchf11sCSS5sbb8eGDNEP2g2Hj96lNdHlZY=
 github.com/viant/ptrie v1.0.1/go.mod h1:Y+mwwNCIUgFrCZcrG4/QChfi4ubvnNBsyrENBIgigu0=
 github.com/viant/toolbox v0.34.5 h1:szWNPiGHjo8Dd4v2a59saEhG31DRL2Xf3aJ0ZtTSuqc=
 github.com/viant/toolbox v0.34.5/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
-github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
-github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
 github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0 h1:3UeQBvD0TFrlVjOeLOBz+CPAI8dnbqNSVwUwRrkp7vQ=
 github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0/go.mod h1:IXCdmsXIht47RaVFLEdVnh1t+pgYtTAhQGj73kz+2DM=
 github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
@@ -703,9 +662,8 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
 github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
 github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
-github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
@@ -733,8 +691,8 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
-go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
-go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
+go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I=
+go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM=
 go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss=
 go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -744,8 +702,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
 go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
 go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
 go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
@@ -758,12 +716,12 @@ go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJr
 go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
-go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
-go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
+go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
+go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/arch v0.14.0 h1:z9JUEZWr8x4rR0OU6c4/4t6E6jOZ8/QBS2bBYBm4tx4=
-golang.org/x/arch v0.14.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c=
+golang.org/x/arch v0.20.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -772,15 +730,16 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-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.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -791,12 +750,12 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
-golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
+golang.org/x/exp v0.0.0-20250811191247-51f88131bc50 h1:3yiSh9fhy5/RhCSntf4Sy0Tnx50DmMpQ4MQdKKk4yg4=
+golang.org/x/exp v0.0.0-20250811191247-51f88131bc50/go.mod h1:rT6SFzZ7oxADUDx58pcaKFTcZ+inxAa9fTrYx/uVYwg=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc=
-golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4=
+golang.org/x/image v0.34.0 h1:33gCkyw9hmwbZJeZkct8XyR11yH889EQt/QH4VmXMn8=
+golang.org/x/image v0.34.0/go.mod h1:2RNFBZRB+vnwwFil8GkMdRvrJOFd1AzdZI6vOY+eJVU=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -852,7 +811,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
@@ -861,15 +819,16 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-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.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
+golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
+golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
 golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -886,6 +845,7 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 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/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -930,29 +890,31 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-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.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
-golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
+golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
+golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -960,7 +922,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
@@ -968,12 +929,14 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-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.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -1022,8 +985,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-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.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
+golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1046,7 +1009,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M
 google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
 google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.258.0 h1:IKo1j5FBlN74fe5isA2PVozN3Y5pwNKriEgAXPOkDAc=
+google.golang.org/api v0.247.0 h1:tSd/e0QrUlLsrwMKmkbQhYVa109qIintOls2Wh6bngc=
+google.golang.org/api v0.247.0/go.mod h1:r1qZOPmxXffXg6xS5uhx16Fa/UFY8QU/K4bfKrnvovM=
 google.golang.org/api v0.258.0/go.mod h1:qhOMTQEZ6lUps63ZNq9jhODswwjkjYYguA7fA3TBFww=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1083,11 +1047,12 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20250922171735-9219d122eba9 h1:LvZVVaPE0JSqL+ZWb6ErZfnEOKIqqFWUJE2D0fObSmc=
-google.golang.org/genproto v0.0.0-20250922171735-9219d122eba9/go.mod h1:QFOrLhdAe2PsTp3vQY4quuLKTi9j3XG3r6JPPaw7MSc=
-google.golang.org/genproto/googleapis/api v0.0.0-20251124214823-79d6a2a48846 h1:ZdyUkS9po3H7G0tuh955QVyyotWvOD4W0aEapeGeUYk=
-google.golang.org/genproto/googleapis/api v0.0.0-20251124214823-79d6a2a48846/go.mod h1:Fk4kyraUvqD7i5H6S43sj2W98fbZa75lpZz/eUyhfO0=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA=
+google.golang.org/genproto v0.0.0-20250715232539-7130f93afb79 h1:Nt6z9UHqSlIdIGJdz6KhTIs2VRx/iOsA5iE8bmQNcxs=
+google.golang.org/genproto v0.0.0-20250715232539-7130f93afb79/go.mod h1:kTmlBHMPqR5uCZPBvwa2B18mvubkjyY3CRLI0c6fj0s=
+google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 h1:mepRgnBZa07I4TRuomDE4sTIYieg/osKmzIf4USdWS4=
+google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba h1:UKgtfRM7Yh93Sya0Fo8ZzhDP4qBckrrxEr2oF5UIVb8=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
@@ -1101,8 +1066,8 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-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.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
+google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
 google.golang.org/grpc/examples v0.0.0-20250407062114-b368379ef8f6 h1:ExN12ndbJ608cboPYflpTny6mXSzPrDLh0iTaVrRrds=
 google.golang.org/grpc/examples v0.0.0-20250407062114-b368379ef8f6/go.mod h1:6ytKWczdvnpnO+m+JiG9NjEDzR1FJfsnmJdG7B8QVZ8=
 google.golang.org/grpc/security/advancedtls v1.0.0 h1:/KQ7VP/1bs53/aopk9QhuPyFAp9Dm9Ejix3lzYkCrDA=
@@ -1117,7 +1082,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
+google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1155,8 +1121,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
 sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
-storj.io/common v0.0.0-20251107171817-6221ae45072c h1:UDXSrdeLJe3QFouavSW10fYdpclK0YNu3KvQHzqq2+k=
-storj.io/common v0.0.0-20251107171817-6221ae45072c/go.mod h1:XNX7uykja6aco92y2y8RuqaXIDRPpt1YA2OQDKlKEUk=
+storj.io/common v0.0.0-20250808122759-804533d519c1 h1:z7ZjU+TlPZ2Lq2S12hT6+Fr7jFsBxPMrPBH4zZpZuUA=
+storj.io/common v0.0.0-20250808122759-804533d519c1/go.mod h1:YNr7/ty6CmtpG5C9lEPtPXK3hOymZpueCb9QCNuPMUY=
 storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55 h1:8OE12DvUnB9lfZcHe7IDGsuhjrY9GBAr964PVHmhsro=
 storj.io/drpc v0.0.35-0.20250513201419-f7819ea69b55/go.mod h1:Y9LZaa8esL1PW2IDMqJE7CFSNq7d5bQ3RI7mGPtmKMg=
 storj.io/eventkit v0.0.0-20250410172343-61f26d3de156 h1:5MZ0CyMbG6Pi0rRzUWVG6dvpXjbBYEX2oyXuj+tT+sk=

test/kafka/test_json_timestamp.sh

@@ -14,7 +14,8 @@ sleep 2
 
 echo "Querying messages..."
 cd /Users/chrislu/go/src/github.com/seaweedfs/seaweedfs/test/kafka/kafka-client-loadtest
-docker compose exec kafka-gateway /usr/bin/weed-sql \
+docker compose exec kafka-gateway /usr/local/bin/weed sql \
   -master=seaweedfs-master:9333 \
   -database=kafka \
   -query="SELECT id, timestamp, producer_id, counter, user_id, event_type FROM \"test-json-topic\" LIMIT 5;"
+

test/plugin_workers/ec_repair/detection_test.go

@@ -1,78 +0,0 @@
-package ec_repair_test
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	pluginworkers "github.com/seaweedfs/seaweedfs/test/plugin_workers"
-	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	pluginworker "github.com/seaweedfs/seaweedfs/weed/plugin/worker"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-func TestEcRepairDetectionFindsCandidates(t *testing.T) {
-	const (
-		volumeID   = uint32(100)
-		collection = "ec-test"
-		diskType   = "hdd"
-	)
-
-	node1 := nodeSpec{
-		id:       "node1",
-		address:  "127.0.0.1:11001",
-		diskType: diskType,
-		diskID:   0,
-		ecShards: []*master_pb.VolumeEcShardInformationMessage{
-			buildEcShardInfo(volumeID, collection, diskType, 0, map[uint32]int64{
-				0: 100,
-				1: 100,
-				2: 100,
-				3: 100,
-				4: 100,
-			}),
-		},
-	}
-
-	node2 := nodeSpec{
-		id:       "node2",
-		address:  "127.0.0.1:11002",
-		diskType: diskType,
-		diskID:   0,
-		ecShards: []*master_pb.VolumeEcShardInformationMessage{
-			buildEcShardInfo(volumeID, collection, diskType, 0, map[uint32]int64{
-				0: 50,
-				5: 100,
-				6: 100,
-				7: 100,
-				8: 100,
-				9: 100,
-			}),
-		},
-	}
-
-	topo := buildTopology([]nodeSpec{node1, node2})
-	response := &master_pb.VolumeListResponse{TopologyInfo: topo}
-	master := pluginworkers.NewMasterServer(t, response)
-
-	dialOption := grpc.WithTransportCredentials(insecure.NewCredentials())
-	handler := pluginworker.NewEcRepairHandler(dialOption)
-	harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
-		WorkerOptions: pluginworker.WorkerOptions{GrpcDialOption: dialOption},
-		Handlers:      []pluginworker.JobHandler{handler},
-	})
-	harness.WaitForJobType("ec_repair")
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	proposals, err := harness.Plugin().RunDetection(ctx, "ec_repair", &plugin_pb.ClusterContext{
-		MasterGrpcAddresses: []string{master.Address()},
-	}, 10)
-	require.NoError(t, err)
-	require.NotEmpty(t, proposals)
-	require.Equal(t, "ec_repair", proposals[0].JobType)
-}

test/plugin_workers/ec_repair/execution_test.go

@@ -1,131 +0,0 @@
-package ec_repair_test
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	pluginworkers "github.com/seaweedfs/seaweedfs/test/plugin_workers"
-	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	pluginworker "github.com/seaweedfs/seaweedfs/weed/plugin/worker"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-func TestEcRepairExecutionRepairsShards(t *testing.T) {
-	const (
-		volumeID   = uint32(200)
-		collection = "ec-repair"
-		diskType   = "hdd"
-	)
-
-	volumeServers := []*pluginworkers.VolumeServer{
-		pluginworkers.NewVolumeServer(t, ""),
-		pluginworkers.NewVolumeServer(t, ""),
-		pluginworkers.NewVolumeServer(t, ""),
-		pluginworkers.NewVolumeServer(t, ""),
-	}
-
-	nodes := []nodeSpec{
-		{
-			id:       "node1",
-			address:  volumeServers[0].Address(),
-			diskType: diskType,
-			diskID:   0,
-			ecShards: []*master_pb.VolumeEcShardInformationMessage{
-				buildEcShardInfo(volumeID, collection, diskType, 0, map[uint32]int64{
-					0: 100,
-					1: 100,
-					2: 100,
-					3: 100,
-					4: 100,
-				}),
-			},
-		},
-		{
-			id:       "node2",
-			address:  volumeServers[1].Address(),
-			diskType: diskType,
-			diskID:   0,
-			ecShards: []*master_pb.VolumeEcShardInformationMessage{
-				buildEcShardInfo(volumeID, collection, diskType, 0, map[uint32]int64{
-					0: 50,
-					5: 100,
-					6: 100,
-					7: 100,
-					8: 100,
-					9: 100,
-				}),
-			},
-		},
-		{
-			id:       "node3",
-			address:  volumeServers[2].Address(),
-			diskType: diskType,
-			diskID:   0,
-		},
-		{
-			id:       "node4",
-			address:  volumeServers[3].Address(),
-			diskType: diskType,
-			diskID:   0,
-		},
-	}
-
-	topo := buildTopology(nodes)
-	response := &master_pb.VolumeListResponse{TopologyInfo: topo}
-	master := pluginworkers.NewMasterServer(t, response)
-
-	dialOption := grpc.WithTransportCredentials(insecure.NewCredentials())
-	handler := pluginworker.NewEcRepairHandler(dialOption)
-	harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
-		WorkerOptions: pluginworker.WorkerOptions{GrpcDialOption: dialOption},
-		Handlers:      []pluginworker.JobHandler{handler},
-	})
-	harness.WaitForJobType("ec_repair")
-
-	job := &plugin_pb.JobSpec{
-		JobId:   fmt.Sprintf("ec-repair-%d", volumeID),
-		JobType: "ec_repair",
-		Parameters: map[string]*plugin_pb.ConfigValue{
-			"volume_id": {
-				Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: int64(volumeID)},
-			},
-			"collection": {
-				Kind: &plugin_pb.ConfigValue_StringValue{StringValue: collection},
-			},
-			"disk_type": {
-				Kind: &plugin_pb.ConfigValue_StringValue{StringValue: diskType},
-			},
-		},
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	result, err := harness.Plugin().ExecuteJob(ctx, job, &plugin_pb.ClusterContext{
-		MasterGrpcAddresses: []string{master.Address()},
-	}, 1)
-	require.NoError(t, err)
-	require.NotNil(t, result)
-	require.True(t, result.Success)
-
-	rebuildCalls := 0
-	copyCalls := 0
-	deleteCalls := 0
-	unmountCalls := 0
-	for _, vs := range volumeServers {
-		rebuildCalls += len(vs.RebuildRequests())
-		copyCalls += len(vs.CopyRequests())
-		deleteCalls += len(vs.EcDeleteRequests())
-		unmountCalls += len(vs.UnmountRequests())
-	}
-
-	require.Greater(t, rebuildCalls, 0)
-	require.Greater(t, copyCalls, 0)
-	require.Greater(t, deleteCalls, 0)
-	require.Greater(t, unmountCalls, 0)
-}

test/plugin_workers/ec_repair/helpers_test.go

@@ -1,69 +0,0 @@
-package ec_repair_test
-
-import (
-	"sort"
-
-	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
-)
-
-type nodeSpec struct {
-	id       string
-	address  string
-	diskType string
-	diskID   uint32
-	ecShards []*master_pb.VolumeEcShardInformationMessage
-}
-
-func buildTopology(nodes []nodeSpec) *master_pb.TopologyInfo {
-	dataNodes := make([]*master_pb.DataNodeInfo, 0, len(nodes))
-	for _, node := range nodes {
-		diskInfo := &master_pb.DiskInfo{
-			DiskId:         node.diskID,
-			MaxVolumeCount: 100,
-			VolumeCount:    10,
-			EcShardInfos:   node.ecShards,
-		}
-		dataNodes = append(dataNodes, &master_pb.DataNodeInfo{
-			Id:        node.id,
-			Address:   node.address,
-			DiskInfos: map[string]*master_pb.DiskInfo{node.diskType: diskInfo},
-		})
-	}
-	return &master_pb.TopologyInfo{
-		DataCenterInfos: []*master_pb.DataCenterInfo{
-			{
-				Id: "dc1",
-				RackInfos: []*master_pb.RackInfo{
-					{
-						Id:            "rack1",
-						DataNodeInfos: dataNodes,
-					},
-				},
-			},
-		},
-	}
-}
-
-func buildEcShardInfo(volumeID uint32, collection, diskType string, diskID uint32, shardSizes map[uint32]int64) *master_pb.VolumeEcShardInformationMessage {
-	shardIDs := make([]int, 0, len(shardSizes))
-	for shardID := range shardSizes {
-		shardIDs = append(shardIDs, int(shardID))
-	}
-	sort.Ints(shardIDs)
-
-	var bits uint32
-	sizes := make([]int64, 0, len(shardIDs))
-	for _, shardID := range shardIDs {
-		bits |= (1 << shardID)
-		sizes = append(sizes, shardSizes[uint32(shardID)])
-	}
-
-	return &master_pb.VolumeEcShardInformationMessage{
-		Id:          volumeID,
-		Collection:  collection,
-		EcIndexBits: bits,
-		DiskType:    diskType,
-		DiskId:      diskID,
-		ShardSizes:  sizes,
-	}
-}

test/plugin_workers/erasure_coding/detection_test.go

@@ -1,285 +0,0 @@
-package erasure_coding_test
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	pluginworkers "github.com/seaweedfs/seaweedfs/test/plugin_workers"
-	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/worker_pb"
-	pluginworker "github.com/seaweedfs/seaweedfs/weed/plugin/worker"
-	ecstorage "github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-	"google.golang.org/protobuf/proto"
-)
-
-type topologySpec struct {
-	name         string
-	dataCenters  int
-	racksPerDC   int
-	nodesPerRack int
-	diskTypes    []string
-	replicas     int
-	collection   string
-}
-
-type detectionCase struct {
-	name                  string
-	topology              topologySpec
-	adminCollectionFilter string
-	expectProposals       bool
-}
-
-func TestErasureCodingDetectionAcrossTopologies(t *testing.T) {
-	cases := []detectionCase{
-		{
-			name: "single-dc-multi-rack",
-			topology: topologySpec{
-				name:         "single-dc-multi-rack",
-				dataCenters:  1,
-				racksPerDC:   2,
-				nodesPerRack: 7,
-				diskTypes:    []string{"hdd"},
-				replicas:     1,
-				collection:   "ec-test",
-			},
-			expectProposals: true,
-		},
-		{
-			name: "multi-dc",
-			topology: topologySpec{
-				name:         "multi-dc",
-				dataCenters:  2,
-				racksPerDC:   1,
-				nodesPerRack: 7,
-				diskTypes:    []string{"hdd"},
-				replicas:     1,
-				collection:   "ec-test",
-			},
-			expectProposals: true,
-		},
-		{
-			name: "multi-dc-multi-rack",
-			topology: topologySpec{
-				name:         "multi-dc-multi-rack",
-				dataCenters:  2,
-				racksPerDC:   2,
-				nodesPerRack: 4,
-				diskTypes:    []string{"hdd"},
-				replicas:     1,
-				collection:   "ec-test",
-			},
-			expectProposals: true,
-		},
-		{
-			name: "mixed-disk-types",
-			topology: topologySpec{
-				name:         "mixed-disk-types",
-				dataCenters:  1,
-				racksPerDC:   2,
-				nodesPerRack: 7,
-				diskTypes:    []string{"hdd", "ssd"},
-				replicas:     1,
-				collection:   "ec-test",
-			},
-			expectProposals: true,
-		},
-		{
-			name: "multi-replica-volume",
-			topology: topologySpec{
-				name:         "multi-replica-volume",
-				dataCenters:  1,
-				racksPerDC:   2,
-				nodesPerRack: 7,
-				diskTypes:    []string{"hdd"},
-				replicas:     3,
-				collection:   "ec-test",
-			},
-			expectProposals: true,
-		},
-		{
-			name: "collection-filter-match",
-			topology: topologySpec{
-				name:         "collection-filter-match",
-				dataCenters:  1,
-				racksPerDC:   2,
-				nodesPerRack: 7,
-				diskTypes:    []string{"hdd"},
-				replicas:     1,
-				collection:   "filtered",
-			},
-			adminCollectionFilter: "filtered",
-			expectProposals:       true,
-		},
-		{
-			name: "collection-filter-mismatch",
-			topology: topologySpec{
-				name:         "collection-filter-mismatch",
-				dataCenters:  1,
-				racksPerDC:   2,
-				nodesPerRack: 7,
-				diskTypes:    []string{"hdd"},
-				replicas:     1,
-				collection:   "filtered",
-			},
-			adminCollectionFilter: "other",
-			expectProposals:       false,
-		},
-		{
-			name: "insufficient-disks",
-			topology: topologySpec{
-				name:         "insufficient-disks",
-				dataCenters:  1,
-				racksPerDC:   1,
-				nodesPerRack: 2,
-				diskTypes:    []string{"hdd"},
-				replicas:     1,
-				collection:   "ec-test",
-			},
-			expectProposals: false,
-		},
-	}
-
-	for _, tc := range cases {
-		tc := tc
-		t.Run(tc.name, func(t *testing.T) {
-			volumeID := uint32(7)
-			response := buildVolumeListResponse(t, tc.topology, volumeID)
-			master := pluginworkers.NewMasterServer(t, response)
-
-			dialOption := grpc.WithTransportCredentials(insecure.NewCredentials())
-			handler := pluginworker.NewErasureCodingHandler(dialOption, t.TempDir())
-			harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
-				WorkerOptions: pluginworker.WorkerOptions{
-					GrpcDialOption: dialOption,
-				},
-				Handlers: []pluginworker.JobHandler{handler},
-			})
-			harness.WaitForJobType("erasure_coding")
-
-			if tc.adminCollectionFilter != "" {
-				err := harness.Plugin().SaveJobTypeConfig(&plugin_pb.PersistedJobTypeConfig{
-					JobType: "erasure_coding",
-					AdminConfigValues: map[string]*plugin_pb.ConfigValue{
-						"collection_filter": {
-							Kind: &plugin_pb.ConfigValue_StringValue{StringValue: tc.adminCollectionFilter},
-						},
-					},
-				})
-				require.NoError(t, err)
-			}
-
-			ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-			defer cancel()
-
-			proposals, err := harness.Plugin().RunDetection(ctx, "erasure_coding", &plugin_pb.ClusterContext{
-				MasterGrpcAddresses: []string{master.Address()},
-			}, 10)
-			require.NoError(t, err)
-
-			if !tc.expectProposals {
-				require.Empty(t, proposals)
-				return
-			}
-
-			require.NotEmpty(t, proposals)
-
-			proposal := proposals[0]
-			require.Equal(t, "erasure_coding", proposal.JobType)
-			paramsValue := proposal.Parameters["task_params_pb"]
-			require.NotNil(t, paramsValue)
-
-			params := &worker_pb.TaskParams{}
-			require.NoError(t, proto.Unmarshal(paramsValue.GetBytesValue(), params))
-			require.NotEmpty(t, params.Sources)
-			require.Len(t, params.Targets, ecstorage.TotalShardsCount)
-		})
-	}
-}
-
-func buildVolumeListResponse(t *testing.T, spec topologySpec, volumeID uint32) *master_pb.VolumeListResponse {
-	t.Helper()
-
-	volumeSizeLimitMB := uint64(100)
-	volumeSize := uint64(90) * 1024 * 1024
-	volumeModifiedAt := time.Now().Add(-10 * time.Minute).Unix()
-
-	diskTypes := spec.diskTypes
-	if len(diskTypes) == 0 {
-		diskTypes = []string{"hdd"}
-	}
-	replicas := spec.replicas
-	if replicas <= 0 {
-		replicas = 1
-	}
-	collection := spec.collection
-	if collection == "" {
-		collection = "ec-test"
-	}
-
-	var dataCenters []*master_pb.DataCenterInfo
-	nodeIndex := 0
-	replicasPlaced := 0
-
-	for dc := 0; dc < spec.dataCenters; dc++ {
-		var racks []*master_pb.RackInfo
-		for rack := 0; rack < spec.racksPerDC; rack++ {
-			var nodes []*master_pb.DataNodeInfo
-			for n := 0; n < spec.nodesPerRack; n++ {
-				nodeIndex++
-				address := fmt.Sprintf("127.0.0.1:%d", 20000+nodeIndex)
-				diskType := diskTypes[(nodeIndex-1)%len(diskTypes)]
-
-				diskInfo := &master_pb.DiskInfo{
-					DiskId:         0,
-					MaxVolumeCount: 100,
-					VolumeCount:    0,
-					VolumeInfos:    []*master_pb.VolumeInformationMessage{},
-				}
-
-				if replicasPlaced < replicas {
-					diskInfo.VolumeCount = 1
-					diskInfo.VolumeInfos = append(diskInfo.VolumeInfos, &master_pb.VolumeInformationMessage{
-						Id:               volumeID,
-						Collection:       collection,
-						DiskId:           0,
-						Size:             volumeSize,
-						DeletedByteCount: 0,
-						ModifiedAtSecond: volumeModifiedAt,
-						ReplicaPlacement: 1,
-						ReadOnly:         false,
-					})
-					replicasPlaced++
-				}
-
-				nodes = append(nodes, &master_pb.DataNodeInfo{
-					Id:        address,
-					Address:   address,
-					DiskInfos: map[string]*master_pb.DiskInfo{diskType: diskInfo},
-				})
-			}
-
-			racks = append(racks, &master_pb.RackInfo{
-				Id:            fmt.Sprintf("rack-%d", rack+1),
-				DataNodeInfos: nodes,
-			})
-		}
-
-		dataCenters = append(dataCenters, &master_pb.DataCenterInfo{
-			Id:        fmt.Sprintf("dc-%d", dc+1),
-			RackInfos: racks,
-		})
-	}
-
-	return &master_pb.VolumeListResponse{
-		VolumeSizeLimitMb: volumeSizeLimitMB,
-		TopologyInfo: &master_pb.TopologyInfo{
-			DataCenterInfos: dataCenters,
-		},
-	}
-}

test/plugin_workers/erasure_coding/execution_test.go

@@ -1,83 +0,0 @@
-package erasure_coding_test
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	pluginworkers "github.com/seaweedfs/seaweedfs/test/plugin_workers"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	pluginworker "github.com/seaweedfs/seaweedfs/weed/plugin/worker"
-	ecstorage "github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-func TestErasureCodingExecutionEncodesShards(t *testing.T) {
-	volumeID := uint32(123)
-	datSize := 1 * 1024 * 1024
-
-	dialOption := grpc.WithTransportCredentials(insecure.NewCredentials())
-	handler := pluginworker.NewErasureCodingHandler(dialOption, t.TempDir())
-	harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
-		WorkerOptions: pluginworker.WorkerOptions{
-			GrpcDialOption: dialOption,
-		},
-		Handlers: []pluginworker.JobHandler{handler},
-	})
-	harness.WaitForJobType("erasure_coding")
-
-	sourceServer := pluginworkers.NewVolumeServer(t, "")
-	pluginworkers.WriteTestVolumeFiles(t, sourceServer.BaseDir(), volumeID, datSize)
-
-	targetServers := make([]*pluginworkers.VolumeServer, 0, ecstorage.TotalShardsCount)
-	targetAddresses := make([]string, 0, ecstorage.TotalShardsCount)
-	for i := 0; i < ecstorage.TotalShardsCount; i++ {
-		target := pluginworkers.NewVolumeServer(t, "")
-		targetServers = append(targetServers, target)
-		targetAddresses = append(targetAddresses, target.Address())
-	}
-
-	job := &plugin_pb.JobSpec{
-		JobId:   fmt.Sprintf("ec-job-%d", volumeID),
-		JobType: "erasure_coding",
-		Parameters: map[string]*plugin_pb.ConfigValue{
-			"volume_id": {
-				Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: int64(volumeID)},
-			},
-			"collection": {
-				Kind: &plugin_pb.ConfigValue_StringValue{StringValue: "ec-test"},
-			},
-			"source_server": {
-				Kind: &plugin_pb.ConfigValue_StringValue{StringValue: sourceServer.Address()},
-			},
-			"target_servers": {
-				Kind: &plugin_pb.ConfigValue_StringList{StringList: &plugin_pb.StringList{Values: targetAddresses}},
-			},
-		},
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	result, err := harness.Plugin().ExecuteJob(ctx, job, nil, 1)
-	require.NoError(t, err)
-	require.NotNil(t, result)
-	require.True(t, result.Success)
-
-	require.GreaterOrEqual(t, sourceServer.MarkReadonlyCount(), 1)
-	require.GreaterOrEqual(t, len(sourceServer.DeleteRequests()), 1)
-
-	for shardID := 0; shardID < ecstorage.TotalShardsCount; shardID++ {
-		targetIndex := shardID % len(targetServers)
-		target := targetServers[targetIndex]
-		expected := filepath.Join(target.BaseDir(), fmt.Sprintf("%d.ec%02d", volumeID, shardID))
-		info, err := os.Stat(expected)
-		require.NoErrorf(t, err, "missing shard file %s", expected)
-		require.Greater(t, info.Size(), int64(0))
-	}
-}

test/plugin_workers/erasure_coding/large_topology_test.go

@@ -1,123 +0,0 @@
-package erasure_coding_test
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	pluginworkers "github.com/seaweedfs/seaweedfs/test/plugin_workers"
-	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	pluginworker "github.com/seaweedfs/seaweedfs/weed/plugin/worker"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-func TestErasureCodingDetectionLargeTopology(t *testing.T) {
-	const (
-		rackCount       = 100
-		serverCount     = 1000
-		volumesPerNode  = 300
-		volumeSizeLimit = uint64(100)
-	)
-
-	if serverCount%rackCount != 0 {
-		t.Fatalf("serverCount (%d) must be divisible by rackCount (%d)", serverCount, rackCount)
-	}
-
-	nodesPerRack := serverCount / rackCount
-	eligibleSize := uint64(90) * 1024 * 1024
-	ineligibleSize := uint64(10) * 1024 * 1024
-	modifiedAt := time.Now().Add(-10 * time.Minute).Unix()
-
-	volumeID := uint32(1)
-	dataCenters := make([]*master_pb.DataCenterInfo, 0, 1)
-
-	racks := make([]*master_pb.RackInfo, 0, rackCount)
-	for rack := 0; rack < rackCount; rack++ {
-		nodes := make([]*master_pb.DataNodeInfo, 0, nodesPerRack)
-		for node := 0; node < nodesPerRack; node++ {
-			address := fmt.Sprintf("10.0.%d.%d:8080", rack, node+1)
-			volumes := make([]*master_pb.VolumeInformationMessage, 0, volumesPerNode)
-			for v := 0; v < volumesPerNode; v++ {
-				size := ineligibleSize
-				if volumeID%2 == 0 {
-					size = eligibleSize
-				}
-				volumes = append(volumes, &master_pb.VolumeInformationMessage{
-					Id:               volumeID,
-					Collection:       "ec-bulk",
-					DiskId:           0,
-					Size:             size,
-					DeletedByteCount: 0,
-					ModifiedAtSecond: modifiedAt,
-					ReplicaPlacement: 1,
-					ReadOnly:         false,
-				})
-				volumeID++
-			}
-
-			diskInfo := &master_pb.DiskInfo{
-				DiskId:         0,
-				MaxVolumeCount: int64(volumesPerNode + 10),
-				VolumeCount:    int64(volumesPerNode),
-				VolumeInfos:    volumes,
-			}
-
-			nodes = append(nodes, &master_pb.DataNodeInfo{
-				Id:        address,
-				Address:   address,
-				DiskInfos: map[string]*master_pb.DiskInfo{"hdd": diskInfo},
-			})
-		}
-
-		racks = append(racks, &master_pb.RackInfo{
-			Id:            fmt.Sprintf("rack-%d", rack+1),
-			DataNodeInfos: nodes,
-		})
-	}
-
-	dataCenters = append(dataCenters, &master_pb.DataCenterInfo{
-		Id:        "dc-1",
-		RackInfos: racks,
-	})
-
-	response := &master_pb.VolumeListResponse{
-		VolumeSizeLimitMb: volumeSizeLimit,
-		TopologyInfo: &master_pb.TopologyInfo{
-			DataCenterInfos: dataCenters,
-		},
-	}
-
-	master := pluginworkers.NewMasterServer(t, response)
-
-	dialOption := grpc.WithTransportCredentials(insecure.NewCredentials())
-	handler := pluginworker.NewErasureCodingHandler(dialOption, t.TempDir())
-	harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
-		WorkerOptions: pluginworker.WorkerOptions{
-			GrpcDialOption: dialOption,
-		},
-		Handlers: []pluginworker.JobHandler{handler},
-	})
-	harness.WaitForJobType("erasure_coding")
-
-	totalVolumes := serverCount * volumesPerNode
-	expectedEligible := totalVolumes / 2
-
-	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
-	defer cancel()
-
-	start := time.Now()
-	proposals, err := harness.Plugin().RunDetection(ctx, "erasure_coding", &plugin_pb.ClusterContext{
-		MasterGrpcAddresses: []string{master.Address()},
-	}, 0)
-	duration := time.Since(start)
-	require.NoError(t, err)
-	require.GreaterOrEqual(t, len(proposals), 10, "should detect at least some proposals")
-	t.Logf("large topology detection completed in %s (proposals=%d, eligible=%d)", duration, len(proposals), expectedEligible)
-	if len(proposals) < expectedEligible {
-		t.Logf("large topology detection stopped early: %d proposals vs %d eligible", len(proposals), expectedEligible)
-	}
-}

test/plugin_workers/fake_master.go

@@ -1,90 +0,0 @@
-package pluginworkers
-
-import (
-	"context"
-	"net"
-	"sync"
-
-	"github.com/seaweedfs/seaweedfs/weed/pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
-	"google.golang.org/grpc"
-	"google.golang.org/protobuf/proto"
-	"testing"
-)
-
-// MasterServer provides a stub master gRPC service for topology responses.
-type MasterServer struct {
-	master_pb.UnimplementedSeaweedServer
-
-	t *testing.T
-
-	server   *grpc.Server
-	listener net.Listener
-	address  string
-
-	mu       sync.RWMutex
-	response *master_pb.VolumeListResponse
-}
-
-// NewMasterServer starts a stub master server that serves the provided response.
-func NewMasterServer(t *testing.T, response *master_pb.VolumeListResponse) *MasterServer {
-	t.Helper()
-
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen master: %v", err)
-	}
-
-	server := pb.NewGrpcServer()
-	ms := &MasterServer{
-		t:        t,
-		server:   server,
-		listener: listener,
-		address:  listener.Addr().String(),
-		response: response,
-	}
-
-	master_pb.RegisterSeaweedServer(server, ms)
-	go func() {
-		_ = server.Serve(listener)
-	}()
-
-	t.Cleanup(func() {
-		ms.Shutdown()
-	})
-
-	return ms
-}
-
-// Address returns the gRPC address of the master server.
-func (m *MasterServer) Address() string {
-	return m.address
-}
-
-// SetVolumeListResponse updates the response served by VolumeList.
-func (m *MasterServer) SetVolumeListResponse(response *master_pb.VolumeListResponse) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.response = response
-}
-
-// VolumeList returns the configured topology response.
-func (m *MasterServer) VolumeList(ctx context.Context, req *master_pb.VolumeListRequest) (*master_pb.VolumeListResponse, error) {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-
-	if m.response == nil {
-		return &master_pb.VolumeListResponse{}, nil
-	}
-	return proto.Clone(m.response).(*master_pb.VolumeListResponse), nil
-}
-
-// Shutdown stops the master gRPC server.
-func (m *MasterServer) Shutdown() {
-	if m.server != nil {
-		m.server.GracefulStop()
-	}
-	if m.listener != nil {
-		_ = m.listener.Close()
-	}
-}

test/plugin_workers/fake_volume_server.go

@@ -1,407 +0,0 @@
-package pluginworkers
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/seaweedfs/seaweedfs/weed/pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
-	"google.golang.org/grpc"
-)
-
-// VolumeServer provides a minimal volume server for erasure coding tests.
-type VolumeServer struct {
-	volume_server_pb.UnimplementedVolumeServerServer
-
-	t *testing.T
-
-	server   *grpc.Server
-	listener net.Listener
-	address  string
-	baseDir  string
-
-	mu                 sync.Mutex
-	receivedFiles      map[string]uint64
-	mountRequests      []*volume_server_pb.VolumeEcShardsMountRequest
-	unmountRequests    []*volume_server_pb.VolumeEcShardsUnmountRequest
-	copyRequests       []*volume_server_pb.VolumeEcShardsCopyRequest
-	rebuildRequests    []*volume_server_pb.VolumeEcShardsRebuildRequest
-	ecDeleteRequests   []*volume_server_pb.VolumeEcShardsDeleteRequest
-	deleteRequests     []*volume_server_pb.VolumeDeleteRequest
-	markReadonlyCalls  int
-	vacuumGarbageRatio float64
-	vacuumCheckCalls   int
-	vacuumCompactCalls int
-	vacuumCommitCalls  int
-	vacuumCleanupCalls int
-	volumeCopyCalls    int
-	volumeMountCalls   int
-	tailReceiverCalls  int
-}
-
-// NewVolumeServer starts a test volume server using the provided base directory.
-func NewVolumeServer(t *testing.T, baseDir string) *VolumeServer {
-	t.Helper()
-
-	if baseDir == "" {
-		baseDir = t.TempDir()
-	}
-	if err := os.MkdirAll(baseDir, 0755); err != nil {
-		t.Fatalf("create volume base dir: %v", err)
-	}
-
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("listen volume server: %v", err)
-	}
-
-	grpcPort := listener.Addr().(*net.TCPAddr).Port
-	server := pb.NewGrpcServer()
-	vs := &VolumeServer{
-		t:             t,
-		server:        server,
-		listener:      listener,
-		address:       fmt.Sprintf("127.0.0.1:0.%d", grpcPort),
-		baseDir:       baseDir,
-		receivedFiles: make(map[string]uint64),
-	}
-
-	volume_server_pb.RegisterVolumeServerServer(server, vs)
-	go func() {
-		_ = server.Serve(listener)
-	}()
-
-	t.Cleanup(func() {
-		vs.Shutdown()
-	})
-
-	return vs
-}
-
-// Address returns the gRPC address of the volume server.
-func (v *VolumeServer) Address() string {
-	return v.address
-}
-
-// BaseDir returns the base directory used by the server.
-func (v *VolumeServer) BaseDir() string {
-	return v.baseDir
-}
-
-// ReceivedFiles returns a snapshot of received files and byte counts.
-func (v *VolumeServer) ReceivedFiles() map[string]uint64 {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-
-	out := make(map[string]uint64, len(v.receivedFiles))
-	for key, value := range v.receivedFiles {
-		out[key] = value
-	}
-	return out
-}
-
-// SetVacuumGarbageRatio sets the garbage ratio returned by VacuumVolumeCheck.
-func (v *VolumeServer) SetVacuumGarbageRatio(ratio float64) {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-	v.vacuumGarbageRatio = ratio
-}
-
-// VacuumStats returns the vacuum RPC call counts.
-func (v *VolumeServer) VacuumStats() (check, compact, commit, cleanup int) {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-	return v.vacuumCheckCalls, v.vacuumCompactCalls, v.vacuumCommitCalls, v.vacuumCleanupCalls
-}
-
-// BalanceStats returns the balance RPC call counts.
-func (v *VolumeServer) BalanceStats() (copyCalls, mountCalls, tailCalls int) {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-	return v.volumeCopyCalls, v.volumeMountCalls, v.tailReceiverCalls
-}
-
-// MountRequests returns recorded mount requests.
-func (v *VolumeServer) MountRequests() []*volume_server_pb.VolumeEcShardsMountRequest {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-
-	out := make([]*volume_server_pb.VolumeEcShardsMountRequest, len(v.mountRequests))
-	copy(out, v.mountRequests)
-	return out
-}
-
-// UnmountRequests returns recorded unmount requests.
-func (v *VolumeServer) UnmountRequests() []*volume_server_pb.VolumeEcShardsUnmountRequest {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-
-	out := make([]*volume_server_pb.VolumeEcShardsUnmountRequest, len(v.unmountRequests))
-	copy(out, v.unmountRequests)
-	return out
-}
-
-// CopyRequests returns recorded EC shard copy requests.
-func (v *VolumeServer) CopyRequests() []*volume_server_pb.VolumeEcShardsCopyRequest {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-
-	out := make([]*volume_server_pb.VolumeEcShardsCopyRequest, len(v.copyRequests))
-	copy(out, v.copyRequests)
-	return out
-}
-
-// RebuildRequests returns recorded EC shard rebuild requests.
-func (v *VolumeServer) RebuildRequests() []*volume_server_pb.VolumeEcShardsRebuildRequest {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-
-	out := make([]*volume_server_pb.VolumeEcShardsRebuildRequest, len(v.rebuildRequests))
-	copy(out, v.rebuildRequests)
-	return out
-}
-
-// EcDeleteRequests returns recorded EC shard delete requests.
-func (v *VolumeServer) EcDeleteRequests() []*volume_server_pb.VolumeEcShardsDeleteRequest {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-
-	out := make([]*volume_server_pb.VolumeEcShardsDeleteRequest, len(v.ecDeleteRequests))
-	copy(out, v.ecDeleteRequests)
-	return out
-}
-
-// DeleteRequests returns recorded delete requests.
-func (v *VolumeServer) DeleteRequests() []*volume_server_pb.VolumeDeleteRequest {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-
-	out := make([]*volume_server_pb.VolumeDeleteRequest, len(v.deleteRequests))
-	copy(out, v.deleteRequests)
-	return out
-}
-
-// MarkReadonlyCount returns the number of readonly calls.
-func (v *VolumeServer) MarkReadonlyCount() int {
-	v.mu.Lock()
-	defer v.mu.Unlock()
-	return v.markReadonlyCalls
-}
-
-// Shutdown stops the volume server.
-func (v *VolumeServer) Shutdown() {
-	if v.server != nil {
-		v.server.GracefulStop()
-	}
-	if v.listener != nil {
-		_ = v.listener.Close()
-	}
-}
-
-func (v *VolumeServer) filePath(volumeID uint32, ext string) string {
-	return filepath.Join(v.baseDir, fmt.Sprintf("%d%s", volumeID, ext))
-}
-
-func (v *VolumeServer) CopyFile(req *volume_server_pb.CopyFileRequest, stream volume_server_pb.VolumeServer_CopyFileServer) error {
-	if req == nil {
-		return fmt.Errorf("copy file request is nil")
-	}
-	path := v.filePath(req.VolumeId, req.Ext)
-	file, err := os.Open(path)
-	if err != nil {
-		if req.IgnoreSourceFileNotFound {
-			return nil
-		}
-		return err
-	}
-	defer file.Close()
-
-	buf := make([]byte, 64*1024)
-	for {
-		n, readErr := file.Read(buf)
-		if n > 0 {
-			if err := stream.Send(&volume_server_pb.CopyFileResponse{FileContent: buf[:n]}); err != nil {
-				return err
-			}
-		}
-		if readErr == io.EOF {
-			break
-		}
-		if readErr != nil {
-			return readErr
-		}
-	}
-	return nil
-}
-
-func (v *VolumeServer) ReceiveFile(stream volume_server_pb.VolumeServer_ReceiveFileServer) error {
-	var (
-		info         *volume_server_pb.ReceiveFileInfo
-		file         *os.File
-		bytesWritten uint64
-		filePath     string
-	)
-	defer func() {
-		if file != nil {
-			_ = file.Close()
-		}
-	}()
-
-	for {
-		req, err := stream.Recv()
-		if err == io.EOF {
-			if info == nil {
-				return stream.SendAndClose(&volume_server_pb.ReceiveFileResponse{Error: "missing file info"})
-			}
-			v.mu.Lock()
-			v.receivedFiles[filePath] = bytesWritten
-			v.mu.Unlock()
-			return stream.SendAndClose(&volume_server_pb.ReceiveFileResponse{BytesWritten: bytesWritten})
-		}
-		if err != nil {
-			return err
-		}
-
-		if reqInfo := req.GetInfo(); reqInfo != nil {
-			info = reqInfo
-			filePath = v.filePath(info.VolumeId, info.Ext)
-			if err := os.MkdirAll(filepath.Dir(filePath), 0755); err != nil {
-				return err
-			}
-			file, err = os.Create(filePath)
-			if err != nil {
-				return err
-			}
-			continue
-		}
-
-		chunk := req.GetFileContent()
-		if len(chunk) == 0 {
-			continue
-		}
-		if file == nil {
-			return fmt.Errorf("file info not received")
-		}
-		n, writeErr := file.Write(chunk)
-		if writeErr != nil {
-			return writeErr
-		}
-		bytesWritten += uint64(n)
-	}
-}
-
-func (v *VolumeServer) VolumeEcShardsMount(ctx context.Context, req *volume_server_pb.VolumeEcShardsMountRequest) (*volume_server_pb.VolumeEcShardsMountResponse, error) {
-	v.mu.Lock()
-	v.mountRequests = append(v.mountRequests, req)
-	v.mu.Unlock()
-	return &volume_server_pb.VolumeEcShardsMountResponse{}, nil
-}
-
-func (v *VolumeServer) VolumeEcShardsUnmount(ctx context.Context, req *volume_server_pb.VolumeEcShardsUnmountRequest) (*volume_server_pb.VolumeEcShardsUnmountResponse, error) {
-	v.mu.Lock()
-	v.unmountRequests = append(v.unmountRequests, req)
-	v.mu.Unlock()
-	return &volume_server_pb.VolumeEcShardsUnmountResponse{}, nil
-}
-
-func (v *VolumeServer) VolumeEcShardsCopy(ctx context.Context, req *volume_server_pb.VolumeEcShardsCopyRequest) (*volume_server_pb.VolumeEcShardsCopyResponse, error) {
-	v.mu.Lock()
-	v.copyRequests = append(v.copyRequests, req)
-	v.mu.Unlock()
-	return &volume_server_pb.VolumeEcShardsCopyResponse{}, nil
-}
-
-func (v *VolumeServer) VolumeEcShardsRebuild(ctx context.Context, req *volume_server_pb.VolumeEcShardsRebuildRequest) (*volume_server_pb.VolumeEcShardsRebuildResponse, error) {
-	v.mu.Lock()
-	v.rebuildRequests = append(v.rebuildRequests, req)
-	v.mu.Unlock()
-	return &volume_server_pb.VolumeEcShardsRebuildResponse{}, nil
-}
-
-func (v *VolumeServer) VolumeEcShardsDelete(ctx context.Context, req *volume_server_pb.VolumeEcShardsDeleteRequest) (*volume_server_pb.VolumeEcShardsDeleteResponse, error) {
-	v.mu.Lock()
-	v.ecDeleteRequests = append(v.ecDeleteRequests, req)
-	v.mu.Unlock()
-	return &volume_server_pb.VolumeEcShardsDeleteResponse{}, nil
-}
-
-func (v *VolumeServer) VolumeDelete(ctx context.Context, req *volume_server_pb.VolumeDeleteRequest) (*volume_server_pb.VolumeDeleteResponse, error) {
-	v.mu.Lock()
-	v.deleteRequests = append(v.deleteRequests, req)
-	v.mu.Unlock()
-
-	if req != nil {
-		_ = os.Remove(v.filePath(req.VolumeId, ".dat"))
-		_ = os.Remove(v.filePath(req.VolumeId, ".idx"))
-	}
-
-	return &volume_server_pb.VolumeDeleteResponse{}, nil
-}
-
-func (v *VolumeServer) VolumeMarkReadonly(ctx context.Context, req *volume_server_pb.VolumeMarkReadonlyRequest) (*volume_server_pb.VolumeMarkReadonlyResponse, error) {
-	v.mu.Lock()
-	v.markReadonlyCalls++
-	v.mu.Unlock()
-	return &volume_server_pb.VolumeMarkReadonlyResponse{}, nil
-}
-
-func (v *VolumeServer) VacuumVolumeCheck(ctx context.Context, req *volume_server_pb.VacuumVolumeCheckRequest) (*volume_server_pb.VacuumVolumeCheckResponse, error) {
-	v.mu.Lock()
-	v.vacuumCheckCalls++
-	ratio := v.vacuumGarbageRatio
-	v.mu.Unlock()
-	return &volume_server_pb.VacuumVolumeCheckResponse{GarbageRatio: ratio}, nil
-}
-
-func (v *VolumeServer) VacuumVolumeCompact(req *volume_server_pb.VacuumVolumeCompactRequest, stream volume_server_pb.VolumeServer_VacuumVolumeCompactServer) error {
-	v.mu.Lock()
-	v.vacuumCompactCalls++
-	v.mu.Unlock()
-	return stream.Send(&volume_server_pb.VacuumVolumeCompactResponse{ProcessedBytes: 1024})
-}
-
-func (v *VolumeServer) VacuumVolumeCommit(ctx context.Context, req *volume_server_pb.VacuumVolumeCommitRequest) (*volume_server_pb.VacuumVolumeCommitResponse, error) {
-	v.mu.Lock()
-	v.vacuumCommitCalls++
-	v.mu.Unlock()
-	return &volume_server_pb.VacuumVolumeCommitResponse{}, nil
-}
-
-func (v *VolumeServer) VacuumVolumeCleanup(ctx context.Context, req *volume_server_pb.VacuumVolumeCleanupRequest) (*volume_server_pb.VacuumVolumeCleanupResponse, error) {
-	v.mu.Lock()
-	v.vacuumCleanupCalls++
-	v.mu.Unlock()
-	return &volume_server_pb.VacuumVolumeCleanupResponse{}, nil
-}
-
-func (v *VolumeServer) VolumeCopy(req *volume_server_pb.VolumeCopyRequest, stream volume_server_pb.VolumeServer_VolumeCopyServer) error {
-	v.mu.Lock()
-	v.volumeCopyCalls++
-	v.mu.Unlock()
-
-	if err := stream.Send(&volume_server_pb.VolumeCopyResponse{ProcessedBytes: 1024}); err != nil {
-		return err
-	}
-	return stream.Send(&volume_server_pb.VolumeCopyResponse{LastAppendAtNs: uint64(time.Now().UnixNano())})
-}
-
-func (v *VolumeServer) VolumeMount(ctx context.Context, req *volume_server_pb.VolumeMountRequest) (*volume_server_pb.VolumeMountResponse, error) {
-	v.mu.Lock()
-	v.volumeMountCalls++
-	v.mu.Unlock()
-	return &volume_server_pb.VolumeMountResponse{}, nil
-}
-
-func (v *VolumeServer) VolumeTailReceiver(ctx context.Context, req *volume_server_pb.VolumeTailReceiverRequest) (*volume_server_pb.VolumeTailReceiverResponse, error) {
-	v.mu.Lock()
-	v.tailReceiverCalls++
-	v.mu.Unlock()
-	return &volume_server_pb.VolumeTailReceiverResponse{}, nil
-}

test/plugin_workers/framework.go

@@ -1,171 +0,0 @@
-package pluginworkers
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"testing"
-	"time"
-
-	"github.com/seaweedfs/seaweedfs/weed/admin/plugin"
-	"github.com/seaweedfs/seaweedfs/weed/pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	pluginworker "github.com/seaweedfs/seaweedfs/weed/plugin/worker"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-// HarnessConfig configures the shared plugin worker test harness.
-type HarnessConfig struct {
-	PluginOptions plugin.Options
-	WorkerOptions pluginworker.WorkerOptions
-	Handlers      []pluginworker.JobHandler
-}
-
-// Harness manages an in-process plugin admin server and worker.
-type Harness struct {
-	t *testing.T
-
-	pluginSvc *plugin.Plugin
-
-	adminServer   *grpc.Server
-	adminListener net.Listener
-	adminGrpcAddr string
-
-	worker       *pluginworker.Worker
-	workerCtx    context.Context
-	workerCancel context.CancelFunc
-	workerDone   chan struct{}
-}
-
-// NewHarness starts a plugin admin gRPC server and a worker connected to it.
-func NewHarness(t *testing.T, cfg HarnessConfig) *Harness {
-	t.Helper()
-
-	pluginOpts := cfg.PluginOptions
-	if pluginOpts.DataDir == "" {
-		pluginOpts.DataDir = t.TempDir()
-	}
-
-	pluginSvc, err := plugin.New(pluginOpts)
-	require.NoError(t, err)
-
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	require.NoError(t, err)
-
-	adminServer := pb.NewGrpcServer()
-	plugin_pb.RegisterPluginControlServiceServer(adminServer, pluginSvc)
-	go func() {
-		_ = adminServer.Serve(listener)
-	}()
-
-	adminGrpcAddr := listener.Addr().String()
-	adminPort := listener.Addr().(*net.TCPAddr).Port
-	adminAddr := fmt.Sprintf("127.0.0.1:0.%d", adminPort)
-
-	workerOpts := cfg.WorkerOptions
-	if workerOpts.AdminServer == "" {
-		workerOpts.AdminServer = adminAddr
-	}
-	if workerOpts.GrpcDialOption == nil {
-		workerOpts.GrpcDialOption = grpc.WithTransportCredentials(insecure.NewCredentials())
-	}
-	if workerOpts.WorkerID == "" {
-		workerOpts.WorkerID = "plugin-worker-test"
-	}
-	if workerOpts.WorkerVersion == "" {
-		workerOpts.WorkerVersion = "test"
-	}
-	if workerOpts.WorkerAddress == "" {
-		workerOpts.WorkerAddress = "127.0.0.1"
-	}
-	if len(cfg.Handlers) > 0 {
-		workerOpts.Handlers = cfg.Handlers
-	}
-
-	worker, err := pluginworker.NewWorker(workerOpts)
-	require.NoError(t, err)
-
-	workerCtx, workerCancel := context.WithCancel(context.Background())
-	workerDone := make(chan struct{})
-	go func() {
-		defer close(workerDone)
-		_ = worker.Run(workerCtx)
-	}()
-
-	harness := &Harness{
-		t:             t,
-		pluginSvc:     pluginSvc,
-		adminServer:   adminServer,
-		adminListener: listener,
-		adminGrpcAddr: adminGrpcAddr,
-		worker:        worker,
-		workerCtx:     workerCtx,
-		workerCancel:  workerCancel,
-		workerDone:    workerDone,
-	}
-
-	require.Eventually(t, func() bool {
-		return len(pluginSvc.ListWorkers()) > 0
-	}, 5*time.Second, 50*time.Millisecond)
-
-	t.Cleanup(func() {
-		harness.Shutdown()
-	})
-
-	return harness
-}
-
-// Plugin exposes the underlying admin plugin service.
-func (h *Harness) Plugin() *plugin.Plugin {
-	return h.pluginSvc
-}
-
-// AdminGrpcAddress returns the gRPC address for the admin server.
-func (h *Harness) AdminGrpcAddress() string {
-	return h.adminGrpcAddr
-}
-
-// WaitForJobType waits until a worker with the given capability is registered.
-func (h *Harness) WaitForJobType(jobType string) {
-	h.t.Helper()
-	require.Eventually(h.t, func() bool {
-		workers := h.pluginSvc.ListWorkers()
-		for _, worker := range workers {
-			if worker == nil || worker.Capabilities == nil {
-				continue
-			}
-			if _, ok := worker.Capabilities[jobType]; ok {
-				return true
-			}
-		}
-		return false
-	}, 5*time.Second, 50*time.Millisecond)
-}
-
-// Shutdown stops the worker and admin server.
-func (h *Harness) Shutdown() {
-	if h.workerCancel != nil {
-		h.workerCancel()
-	}
-
-	if h.workerDone != nil {
-		select {
-		case <-h.workerDone:
-		case <-time.After(2 * time.Second):
-		}
-	}
-
-	if h.adminServer != nil {
-		h.adminServer.GracefulStop()
-	}
-
-	if h.adminListener != nil {
-		_ = h.adminListener.Close()
-	}
-
-	if h.pluginSvc != nil {
-		h.pluginSvc.Shutdown()
-	}
-}

test/plugin_workers/vacuum/detection_test.go

@@ -1,104 +0,0 @@
-package vacuum_test
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	pluginworkers "github.com/seaweedfs/seaweedfs/test/plugin_workers"
-	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/worker_pb"
-	pluginworker "github.com/seaweedfs/seaweedfs/weed/plugin/worker"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-	"google.golang.org/protobuf/proto"
-)
-
-func TestVacuumDetectionIntegration(t *testing.T) {
-	volumeID := uint32(101)
-	source := pluginworkers.NewVolumeServer(t, "")
-
-	response := buildVacuumVolumeListResponse(t, source.Address(), volumeID, 0.6)
-	master := pluginworkers.NewMasterServer(t, response)
-
-	dialOption := grpc.WithTransportCredentials(insecure.NewCredentials())
-	handler := pluginworker.NewVacuumHandler(dialOption, 1)
-	harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
-		WorkerOptions: pluginworker.WorkerOptions{
-			GrpcDialOption: dialOption,
-		},
-		Handlers: []pluginworker.JobHandler{handler},
-	})
-	harness.WaitForJobType("vacuum")
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	proposals, err := harness.Plugin().RunDetection(ctx, "vacuum", &plugin_pb.ClusterContext{
-		MasterGrpcAddresses: []string{master.Address()},
-	}, 10)
-	require.NoError(t, err)
-	require.NotEmpty(t, proposals)
-
-	proposal := proposals[0]
-	require.Equal(t, "vacuum", proposal.JobType)
-	paramsValue := proposal.Parameters["task_params_pb"]
-	require.NotNil(t, paramsValue)
-
-	params := &worker_pb.TaskParams{}
-	require.NoError(t, proto.Unmarshal(paramsValue.GetBytesValue(), params))
-	require.NotEmpty(t, params.Sources)
-	require.NotNil(t, params.GetVacuumParams())
-}
-
-func buildVacuumVolumeListResponse(t *testing.T, serverAddress string, volumeID uint32, garbageRatio float64) *master_pb.VolumeListResponse {
-	t.Helper()
-
-	volumeSizeLimitMB := uint64(100)
-	volumeSize := uint64(90) * 1024 * 1024
-	deletedBytes := uint64(float64(volumeSize) * garbageRatio)
-	volumeModifiedAt := time.Now().Add(-48 * time.Hour).Unix()
-
-	diskInfo := &master_pb.DiskInfo{
-		DiskId:         0,
-		MaxVolumeCount: 100,
-		VolumeCount:    1,
-		VolumeInfos: []*master_pb.VolumeInformationMessage{
-			{
-				Id:               volumeID,
-				Collection:       "vac-test",
-				DiskId:           0,
-				Size:             volumeSize,
-				DeletedByteCount: deletedBytes,
-				ModifiedAtSecond: volumeModifiedAt,
-				ReplicaPlacement: 1,
-				ReadOnly:         false,
-			},
-		},
-	}
-
-	node := &master_pb.DataNodeInfo{
-		Id:        serverAddress,
-		Address:   serverAddress,
-		DiskInfos: map[string]*master_pb.DiskInfo{"hdd": diskInfo},
-	}
-
-	return &master_pb.VolumeListResponse{
-		VolumeSizeLimitMb: volumeSizeLimitMB,
-		TopologyInfo: &master_pb.TopologyInfo{
-			DataCenterInfos: []*master_pb.DataCenterInfo{
-				{
-					Id: "dc-1",
-					RackInfos: []*master_pb.RackInfo{
-						{
-							Id:            "rack-1",
-							DataNodeInfos: []*master_pb.DataNodeInfo{node},
-						},
-					},
-				},
-			},
-		},
-	}
-}

test/plugin_workers/vacuum/execution_test.go

@@ -1,62 +0,0 @@
-package vacuum_test
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	pluginworkers "github.com/seaweedfs/seaweedfs/test/plugin_workers"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	pluginworker "github.com/seaweedfs/seaweedfs/weed/plugin/worker"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-func TestVacuumExecutionIntegration(t *testing.T) {
-	volumeID := uint32(202)
-
-	dialOption := grpc.WithTransportCredentials(insecure.NewCredentials())
-	handler := pluginworker.NewVacuumHandler(dialOption, 1)
-	harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
-		WorkerOptions: pluginworker.WorkerOptions{
-			GrpcDialOption: dialOption,
-		},
-		Handlers: []pluginworker.JobHandler{handler},
-	})
-	harness.WaitForJobType("vacuum")
-
-	source := pluginworkers.NewVolumeServer(t, "")
-	source.SetVacuumGarbageRatio(0.6)
-
-	job := &plugin_pb.JobSpec{
-		JobId:   fmt.Sprintf("vacuum-job-%d", volumeID),
-		JobType: "vacuum",
-		Parameters: map[string]*plugin_pb.ConfigValue{
-			"volume_id": {
-				Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: int64(volumeID)},
-			},
-			"server": {
-				Kind: &plugin_pb.ConfigValue_StringValue{StringValue: source.Address()},
-			},
-			"collection": {
-				Kind: &plugin_pb.ConfigValue_StringValue{StringValue: "vac-test"},
-			},
-		},
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	result, err := harness.Plugin().ExecuteJob(ctx, job, nil, 1)
-	require.NoError(t, err)
-	require.NotNil(t, result)
-	require.True(t, result.Success)
-
-	checkCalls, compactCalls, commitCalls, cleanupCalls := source.VacuumStats()
-	require.GreaterOrEqual(t, checkCalls, 2)
-	require.GreaterOrEqual(t, compactCalls, 1)
-	require.GreaterOrEqual(t, commitCalls, 1)
-	require.GreaterOrEqual(t, cleanupCalls, 1)
-}

test/plugin_workers/volume_balance/detection_test.go

@@ -1,129 +0,0 @@
-package volume_balance_test
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	pluginworkers "github.com/seaweedfs/seaweedfs/test/plugin_workers"
-	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/worker_pb"
-	pluginworker "github.com/seaweedfs/seaweedfs/weed/plugin/worker"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-	"google.golang.org/protobuf/proto"
-)
-
-func TestVolumeBalanceDetectionIntegration(t *testing.T) {
-	response := buildBalanceVolumeListResponse(t)
-	master := pluginworkers.NewMasterServer(t, response)
-
-	dialOption := grpc.WithTransportCredentials(insecure.NewCredentials())
-	handler := pluginworker.NewVolumeBalanceHandler(dialOption)
-	harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
-		WorkerOptions: pluginworker.WorkerOptions{
-			GrpcDialOption: dialOption,
-		},
-		Handlers: []pluginworker.JobHandler{handler},
-	})
-	harness.WaitForJobType("volume_balance")
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	proposals, err := harness.Plugin().RunDetection(ctx, "volume_balance", &plugin_pb.ClusterContext{
-		MasterGrpcAddresses: []string{master.Address()},
-	}, 10)
-	require.NoError(t, err)
-	require.Len(t, proposals, 1)
-
-	proposal := proposals[0]
-	require.Equal(t, "volume_balance", proposal.JobType)
-	paramsValue := proposal.Parameters["task_params_pb"]
-	require.NotNil(t, paramsValue)
-
-	params := &worker_pb.TaskParams{}
-	require.NoError(t, proto.Unmarshal(paramsValue.GetBytesValue(), params))
-	require.NotEmpty(t, params.Sources)
-	require.NotEmpty(t, params.Targets)
-}
-
-func buildBalanceVolumeListResponse(t *testing.T) *master_pb.VolumeListResponse {
-	t.Helper()
-
-	volumeSizeLimitMB := uint64(100)
-	volumeModifiedAt := time.Now().Add(-2 * time.Hour).Unix()
-
-	overloadedVolumes := make([]*master_pb.VolumeInformationMessage, 0, 10)
-	for i := 0; i < 10; i++ {
-		volumeID := uint32(1000 + i)
-		overloadedVolumes = append(overloadedVolumes, &master_pb.VolumeInformationMessage{
-			Id:               volumeID,
-			Collection:       "balance",
-			DiskId:           0,
-			Size:             20 * 1024 * 1024,
-			DeletedByteCount: 0,
-			ModifiedAtSecond: volumeModifiedAt,
-			ReplicaPlacement: 1,
-			ReadOnly:         false,
-		})
-	}
-
-	underloadedVolumes := []*master_pb.VolumeInformationMessage{
-		{
-			Id:               2000,
-			Collection:       "balance",
-			DiskId:           0,
-			Size:             20 * 1024 * 1024,
-			DeletedByteCount: 0,
-			ModifiedAtSecond: volumeModifiedAt,
-			ReplicaPlacement: 1,
-			ReadOnly:         false,
-		},
-	}
-
-	overloadedDisk := &master_pb.DiskInfo{
-		DiskId:         0,
-		MaxVolumeCount: 100,
-		VolumeCount:    int64(len(overloadedVolumes)),
-		VolumeInfos:    overloadedVolumes,
-	}
-
-	underloadedDisk := &master_pb.DiskInfo{
-		DiskId:         0,
-		MaxVolumeCount: 100,
-		VolumeCount:    int64(len(underloadedVolumes)),
-		VolumeInfos:    underloadedVolumes,
-	}
-
-	overloadedNode := &master_pb.DataNodeInfo{
-		Id:        "10.0.0.1:8080",
-		Address:   "10.0.0.1:8080",
-		DiskInfos: map[string]*master_pb.DiskInfo{"hdd": overloadedDisk},
-	}
-
-	underloadedNode := &master_pb.DataNodeInfo{
-		Id:        "10.0.0.2:8080",
-		Address:   "10.0.0.2:8080",
-		DiskInfos: map[string]*master_pb.DiskInfo{"hdd": underloadedDisk},
-	}
-
-	rack := &master_pb.RackInfo{
-		Id:            "rack-1",
-		DataNodeInfos: []*master_pb.DataNodeInfo{overloadedNode, underloadedNode},
-	}
-
-	return &master_pb.VolumeListResponse{
-		VolumeSizeLimitMb: volumeSizeLimitMB,
-		TopologyInfo: &master_pb.TopologyInfo{
-			DataCenterInfos: []*master_pb.DataCenterInfo{
-				{
-					Id:        "dc-1",
-					RackInfos: []*master_pb.RackInfo{rack},
-				},
-			},
-		},
-	}
-}

test/plugin_workers/volume_balance/execution_test.go

@@ -1,67 +0,0 @@
-package volume_balance_test
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	pluginworkers "github.com/seaweedfs/seaweedfs/test/plugin_workers"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	pluginworker "github.com/seaweedfs/seaweedfs/weed/plugin/worker"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-func TestVolumeBalanceExecutionIntegration(t *testing.T) {
-	volumeID := uint32(303)
-
-	dialOption := grpc.WithTransportCredentials(insecure.NewCredentials())
-	handler := pluginworker.NewVolumeBalanceHandler(dialOption)
-	harness := pluginworkers.NewHarness(t, pluginworkers.HarnessConfig{
-		WorkerOptions: pluginworker.WorkerOptions{
-			GrpcDialOption: dialOption,
-		},
-		Handlers: []pluginworker.JobHandler{handler},
-	})
-	harness.WaitForJobType("volume_balance")
-
-	source := pluginworkers.NewVolumeServer(t, "")
-	target := pluginworkers.NewVolumeServer(t, "")
-
-	job := &plugin_pb.JobSpec{
-		JobId:   fmt.Sprintf("balance-job-%d", volumeID),
-		JobType: "volume_balance",
-		Parameters: map[string]*plugin_pb.ConfigValue{
-			"volume_id": {
-				Kind: &plugin_pb.ConfigValue_Int64Value{Int64Value: int64(volumeID)},
-			},
-			"collection": {
-				Kind: &plugin_pb.ConfigValue_StringValue{StringValue: "balance"},
-			},
-			"source_server": {
-				Kind: &plugin_pb.ConfigValue_StringValue{StringValue: source.Address()},
-			},
-			"target_server": {
-				Kind: &plugin_pb.ConfigValue_StringValue{StringValue: target.Address()},
-			},
-		},
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	result, err := harness.Plugin().ExecuteJob(ctx, job, nil, 1)
-	require.NoError(t, err)
-	require.NotNil(t, result)
-	require.True(t, result.Success)
-
-	require.GreaterOrEqual(t, source.MarkReadonlyCount(), 1)
-	require.GreaterOrEqual(t, len(source.DeleteRequests()), 1)
-
-	copyCalls, mountCalls, tailCalls := target.BalanceStats()
-	require.GreaterOrEqual(t, copyCalls, 1)
-	require.GreaterOrEqual(t, mountCalls, 1)
-	require.GreaterOrEqual(t, tailCalls, 1)
-}

test/plugin_workers/volume_fixtures.go

@@ -1,49 +0,0 @@
-package pluginworkers
-
-import (
-	"fmt"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/seaweedfs/seaweedfs/weed/storage/types"
-)
-
-// WriteTestVolumeFiles creates a minimal .dat/.idx pair for the given volume.
-func WriteTestVolumeFiles(t *testing.T, baseDir string, volumeID uint32, datSize int) (string, string) {
-	t.Helper()
-
-	if err := os.MkdirAll(baseDir, 0755); err != nil {
-		t.Fatalf("create volume dir: %v", err)
-	}
-
-	datPath := filepath.Join(baseDir, volumeFilename(volumeID, ".dat"))
-	idxPath := filepath.Join(baseDir, volumeFilename(volumeID, ".idx"))
-
-	data := make([]byte, datSize)
-	rng := rand.New(rand.NewSource(99))
-	_, _ = rng.Read(data)
-	if err := os.WriteFile(datPath, data, 0644); err != nil {
-		t.Fatalf("write dat file: %v", err)
-	}
-
-	entry := make([]byte, types.NeedleMapEntrySize)
-	idEnd := types.NeedleIdSize
-	offsetEnd := idEnd + types.OffsetSize
-	sizeEnd := offsetEnd + types.SizeSize
-
-	types.NeedleIdToBytes(entry[:idEnd], types.NeedleId(1))
-	types.OffsetToBytes(entry[idEnd:offsetEnd], types.ToOffset(0))
-	types.SizeToBytes(entry[offsetEnd:sizeEnd], types.Size(datSize))
-
-	if err := os.WriteFile(idxPath, entry, 0644); err != nil {
-		t.Fatalf("write idx file: %v", err)
-	}
-
-	return datPath, idxPath
-}
-
-func volumeFilename(volumeID uint32, ext string) string {
-	return fmt.Sprintf("%d%s", volumeID, ext)
-}

test/postgres/Dockerfile.seaweedfs

@@ -13,9 +13,8 @@ RUN go mod download
 # Copy source code
 COPY . .
 
-# Build the weed binaries without CGO
+# Build the weed binary without CGO
 RUN CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w" -o weed ./weed/
-RUN CGO_ENABLED=0 GOOS=linux go build -ldflags "-s -w" -o weed-db ./cmd/weed-db
 
 # Final stage - minimal runtime image
 FROM alpine:latest
@@ -25,12 +24,11 @@ RUN apk --no-cache add ca-certificates netcat-openbsd curl
 
 WORKDIR /root/
 
-# Copy the binaries from builder stage
+# Copy the weed binary from builder stage
 COPY --from=builder /app/weed .
-COPY --from=builder /app/weed-db .
 
 # Make it executable
-RUN chmod +x ./weed ./weed-db
+RUN chmod +x ./weed
 
 # Expose ports
 EXPOSE 9333 8888 8333 8085 9533 5432

test/postgres/SETUP_OVERVIEW.md

@@ -280,7 +280,7 @@ This test setup proves:
 - Comprehensive error handling
 
 ### ✅ Performance and Scalability
-- Direct SQL engine integration (same as `weed-sql`)
+- Direct SQL engine integration (same as `weed sql`)
 - No translation overhead for real queries
 - Efficient data access from stored formats
 - Scalable architecture with service discovery

test/postgres/client.go

@@ -1,6 +1,3 @@
-//go:build ignore
-// +build ignore
-
 package main
 
 import (
@@ -14,22 +11,9 @@ import (
 	_ "github.com/lib/pq"
 )
 
-const defaultPostgresHost = "postgres-server"
-
-func getEnv(key, def string) string {
-	if value, exists := os.LookupEnv(key); exists {
-		return value
-	}
-	return def
-}
-
 func main() {
-	clientMain()
-}
-
-func clientMain() {
 	// Get PostgreSQL connection details from environment
-	host := getEnv("POSTGRES_HOST", defaultPostgresHost)
+	host := getEnv("POSTGRES_HOST", "localhost")
 	port := getEnv("POSTGRES_PORT", "5432")
 	user := getEnv("POSTGRES_USER", "seaweedfs")
 	dbname := getEnv("POSTGRES_DB", "default")
@@ -118,7 +102,7 @@ func testSystemInfo(db *sql.DB) error {
 	}
 
 	// Use individual connections for each query to avoid protocol issues
-	connStr := getEnv("POSTGRES_HOST", defaultPostgresHost)
+	connStr := getEnv("POSTGRES_HOST", "postgres-server")
 	port := getEnv("POSTGRES_PORT", "5432")
 	user := getEnv("POSTGRES_USER", "seaweedfs")
 	dbname := getEnv("POSTGRES_DB", "logs")
@@ -134,12 +118,12 @@ func testSystemInfo(db *sql.DB) error {
 			log.Printf("  Query '%s' failed to connect: %v", q.query, err)
 			continue
 		}
+		defer tempDB.Close()
 
 		var result string
 		err = tempDB.QueryRow(q.query).Scan(&result)
 		if err != nil {
 			log.Printf("  Query '%s' failed: %v", q.query, err)
-			tempDB.Close()
 			continue
 		}
 		log.Printf("  %s: %s", q.name, result)
@@ -329,7 +313,7 @@ func testDatabaseSwitching(db *sql.DB) error {
 	databases := []string{"analytics", "ecommerce", "logs"}
 
 	// Use fresh connections to avoid protocol issues
-	connStr := getEnv("POSTGRES_HOST", defaultPostgresHost)
+	connStr := getEnv("POSTGRES_HOST", "postgres-server")
 	port := getEnv("POSTGRES_PORT", "5432")
 	user := getEnv("POSTGRES_USER", "seaweedfs")
 
@@ -344,6 +328,7 @@ func testDatabaseSwitching(db *sql.DB) error {
 			log.Printf("  Could not connect to '%s': %v", dbName, err)
 			continue
 		}
+		defer tempDB.Close()
 
 		// Test the connection by executing a simple query
 		var newDB string
@@ -387,7 +372,7 @@ func testSystemColumns(db *sql.DB) error {
 
 		// Use fresh connection to avoid protocol state issues
 		connStr := fmt.Sprintf("host=%s port=%s user=%s dbname=%s sslmode=disable",
-			getEnv("POSTGRES_HOST", defaultPostgresHost),
+			getEnv("POSTGRES_HOST", "postgres-server"),
 			getEnv("POSTGRES_PORT", "5432"),
 			getEnv("POSTGRES_USER", "seaweedfs"),
 			getEnv("POSTGRES_DB", "logs"))
@@ -397,6 +382,7 @@ func testSystemColumns(db *sql.DB) error {
 			log.Printf("    Could not create connection: %v", err)
 			continue
 		}
+		defer tempDB.Close()
 
 		// First check if table exists and has data (safer than COUNT which was causing crashes)
 		rows, err := tempDB.Query(fmt.Sprintf("SELECT id FROM %s LIMIT 1", table))
@@ -458,6 +444,7 @@ func testComplexQueries(db *sql.DB) error {
 			log.Printf("    Could not create connection: %v", err)
 			continue
 		}
+		defer tempDB.Close()
 
 		// Test basic SELECT with LIMIT (avoid COUNT which was causing crashes)
 		rows, err := tempDB.Query(fmt.Sprintf("SELECT id FROM %s LIMIT 5", table))
@@ -482,36 +469,38 @@ func testComplexQueries(db *sql.DB) error {
 			// Test WHERE clause with known ID (safer than arbitrary conditions)
 			testID := ids[0]
 			rows, err = tempDB.Query(fmt.Sprintf("SELECT id FROM %s WHERE id = %d", table, testID))
-			if err != nil {
-				log.Printf("    WHERE query failed: %v", err)
-				tempDB.Close()
-				return fmt.Errorf("WHERE clause test failed for table '%s'", table)
-			}
-
-			foundMatch := false
-			if rows.Next() {
+			if err == nil {
 				var foundID int64
-				if err := rows.Scan(&foundID); err == nil && foundID == testID {
-					log.Printf("    ✓ WHERE clause working: found record with ID %d", foundID)
-					foundMatch = true
+				if rows.Next() {
+					if err := rows.Scan(&foundID); err == nil && foundID == testID {
+						log.Printf("    ✓ WHERE clause working: found record with ID %d", foundID)
+					}
 				}
-			}
-			rows.Close()
-
-			if !foundMatch {
-				tempDB.Close()
-				return fmt.Errorf("WHERE clause test failed: no matching record found for ID %d in table '%s'", testID, table)
+				rows.Close()
 			}
 
 			log.Printf("  ✓ Complex queries test passed for '%s'", table)
 			tempDB.Close()
 			return nil
-		} else {
-			tempDB.Close()
-			return fmt.Errorf("no records found in table '%s' - cannot test WHERE clause", table)
 		}
+
+		tempDB.Close()
 	}
 
 	log.Println("  Complex queries test completed - avoided crash-prone patterns")
 	return nil
 }
+
+func stringOrNull(ns sql.NullString) string {
+	if ns.Valid {
+		return ns.String
+	}
+	return "NULL"
+}
+
+func getEnv(key, defaultValue string) string {
+	if value, exists := os.LookupEnv(key); exists {
+		return value
+	}
+	return defaultValue
+}

test/postgres/docker-compose.yml

@@ -54,7 +54,7 @@ services:
       seaweedfs:
         condition: service_healthy
     command: >
-      ./weed-db
+      ./weed db
       -host=0.0.0.0
       -port=5432
       -master=seaweedfs:9333

test/postgres/producer.go

@@ -322,7 +322,7 @@ func discoverFiler(masterHTTPAddress string) (string, error) {
 
 	// Use the first available filer and convert HTTP address to gRPC
 	filerHTTPAddress := resp.ClusterNodes[0].Address
-	httpAddr = pb.ServerAddress(filerHTTPAddress)
+	httpAddr := pb.ServerAddress(filerHTTPAddress)
 	return httpAddr.ToGrpcAddress(), nil
 }
 

test/s3/iam/s3_iam_admin_test.go

@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -203,116 +202,6 @@ func TestIAMPolicyManagement(t *testing.T) {
 		})
 	})
 
-	t.Run("managed_policy_crud_lifecycle", func(t *testing.T) {
-		policyDoc := `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"s3:GetObject","Resource":"arn:aws:s3:::*"}]}`
-
-		policyNames := []string{"test-managed-policy-lifecycle-a", "test-managed-policy-lifecycle-b"}
-		policyArns := make([]*string, 0, len(policyNames))
-		for _, policyName := range policyNames {
-			createResp, err := iamClient.CreatePolicy(&iam.CreatePolicyInput{
-				PolicyName:     aws.String(policyName),
-				PolicyDocument: aws.String(policyDoc),
-			})
-			require.NoError(t, err)
-			policyArns = append(policyArns, createResp.Policy.Arn)
-		}
-
-		t.Cleanup(func() {
-			for _, policyArn := range policyArns {
-				_, _ = iamClient.DeletePolicy(&iam.DeletePolicyInput{PolicyArn: policyArn})
-			}
-		})
-
-		listResp, err := iamClient.ListPolicies(&iam.ListPoliciesInput{})
-		require.NoError(t, err)
-
-		foundByName := map[string]bool{}
-		for _, policy := range listResp.Policies {
-			if policy.PolicyName != nil {
-				foundByName[*policy.PolicyName] = true
-			}
-		}
-		for _, policyName := range policyNames {
-			assert.True(t, foundByName[policyName], "policy %s should be listed", policyName)
-		}
-
-		getResp, err := iamClient.GetPolicy(&iam.GetPolicyInput{PolicyArn: policyArns[0]})
-		require.NoError(t, err)
-		require.NotNil(t, getResp.Policy)
-		assert.Equal(t, policyNames[0], aws.StringValue(getResp.Policy.PolicyName))
-		assert.Equal(t, aws.StringValue(policyArns[0]), aws.StringValue(getResp.Policy.Arn))
-
-		_, err = iamClient.DeletePolicy(&iam.DeletePolicyInput{PolicyArn: policyArns[0]})
-		require.NoError(t, err)
-
-		_, err = iamClient.GetPolicy(&iam.GetPolicyInput{PolicyArn: policyArns[0]})
-		require.Error(t, err)
-		awsErr, ok := err.(awserr.Error)
-		require.True(t, ok)
-		assert.Equal(t, iam.ErrCodeNoSuchEntityException, awsErr.Code())
-
-		listAfterDeleteResp, err := iamClient.ListPolicies(&iam.ListPoliciesInput{})
-		require.NoError(t, err)
-		deletedPolicyFound := false
-		remainingPolicyFound := false
-		for _, policy := range listAfterDeleteResp.Policies {
-			if policy.PolicyName == nil {
-				continue
-			}
-			if *policy.PolicyName == policyNames[0] {
-				deletedPolicyFound = true
-			}
-			if *policy.PolicyName == policyNames[1] {
-				remainingPolicyFound = true
-			}
-		}
-		assert.False(t, deletedPolicyFound, "deleted policy should no longer be listed")
-		assert.True(t, remainingPolicyFound, "remaining policy should still be listed")
-
-		policyArns[0] = nil
-	})
-
-	t.Run("managed_policy_versions", func(t *testing.T) {
-		policyName := "test-managed-policy-version"
-		policyDoc := `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"s3:ListBucket","Resource":"*"}]}`
-
-		createResp, err := iamClient.CreatePolicy(&iam.CreatePolicyInput{
-			PolicyName:     aws.String(policyName),
-			PolicyDocument: aws.String(policyDoc),
-		})
-		require.NoError(t, err)
-
-		t.Cleanup(func() {
-			_, _ = iamClient.DeletePolicy(&iam.DeletePolicyInput{PolicyArn: createResp.Policy.Arn})
-		})
-
-		listVersionsResp, err := iamClient.ListPolicyVersions(&iam.ListPolicyVersionsInput{
-			PolicyArn: createResp.Policy.Arn,
-		})
-		require.NoError(t, err)
-		require.NotEmpty(t, listVersionsResp.Versions)
-		assert.Equal(t, "v1", aws.StringValue(listVersionsResp.Versions[0].VersionId))
-		assert.Equal(t, true, aws.BoolValue(listVersionsResp.Versions[0].IsDefaultVersion))
-
-		getVersionResp, err := iamClient.GetPolicyVersion(&iam.GetPolicyVersionInput{
-			PolicyArn:  createResp.Policy.Arn,
-			VersionId:  aws.String("v1"),
-		})
-		require.NoError(t, err)
-		require.NotNil(t, getVersionResp.PolicyVersion)
-		assert.Equal(t, "v1", aws.StringValue(getVersionResp.PolicyVersion.VersionId))
-		assert.Contains(t, aws.StringValue(getVersionResp.PolicyVersion.Document), "s3:ListBucket")
-
-		_, err = iamClient.GetPolicyVersion(&iam.GetPolicyVersionInput{
-			PolicyArn: createResp.Policy.Arn,
-			VersionId: aws.String("v2"),
-		})
-		require.Error(t, err)
-		awsErr, ok := err.(awserr.Error)
-		require.True(t, ok)
-		assert.Equal(t, iam.ErrCodeNoSuchEntityException, awsErr.Code())
-	})
-
 	t.Run("user_inline_policy", func(t *testing.T) {
 		userName := "test-user-policy"
 		_, err := iamClient.CreateUser(&iam.CreateUserInput{

test/s3/normal/s3_integration_test.go

@@ -3,8 +3,6 @@ package example
 import (
 	"bytes"
 	"context"
-	"crypto/md5"
-	"encoding/base64"
 	"fmt"
 	"math/rand"
 	"net"
@@ -17,7 +15,6 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/s3"
@@ -71,22 +68,6 @@ func TestS3Integration(t *testing.T) {
 		testPutObject(t, cluster)
 	})
 
-	t.Run("UploadPart", func(t *testing.T) {
-		testPutPartWithChecksum(t, cluster)
-	})
-
-	t.Run("PutObjectWithChecksum", func(t *testing.T) {
-		testPutObjectWithChecksum(t, cluster)
-	})
-
-	t.Run("UploadPartWithChecksum", func(t *testing.T) {
-		testUploadPartWithChecksum(t, cluster)
-	})
-
-	t.Run("PutObjectWithChecksumAndSSEC", func(t *testing.T) {
-		testPutObjectWithChecksumAndSSEC(t, cluster)
-	})
-
 	t.Run("GetObject", func(t *testing.T) {
 		testGetObject(t, cluster)
 	})
@@ -116,9 +97,8 @@ func findAvailablePort() (int, error) {
 	return addr.Port, nil
 }
 
-// startMiniCluster starts a weed mini instance directly without exec.
-// Extra flags (e.g. "-s3.allowDeleteBucketNotEmpty=false") can be appended via extraArgs.
-func startMiniCluster(t *testing.T, extraArgs ...string) (*TestCluster, error) {
+// startMiniCluster starts a weed mini instance directly without exec
+func startMiniCluster(t *testing.T) (*TestCluster, error) {
 	// Find available ports
 	masterPort, err := findAvailablePort()
 	if err != nil {
@@ -193,7 +173,7 @@ func startMiniCluster(t *testing.T, extraArgs ...string) (*TestCluster, error) {
 		// Configure args for mini command
 		// Note: When running via 'go test', os.Args[0] is the test binary
 		// We need to make it look like we're running 'weed mini'
-		os.Args = append([]string{
+		os.Args = []string{
 			"weed",
 			"-dir=" + testDir,
 			"-master.port=" + strconv.Itoa(masterPort),
@@ -206,7 +186,7 @@ func startMiniCluster(t *testing.T, extraArgs ...string) (*TestCluster, error) {
 			"-ip=127.0.0.1",
 			"-master.peers=none",     // Faster startup
 			"-s3.iam.readOnly=false", // Enable IAM write operations for tests
-		}, extraArgs...)
+		}
 
 		// Suppress most logging during tests
 		glog.MaxSize = 1024 * 1024
@@ -364,282 +344,6 @@ func testPutObject(t *testing.T, cluster *TestCluster) {
 	t.Logf("✓ Put object: %s/%s (%d bytes)", bucketName, objectKey, len(objectData))
 }
 
-func createTestBucket(t *testing.T, cluster *TestCluster, prefix string) string {
-	bucketName := prefix + randomString(8)
-	_, err := cluster.s3Client.CreateBucket(&s3.CreateBucketInput{
-		Bucket: aws.String(bucketName),
-	})
-	require.NoError(t, err)
-	time.Sleep(100 * time.Millisecond)
-	return bucketName
-}
-
-// generateSSECKey returns a 32-byte key as a raw string (what the SDK expects
-// for SSECustomerKey) and its base64-encoded MD5 (for SSECustomerKeyMD5).
-func generateSSECKey() (keyRaw, keyMD5B64 string) {
-	rng := rand.New(rand.NewSource(time.Now().UnixNano()))
-	key := make([]byte, 32)
-	for i := range key {
-		key[i] = byte(rng.Intn(256))
-	}
-	keyRaw = string(key)
-	keyHash := md5.Sum(key)
-	keyMD5B64 = base64.StdEncoding.EncodeToString(keyHash[:])
-	return
-}
-
-func testPutObjectWithChecksum(t *testing.T, cluster *TestCluster) {
-	bucketName := createTestBucket(t, cluster, "test-put-checksum-")
-	objectKey := "test-checksummed-object.txt"
-	objectData := "Hello, SeaweedFS S3!"
-
-	correctMD5 := calculateMd5(objectData)
-	incorrectMD5 := calculateMd5(objectData + "incorrect")
-
-	// Put object with incorrect MD5 should be rejected
-	_, err := cluster.s3Client.PutObject(&s3.PutObjectInput{
-		Bucket:     aws.String(bucketName),
-		Key:        aws.String(objectKey),
-		Body:       bytes.NewReader([]byte(objectData)),
-		ContentMD5: aws.String(incorrectMD5),
-	})
-	assertBadDigestError(t, err, "PutObject should fail with incorrect MD5")
-
-	t.Logf("✓ Put object with incorrect MD5 rejected: %s/%s", bucketName, objectKey)
-
-	// Put object with correct MD5 should succeed
-	_, err = cluster.s3Client.PutObject(&s3.PutObjectInput{
-		Bucket:     aws.String(bucketName),
-		Key:        aws.String(objectKey),
-		Body:       bytes.NewReader([]byte(objectData)),
-		ContentMD5: aws.String(correctMD5),
-	})
-	require.NoError(t, err, "Failed to put object")
-
-	// Verify object exists
-	headResp, err := cluster.s3Client.HeadObject(&s3.HeadObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, headResp.ContentLength)
-	assert.Equal(t, int64(len(objectData)), aws.Int64Value(headResp.ContentLength))
-
-	t.Logf("✓ Put object with correct MD5: %s/%s (%d bytes)", bucketName, objectKey, len(objectData))
-}
-
-// putObjectSSEC sends a PutObject request with SSE-C headers over HTTP.
-// The AWS SDK v1 refuses to send SSE-C keys over plain HTTP, so we use the
-// low-level Request API and clear the Validate handlers to bypass that check.
-// We use Clear() because the specific validator is internal and not easily removable by name.
-func putObjectSSEC(client *s3.S3, input *s3.PutObjectInput) (*s3.PutObjectOutput, error) {
-	req, output := client.PutObjectRequest(input)
-	req.Handlers.Validate.Clear()
-	err := req.Send()
-	return output, err
-}
-
-func headObjectSSEC(client *s3.S3, input *s3.HeadObjectInput) (*s3.HeadObjectOutput, error) {
-	req, output := client.HeadObjectRequest(input)
-	req.Handlers.Validate.Clear()
-	err := req.Send()
-	return output, err
-}
-
-func testPutObjectWithChecksumAndSSEC(t *testing.T, cluster *TestCluster) {
-	bucketName := createTestBucket(t, cluster, "test-put-checksum-ssec-")
-	objectKey := "test-checksummed-ssec-object.txt"
-	objectData := "Hello, SeaweedFS S3 with SSE-C!"
-
-	correctMD5 := calculateMd5(objectData)
-	incorrectMD5 := calculateMd5(objectData + "incorrect")
-	keyRaw, keyMD5B64 := generateSSECKey()
-
-	// Put object with SSE-C and incorrect MD5 should be rejected
-	_, err := putObjectSSEC(cluster.s3Client, &s3.PutObjectInput{
-		Bucket:               aws.String(bucketName),
-		Key:                  aws.String(objectKey),
-		Body:                 bytes.NewReader([]byte(objectData)),
-		ContentMD5:           aws.String(incorrectMD5),
-		SSECustomerAlgorithm: aws.String("AES256"),
-		SSECustomerKey:       aws.String(keyRaw),
-		SSECustomerKeyMD5:    aws.String(keyMD5B64),
-	})
-	assertBadDigestError(t, err, "PutObject with SSE-C should fail with incorrect MD5")
-
-	t.Logf("Put object with SSE-C and incorrect MD5 rejected: %s/%s", bucketName, objectKey)
-
-	// Put object with SSE-C and correct MD5 should succeed
-	_, err = putObjectSSEC(cluster.s3Client, &s3.PutObjectInput{
-		Bucket:               aws.String(bucketName),
-		Key:                  aws.String(objectKey),
-		Body:                 bytes.NewReader([]byte(objectData)),
-		ContentMD5:           aws.String(correctMD5),
-		SSECustomerAlgorithm: aws.String("AES256"),
-		SSECustomerKey:       aws.String(keyRaw),
-		SSECustomerKeyMD5:    aws.String(keyMD5B64),
-	})
-	require.NoError(t, err, "Failed to put object with SSE-C and correct MD5")
-
-	// Verify object exists (SSE-C requires the key for HeadObject too)
-	headResp, err := headObjectSSEC(cluster.s3Client, &s3.HeadObjectInput{
-		Bucket:               aws.String(bucketName),
-		Key:                  aws.String(objectKey),
-		SSECustomerAlgorithm: aws.String("AES256"),
-		SSECustomerKey:       aws.String(keyRaw),
-		SSECustomerKeyMD5:    aws.String(keyMD5B64),
-	})
-	require.NoError(t, err)
-	assert.NotNil(t, headResp.ContentLength)
-	assert.Equal(t, int64(len(objectData)), aws.Int64Value(headResp.ContentLength))
-
-	t.Logf("Put object with SSE-C and correct MD5: %s/%s (%d bytes)", bucketName, objectKey, len(objectData))
-}
-
-func testUploadPartWithChecksum(t *testing.T, cluster *TestCluster) {
-	bucketName := createTestBucket(t, cluster, "test-upload-part-checksum-")
-	objectKey := "test-multipart-checksum.txt"
-	objectData := "Hello, SeaweedFS S3 Multipart!"
-
-	// Initiate multipart upload
-	initResp, err := cluster.s3Client.CreateMultipartUpload(&s3.CreateMultipartUploadInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err)
-	uploadID := initResp.UploadId
-
-	correctMD5 := calculateMd5(objectData)
-	incorrectMD5 := calculateMd5(objectData + "incorrect")
-
-	// Upload part with incorrect MD5
-	_, err = cluster.s3Client.UploadPart(&s3.UploadPartInput{
-		Bucket:     aws.String(bucketName),
-		Key:        aws.String(objectKey),
-		PartNumber: aws.Int64(1),
-		UploadId:   uploadID,
-		Body:       bytes.NewReader([]byte(objectData)),
-		ContentMD5: aws.String(incorrectMD5),
-	})
-	assertBadDigestError(t, err, "UploadPart should fail with incorrect MD5")
-
-	// Upload part with correct MD5
-	partResp, err := cluster.s3Client.UploadPart(&s3.UploadPartInput{
-		Bucket:     aws.String(bucketName),
-		Key:        aws.String(objectKey),
-		PartNumber: aws.Int64(1),
-		UploadId:   uploadID,
-		Body:       bytes.NewReader([]byte(objectData)),
-		ContentMD5: aws.String(correctMD5),
-	})
-	require.NoError(t, err, "Failed to upload part with correct MD5")
-
-	// Complete multipart upload
-	_, err = cluster.s3Client.CompleteMultipartUpload(&s3.CompleteMultipartUploadInput{
-		Bucket:   aws.String(bucketName),
-		Key:      aws.String(objectKey),
-		UploadId: uploadID,
-		MultipartUpload: &s3.CompletedMultipartUpload{
-			Parts: []*s3.CompletedPart{
-				{
-					ETag:       partResp.ETag,
-					PartNumber: aws.Int64(1),
-				},
-			},
-		},
-	})
-	require.NoError(t, err, "Failed to complete multipart upload")
-
-	// Verify object exists
-	headResp, err := cluster.s3Client.HeadObject(&s3.HeadObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err)
-	assert.Equal(t, int64(len(objectData)), aws.Int64Value(headResp.ContentLength))
-
-	t.Logf("✓ Multipart upload with checksum successful: %s/%s", bucketName, objectKey)
-}
-
-func testPutPartWithChecksum(t *testing.T, cluster *TestCluster) {
-	bucketName := createTestBucket(t, cluster, "test-put-checksum-")
-	objectKey := "test-checksummed-part.txt"
-
-	partData := "Hello, SeaweedFS S3!"
-
-	correctMD5 := calculateMd5(partData)
-	incorrectMD5 := calculateMd5(partData + "incorrect")
-
-	createResp, err := cluster.s3Client.CreateMultipartUpload(&s3.CreateMultipartUploadInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err)
-
-	uploadID := createResp.UploadId
-
-	partBody := []byte(partData)
-
-	_, err = cluster.s3Client.UploadPart(&s3.UploadPartInput{
-		Bucket:     aws.String(bucketName),
-		Key:        aws.String(objectKey),
-		UploadId:   uploadID,
-		PartNumber: aws.Int64(1),
-		Body:       bytes.NewReader(partBody),
-		ContentMD5: aws.String(incorrectMD5),
-	})
-	assertBadDigestError(t, err, "UploadPart should fail with incorrect MD5")
-
-	uploadResp, err := cluster.s3Client.UploadPart(&s3.UploadPartInput{
-		Bucket:     aws.String(bucketName),
-		Key:        aws.String(objectKey),
-		UploadId:   uploadID,
-		PartNumber: aws.Int64(1),
-		Body:       bytes.NewReader(partBody),
-		ContentMD5: aws.String(correctMD5),
-	})
-	require.NoError(t, err)
-
-	_, err = cluster.s3Client.CompleteMultipartUpload(&s3.CompleteMultipartUploadInput{
-		Bucket:   aws.String(bucketName),
-		Key:      aws.String(objectKey),
-		UploadId: uploadID,
-		MultipartUpload: &s3.CompletedMultipartUpload{
-			Parts: []*s3.CompletedPart{
-				{
-					ETag:       uploadResp.ETag,
-					PartNumber: aws.Int64(1),
-				},
-			},
-		},
-	})
-	require.NoError(t, err, "Failed to complete multipart upload")
-
-	// Verify object exists
-	headResp, err := cluster.s3Client.HeadObject(&s3.HeadObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err)
-	assert.Equal(t, int64(len(partData)), aws.Int64Value(headResp.ContentLength))
-
-	t.Logf("✓ UploadPart with MD5 validation: %s/%s", bucketName, objectKey)
-}
-
-func calculateMd5(objectData string) string {
-	dataBytes := []byte(objectData)
-	hash := md5.Sum(dataBytes)
-	return base64.StdEncoding.EncodeToString(hash[:])
-}
-
-func assertBadDigestError(t *testing.T, err error, description string) {
-	require.Error(t, err, description)
-
-	var awsErr awserr.Error
-	require.ErrorAs(t, err, &awsErr)
-	assert.Equal(t, "BadDigest", awsErr.Code())
-}
-
 func testGetObject(t *testing.T, cluster *TestCluster) {
 	bucketName := "test-get-" + randomString(8)
 	objectKey := "test-data.txt"
@@ -780,49 +484,6 @@ func testDeleteBucket(t *testing.T, cluster *TestCluster) {
 	t.Logf("✓ Deleted bucket: %s", bucketName)
 }
 
-func TestS3DeleteBucketNotEmpty(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	cluster, err := startMiniCluster(t, "-s3.allowDeleteBucketNotEmpty=false")
-	require.NoError(t, err)
-	defer cluster.Stop()
-
-	t.Run("DeleteNonEmptyBucketFails", func(t *testing.T) {
-		bucketName := createTestBucket(t, cluster, "test-notempty-")
-		objectKey := "keep-me.txt"
-
-		// Put an object so the bucket is non-empty
-		_, err := cluster.s3Client.PutObject(&s3.PutObjectInput{
-			Bucket: aws.String(bucketName),
-			Key:    aws.String(objectKey),
-			Body:   bytes.NewReader([]byte("data")),
-		})
-		require.NoError(t, err)
-
-		// Attempt to delete the non-empty bucket — must fail with BucketNotEmpty (409)
-		_, err = cluster.s3Client.DeleteBucket(&s3.DeleteBucketInput{
-			Bucket: aws.String(bucketName),
-		})
-		require.Error(t, err, "deleting a non-empty bucket should fail")
-		var awsErr awserr.Error
-		require.ErrorAs(t, err, &awsErr)
-		assert.Equal(t, "BucketNotEmpty", awsErr.Code(),
-			"expected BucketNotEmpty error code, got %s: %s", awsErr.Code(), awsErr.Message())
-	})
-
-	t.Run("DeleteEmptyBucketSucceeds", func(t *testing.T) {
-		bucketName := createTestBucket(t, cluster, "test-empty-")
-
-		// Delete the empty bucket — should succeed even with the flag
-		_, err := cluster.s3Client.DeleteBucket(&s3.DeleteBucketInput{
-			Bucket: aws.String(bucketName),
-		})
-		require.NoError(t, err, "deleting an empty bucket should succeed")
-	})
-}
-
 // randomString generates a random string for unique naming
 func randomString(length int) string {
 	const charset = "abcdefghijklmnopqrstuvwxyz0123456789"

test/s3/policy/policy_test.go

@@ -2,7 +2,6 @@ package policy
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net"
 	"net/http"
@@ -15,12 +14,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/iam"
-	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/seaweedfs/seaweedfs/weed/command"
 	"github.com/seaweedfs/seaweedfs/weed/glog"
 	"github.com/seaweedfs/seaweedfs/weed/pb"
@@ -137,291 +130,6 @@ func TestS3PolicyShellRevised(t *testing.T) {
 	}
 }
 
-func TestS3IAMAttachDetachUserPolicy(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	cluster, err := startMiniCluster(t)
-	require.NoError(t, err)
-	defer cluster.Stop()
-
-	time.Sleep(500 * time.Millisecond)
-
-	policyName := uniqueName("managed-policy")
-	policyArn := fmt.Sprintf("arn:aws:iam:::policy/%s", policyName)
-	policyContent := `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"*","Resource":"*"}]}`
-	tmpPolicyFile, err := os.CreateTemp("", "test_policy_attach_*.json")
-	require.NoError(t, err)
-	defer os.Remove(tmpPolicyFile.Name())
-	_, err = tmpPolicyFile.WriteString(policyContent)
-	require.NoError(t, err)
-	require.NoError(t, tmpPolicyFile.Close())
-
-	weedCmd := "weed"
-	masterAddr := string(pb.NewServerAddress("127.0.0.1", cluster.masterPort, cluster.masterGrpcPort))
-	filerAddr := string(pb.NewServerAddress("127.0.0.1", cluster.filerPort, cluster.filerGrpcPort))
-	execShell(t, weedCmd, masterAddr, filerAddr, fmt.Sprintf("s3.policy -put -name=%s -file=%s", policyName, tmpPolicyFile.Name()))
-
-	iamClient := newIAMClient(t, cluster.s3Endpoint)
-
-	userName := uniqueName("iam-user")
-	_, err = iamClient.CreateUser(&iam.CreateUserInput{UserName: aws.String(userName)})
-	require.NoError(t, err)
-
-	_, err = iamClient.AttachUserPolicy(&iam.AttachUserPolicyInput{
-		UserName:  aws.String(userName),
-		PolicyArn: aws.String(policyArn),
-	})
-	require.NoError(t, err)
-
-	listOut, err := iamClient.ListAttachedUserPolicies(&iam.ListAttachedUserPoliciesInput{
-		UserName: aws.String(userName),
-	})
-	require.NoError(t, err)
-	require.True(t, attachedPolicyContains(listOut.AttachedPolicies, policyName))
-
-	_, err = iamClient.DetachUserPolicy(&iam.DetachUserPolicyInput{
-		UserName:  aws.String(userName),
-		PolicyArn: aws.String(policyArn),
-	})
-	require.NoError(t, err)
-
-	listOut, err = iamClient.ListAttachedUserPolicies(&iam.ListAttachedUserPoliciesInput{
-		UserName: aws.String(userName),
-	})
-	require.NoError(t, err)
-	require.False(t, attachedPolicyContains(listOut.AttachedPolicies, policyName))
-
-	_, err = iamClient.AttachUserPolicy(&iam.AttachUserPolicyInput{
-		UserName:  aws.String(userName),
-		PolicyArn: aws.String("arn:aws:iam:::policy/does-not-exist"),
-	})
-	require.Error(t, err)
-	if awsErr, ok := err.(awserr.Error); ok {
-		require.Equal(t, iam.ErrCodeNoSuchEntityException, awsErr.Code())
-	}
-}
-
-func TestS3IAMListPoliciesAndGetPolicy(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	cluster, err := startMiniCluster(t)
-	require.NoError(t, err)
-	defer cluster.Stop()
-
-	time.Sleep(500 * time.Millisecond)
-
-	policyName := uniqueName("managed-policy")
-	policyArn := fmt.Sprintf("arn:aws:iam:::policy/%s", policyName)
-	policyContent := `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"s3:ListAllMyBuckets","Resource":"*"}]}`
-
-	iamClient := newIAMClient(t, cluster.s3Endpoint)
-	_, err = iamClient.CreatePolicy(&iam.CreatePolicyInput{
-		PolicyName:     aws.String(policyName),
-		PolicyDocument: aws.String(policyContent),
-	})
-	require.NoError(t, err)
-
-	listOut, err := iamClient.ListPolicies(&iam.ListPoliciesInput{})
-	require.NoError(t, err)
-	require.True(t, managedPolicyContains(listOut.Policies, policyName))
-
-	getOut, err := iamClient.GetPolicy(&iam.GetPolicyInput{PolicyArn: aws.String(policyArn)})
-	require.NoError(t, err)
-	require.NotNil(t, getOut.Policy)
-	require.NotNil(t, getOut.Policy.PolicyName)
-	require.Equal(t, policyName, *getOut.Policy.PolicyName)
-
-	missingArn := fmt.Sprintf("arn:aws:iam:::policy/%s", uniqueName("missing"))
-	_, err = iamClient.GetPolicy(&iam.GetPolicyInput{PolicyArn: aws.String(missingArn)})
-	require.Error(t, err)
-	var awsErr awserr.Error
-	require.True(t, errors.As(err, &awsErr))
-	require.Equal(t, iam.ErrCodeNoSuchEntityException, awsErr.Code())
-}
-
-func TestS3IAMDeletePolicyInUse(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	cluster, err := startMiniCluster(t)
-	require.NoError(t, err)
-	defer cluster.Stop()
-
-	time.Sleep(500 * time.Millisecond)
-
-	policyName := uniqueName("managed-delete-policy")
-	policyArn := fmt.Sprintf("arn:aws:iam:::policy/%s", policyName)
-	policyContent := `{"Version":"2012-10-17","Statement":[{"Effect":"Allow","Action":"s3:*","Resource":"*"}]}`
-
-	iamClient := newIAMClient(t, cluster.s3Endpoint)
-	_, err = iamClient.CreatePolicy(&iam.CreatePolicyInput{
-		PolicyName:     aws.String(policyName),
-		PolicyDocument: aws.String(policyContent),
-	})
-	require.NoError(t, err)
-
-	userName := uniqueName("iam-user-delete-policy")
-	_, err = iamClient.CreateUser(&iam.CreateUserInput{UserName: aws.String(userName)})
-	require.NoError(t, err)
-
-	_, err = iamClient.AttachUserPolicy(&iam.AttachUserPolicyInput{
-		UserName:  aws.String(userName),
-		PolicyArn: aws.String(policyArn),
-	})
-	require.NoError(t, err)
-
-	_, err = iamClient.DeletePolicy(&iam.DeletePolicyInput{PolicyArn: aws.String(policyArn)})
-	require.Error(t, err)
-	var awsErr awserr.Error
-	require.True(t, errors.As(err, &awsErr))
-	require.Equal(t, iam.ErrCodeDeleteConflictException, awsErr.Code())
-}
-
-func TestS3MultipartOperationsInheritPutObjectPermissions(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping integration test in short mode")
-	}
-
-	cluster, err := startMiniCluster(t)
-	require.NoError(t, err)
-	defer cluster.Stop()
-
-	time.Sleep(500 * time.Millisecond)
-
-	// Create a policy with only s3:PutObject permission
-	// This should implicitly allow multipart upload operations (CreateMultipartUpload,
-	// UploadPart, CompleteMultipartUpload, AbortMultipartUpload, ListBucketMultipartUploads, ListMultipartUploadParts)
-	policyName := uniqueName("putobject-policy")
-	policyArn := fmt.Sprintf("arn:aws:iam:::policy/%s", policyName)
-	policyContent := `{
-		"Version":"2012-10-17",
-		"Statement":[{
-			"Effect":"Allow",
-			"Action":"s3:PutObject",
-			"Resource":"*"
-		}]
-	}`
-
-	iamClient := newIAMClient(t, cluster.s3Endpoint)
-	_, err = iamClient.CreatePolicy(&iam.CreatePolicyInput{
-		PolicyName:     aws.String(policyName),
-		PolicyDocument: aws.String(policyContent),
-	})
-	require.NoError(t, err)
-
-	// Create a user and attach the policy
-	userName := uniqueName("multipart-user")
-	_, err = iamClient.CreateUser(&iam.CreateUserInput{UserName: aws.String(userName)})
-	require.NoError(t, err)
-
-	_, err = iamClient.CreateAccessKey(&iam.CreateAccessKeyInput{UserName: aws.String(userName)})
-	require.NoError(t, err)
-
-	_, err = iamClient.AttachUserPolicy(&iam.AttachUserPolicyInput{
-		UserName:  aws.String(userName),
-		PolicyArn: aws.String(policyArn),
-	})
-	require.NoError(t, err)
-
-	// Create S3 client with user credentials (using admin credentials for now, test will still validate permissions)
-	// In a real scenario, we'd use the user's access key
-	sess, err := session.NewSession(&aws.Config{
-		Region:           aws.String("us-east-1"),
-		Endpoint:         aws.String(cluster.s3Endpoint),
-		DisableSSL:       aws.Bool(true),
-		S3ForcePathStyle: aws.Bool(true),
-		Credentials:      credentials.NewStaticCredentials("admin", "admin", ""),
-	})
-	require.NoError(t, err)
-
-	s3Client := newS3Client(sess)
-
-	bucketName := uniqueName("multipart-test-bucket")
-	objectKey := "test-object"
-
-	// Create bucket
-	_, err = s3Client.CreateBucket(&s3.CreateBucketInput{Bucket: aws.String(bucketName)})
-	require.NoError(t, err)
-
-	// Test multipart upload operations with s3:PutObject permission
-	// These operations should all succeed since multipart operations are part of s3:PutObject
-
-	// 1. CreateMultipartUpload
-	createOut, err := s3Client.CreateMultipartUpload(&s3.CreateMultipartUploadInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	})
-	require.NoError(t, err)
-	require.NotNil(t, createOut.UploadId)
-	uploadID := *createOut.UploadId
-
-	// 2. UploadPart
-	partBody := "test part data"
-	uploadPartOut, err := s3Client.UploadPart(&s3.UploadPartInput{
-		Bucket:     aws.String(bucketName),
-		Key:        aws.String(objectKey),
-		PartNumber: aws.Int64(1),
-		UploadId:   aws.String(uploadID),
-		Body:       strings.NewReader(partBody),
-	})
-	require.NoError(t, err)
-	require.NotNil(t, uploadPartOut.ETag)
-
-	// 3. ListParts
-	listPartsOut, err := s3Client.ListParts(&s3.ListPartsInput{
-		Bucket:   aws.String(bucketName),
-		Key:      aws.String(objectKey),
-		UploadId: aws.String(uploadID),
-	})
-	require.NoError(t, err)
-	require.Equal(t, 1, len(listPartsOut.Parts))
-
-	// 4. CompleteMultipartUpload
-	completeOut, err := s3Client.CompleteMultipartUpload(&s3.CompleteMultipartUploadInput{
-		Bucket:   aws.String(bucketName),
-		Key:      aws.String(objectKey),
-		UploadId: aws.String(uploadID),
-		MultipartUpload: &s3.CompletedMultipartUpload{
-			Parts: []*s3.CompletedPart{
-				{
-					ETag:       uploadPartOut.ETag,
-					PartNumber: aws.Int64(1),
-				},
-			},
-		},
-	})
-	require.NoError(t, err)
-	require.NotNil(t, completeOut.ETag)
-
-	// Test AbortMultipartUpload with a new upload
-	createOut2, err := s3Client.CreateMultipartUpload(&s3.CreateMultipartUploadInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey + "-abort"),
-	})
-	require.NoError(t, err)
-	uploadID2 := *createOut2.UploadId
-
-	_, err = s3Client.AbortMultipartUpload(&s3.AbortMultipartUploadInput{
-		Bucket:   aws.String(bucketName),
-		Key:      aws.String(objectKey + "-abort"),
-		UploadId: aws.String(uploadID2),
-	})
-	require.NoError(t, err)
-
-	// Test ListMultipartUploads
-	listUploadsOut, err := s3Client.ListMultipartUploads(&s3.ListMultipartUploadsInput{
-		Bucket: aws.String(bucketName),
-	})
-	require.NoError(t, err)
-	// After aborting, there should be no active uploads
-	require.Equal(t, 0, len(listUploadsOut.Uploads))
-}
-
 func execShell(t *testing.T, weedCmd, master, filer, shellCmd string) string {
 	// weed shell -master=... -filer=...
 	args := []string{"shell", "-master=" + master, "-filer=" + filer}
@@ -437,56 +145,6 @@ func execShell(t *testing.T, weedCmd, master, filer, shellCmd string) string {
 	return string(out)
 }
 
-func newIAMClient(t *testing.T, endpoint string) *iam.IAM {
-	t.Helper()
-
-	accessKey := os.Getenv("AWS_ACCESS_KEY_ID")
-	secretKey := os.Getenv("AWS_SECRET_ACCESS_KEY")
-	if accessKey == "" {
-		accessKey = "admin"
-	}
-	if secretKey == "" {
-		secretKey = "admin"
-	}
-
-	sess, err := session.NewSession(&aws.Config{
-		Region:           aws.String("us-east-1"),
-		Endpoint:         aws.String(endpoint),
-		DisableSSL:       aws.Bool(true),
-		S3ForcePathStyle: aws.Bool(true),
-		Credentials:      credentials.NewStaticCredentials(accessKey, secretKey, ""),
-	})
-	require.NoError(t, err)
-
-	return iam.New(sess)
-}
-
-func newS3Client(sess *session.Session) *s3.S3 {
-	return s3.New(sess)
-}
-
-func attachedPolicyContains(policies []*iam.AttachedPolicy, policyName string) bool {
-	for _, policy := range policies {
-		if policy.PolicyName != nil && *policy.PolicyName == policyName {
-			return true
-		}
-	}
-	return false
-}
-
-func managedPolicyContains(policies []*iam.Policy, policyName string) bool {
-	for _, policy := range policies {
-		if policy.PolicyName != nil && *policy.PolicyName == policyName {
-			return true
-		}
-	}
-	return false
-}
-
-func uniqueName(prefix string) string {
-	return fmt.Sprintf("%s-%s", prefix, strconv.FormatInt(time.Now().UnixNano(), 36))
-}
-
 // --- Test setup helpers ---
 
 func findAvailablePort() (int, error) {
@@ -592,7 +250,6 @@ enabled = true
 			"-master.volumeSizeLimitMB=32",
 			"-ip=127.0.0.1",
 			"-master.peers=none",
-			"-s3.iam.readOnly=false",
 		}
 		glog.MaxSize = 1024 * 1024
 		for _, cmd := range command.Commands {

test/s3/sse/s3_volume_encryption_test.go

@@ -1,4 +1,5 @@
 //go:build integration
+// +build integration
 
 package sse
 

test/s3tables/catalog/iceberg_catalog_test.go

@@ -6,7 +6,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"flag"
 	"fmt"
 	"io"
 	"net"
@@ -19,37 +18,6 @@ import (
 	"time"
 )
 
-// sharedEnv is the single TestEnvironment shared across all tests in this package.
-var sharedEnv *TestEnvironment
-
-// TestMain starts one weed mini instance for the whole package and tears it down
-// after all tests have run.
-func TestMain(m *testing.M) {
-	flag.Parse()
-	if os.Getenv("SHORT") != "" || testing.Short() {
-		// Let tests self-skip when run with -short.
-		os.Exit(m.Run())
-	}
-
-	env, err := newTestEnvironmentForMain()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "SKIP: setup failed: %v\n", err)
-		os.Exit(0) // Skip all tests rather than fail
-	}
-	sharedEnv = env
-
-	if startErr := sharedEnv.startSeaweedFSForMain(); startErr != nil {
-		fmt.Fprintf(os.Stderr, "SKIP: weed mini failed to start: %v\n", startErr)
-		sharedEnv.cleanupForMain()
-		os.Exit(0)
-	}
-
-	code := m.Run()
-
-	sharedEnv.cleanupForMain()
-	os.Exit(code)
-}
-
 // TestEnvironment contains the test environment configuration
 type TestEnvironment struct {
 	seaweedDir      string
@@ -86,15 +54,17 @@ func getFreePort() (int, net.Listener, error) {
 	return addr.Port, listener, nil
 }
 
-// newTestEnvironmentForMain creates a TestEnvironment without calling t.Fatalf so it
-// can be used from TestMain (which has no *testing.T).
-func newTestEnvironmentForMain() (*TestEnvironment, error) {
+// NewTestEnvironment creates a new test environment
+func NewTestEnvironment(t *testing.T) *TestEnvironment {
+	t.Helper()
+
 	// Find the SeaweedFS root directory
 	wd, err := os.Getwd()
 	if err != nil {
-		return nil, fmt.Errorf("get working directory: %w", err)
+		t.Fatalf("Failed to get working directory: %v", err)
 	}
 
+	// Navigate up to find the SeaweedFS root (contains go.mod)
 	seaweedDir := wd
 	for i := 0; i < 5; i++ {
 		if _, err := os.Stat(filepath.Join(seaweedDir, "go.mod")); err == nil {
@@ -106,93 +76,82 @@ func newTestEnvironmentForMain() (*TestEnvironment, error) {
 	// Check for weed binary
 	weedBinary := filepath.Join(seaweedDir, "weed", "weed")
 	if _, err := os.Stat(weedBinary); os.IsNotExist(err) {
+		// Try system PATH
 		weedBinary = "weed"
 		if _, err := exec.LookPath(weedBinary); err != nil {
-			return nil, fmt.Errorf("weed binary not found")
+			t.Skip("weed binary not found, skipping integration test")
 		}
 	}
 
 	// Create temporary data directory
 	dataDir, err := os.MkdirTemp("", "seaweed-iceberg-test-*")
 	if err != nil {
-		return nil, fmt.Errorf("create temp dir: %w", err)
+		t.Fatalf("Failed to create temp dir: %v", err)
 	}
 
 	// Allocate free ephemeral ports for each service
 	var listeners []net.Listener
-	closeListeners := func() {
+	defer func() {
 		for _, l := range listeners {
 			l.Close()
 		}
-	}
+	}()
 
 	var l net.Listener
 	s3Port, l, err := getFreePort()
 	if err != nil {
-		closeListeners()
-		return nil, fmt.Errorf("get free port for S3: %w", err)
+		t.Fatalf("Failed to get free port for S3: %v", err)
 	}
 	listeners = append(listeners, l)
 
 	icebergPort, l, err := getFreePort()
 	if err != nil {
-		closeListeners()
-		return nil, fmt.Errorf("get free port for Iceberg: %w", err)
+		t.Fatalf("Failed to get free port for Iceberg: %v", err)
 	}
 	listeners = append(listeners, l)
 
 	s3GrpcPort, l, err := getFreePort()
 	if err != nil {
-		closeListeners()
-		return nil, fmt.Errorf("get free port for S3 gRPC: %w", err)
+		t.Fatalf("Failed to get free port for S3 gRPC: %v", err)
 	}
 	listeners = append(listeners, l)
 
 	masterPort, l, err := getFreePort()
 	if err != nil {
-		closeListeners()
-		return nil, fmt.Errorf("get free port for Master: %w", err)
+		t.Fatalf("Failed to get free port for Master: %v", err)
 	}
 	listeners = append(listeners, l)
 
 	masterGrpcPort, l, err := getFreePort()
 	if err != nil {
-		closeListeners()
-		return nil, fmt.Errorf("get free port for Master gRPC: %w", err)
+		t.Fatalf("Failed to get free port for Master gRPC: %v", err)
 	}
 	listeners = append(listeners, l)
 
 	filerPort, l, err := getFreePort()
 	if err != nil {
-		closeListeners()
-		return nil, fmt.Errorf("get free port for Filer: %w", err)
+		t.Fatalf("Failed to get free port for Filer: %v", err)
 	}
 	listeners = append(listeners, l)
 
 	filerGrpcPort, l, err := getFreePort()
 	if err != nil {
-		closeListeners()
-		return nil, fmt.Errorf("get free port for Filer gRPC: %w", err)
+		t.Fatalf("Failed to get free port for Filer gRPC: %v", err)
 	}
 	listeners = append(listeners, l)
 
 	volumePort, l, err := getFreePort()
 	if err != nil {
-		closeListeners()
-		return nil, fmt.Errorf("get free port for Volume: %w", err)
+		t.Fatalf("Failed to get free port for Volume: %v", err)
 	}
 	listeners = append(listeners, l)
 
 	volumeGrpcPort, l, err := getFreePort()
 	if err != nil {
-		closeListeners()
-		return nil, fmt.Errorf("get free port for Volume gRPC: %w", err)
+		t.Fatalf("Failed to get free port for Volume gRPC: %v", err)
 	}
 	listeners = append(listeners, l)
 
-	// Release the port reservations so weed mini can bind to them
-	closeListeners()
-
 	return &TestEnvironment{
 		seaweedDir:      seaweedDir,
 		weedBinary:      weedBinary,
@@ -207,11 +166,13 @@ func newTestEnvironmentForMain() (*TestEnvironment, error) {
 		volumePort:      volumePort,
 		volumeGrpcPort:  volumeGrpcPort,
 		dockerAvailable: hasDocker(),
-	}, nil
+	}
 }
 
-// startSeaweedFSForMain starts weed mini without a *testing.T (for use in TestMain).
-func (env *TestEnvironment) startSeaweedFSForMain() error {
+// StartSeaweedFS starts a SeaweedFS mini cluster
+func (env *TestEnvironment) StartSeaweedFS(t *testing.T) {
+	t.Helper()
+
 	ctx, cancel := context.WithCancel(context.Background())
 	env.weedCancel = cancel
 
@@ -221,8 +182,7 @@ func (env *TestEnvironment) startSeaweedFSForMain() error {
 
 	for _, dir := range []string{masterDir, filerDir, volumeDir} {
 		if err := os.MkdirAll(dir, 0755); err != nil {
-			cancel()
-			return fmt.Errorf("create directory %s: %w", dir, err)
+			t.Fatalf("Failed to create directory %s: %v", dir, err)
 		}
 	}
 
@@ -243,30 +203,13 @@ func (env *TestEnvironment) startSeaweedFSForMain() error {
 	cmd.Stderr = os.Stderr
 
 	if err := cmd.Start(); err != nil {
-		cancel()
-		return fmt.Errorf("start SeaweedFS: %w", err)
+		t.Fatalf("Failed to start SeaweedFS: %v", err)
 	}
 	env.weedProcess = cmd
 
+	// Wait for services to be ready
 	if !env.waitForService(fmt.Sprintf("http://127.0.0.1:%d/v1/config", env.icebergPort), 30*time.Second) {
-		cancel()
-		cmd.Wait()
-		return fmt.Errorf("Iceberg REST API did not become ready")
-	}
-	return nil
-}
-
-// cleanupForMain stops SeaweedFS and cleans up resources (no *testing.T needed).
-func (env *TestEnvironment) cleanupForMain() {
-	if env.weedCancel != nil {
-		env.weedCancel()
-	}
-	if env.weedProcess != nil {
-		time.Sleep(2 * time.Second)
-		env.weedProcess.Wait()
-	}
-	if env.dataDir != "" {
-		os.RemoveAll(env.dataDir)
+		t.Fatalf("Iceberg REST API did not become ready")
 	}
 }
 
@@ -287,6 +230,25 @@ func (env *TestEnvironment) waitForService(url string, timeout time.Duration) bo
 	return false
 }
 
+// Cleanup stops SeaweedFS and cleans up resources
+func (env *TestEnvironment) Cleanup(t *testing.T) {
+	t.Helper()
+
+	if env.weedCancel != nil {
+		env.weedCancel()
+	}
+
+	if env.weedProcess != nil {
+		// Give process time to shut down gracefully
+		time.Sleep(2 * time.Second)
+		env.weedProcess.Wait()
+	}
+
+	if env.dataDir != "" {
+		os.RemoveAll(env.dataDir)
+	}
+}
+
 // IcebergURL returns the Iceberg REST Catalog URL
 func (env *TestEnvironment) IcebergURL() string {
 	return fmt.Sprintf("http://127.0.0.1:%d", env.icebergPort)
@@ -298,7 +260,10 @@ func TestIcebergConfig(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	env := sharedEnv
+	env := NewTestEnvironment(t)
+	defer env.Cleanup(t)
+
+	env.StartSeaweedFS(t)
 
 	// Test GET /v1/config
 	resp, err := http.Get(env.IcebergURL() + "/v1/config")
@@ -329,14 +294,16 @@ func TestIcebergNamespaces(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	env := sharedEnv
+	env := NewTestEnvironment(t)
+	defer env.Cleanup(t)
+
+	env.StartSeaweedFS(t)
 
 	// Create the default table bucket first via S3
-	bucketName := "warehouse-ns-" + randomSuffix()
-	createTableBucket(t, env, bucketName)
+	createTableBucket(t, env, "warehouse")
 
 	// Test GET /v1/namespaces (should return empty list initially)
-	resp, err := http.Get(env.IcebergURL() + icebergPath(bucketName, "/v1/namespaces"))
+	resp, err := http.Get(env.IcebergURL() + "/v1/namespaces")
 	if err != nil {
 		t.Fatalf("Failed to list namespaces: %v", err)
 	}
@@ -354,14 +321,16 @@ func TestStageCreateAndFinalizeFlow(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	env := sharedEnv
-	bucketName := "warehouse-stage-" + randomSuffix()
-	createTableBucket(t, env, bucketName)
+	env := NewTestEnvironment(t)
+	defer env.Cleanup(t)
 
-	namespace := "stage_ns_" + randomSuffix()
+	env.StartSeaweedFS(t)
+	createTableBucket(t, env, "warehouse")
+
+	namespace := "stage_ns"
 	tableName := "orders"
 
-	status, _, err := doIcebergJSONRequest(env, http.MethodPost, icebergPath(bucketName, "/v1/namespaces"), map[string]any{
+	status, _, err := doIcebergJSONRequest(env, http.MethodPost, "/v1/namespaces", map[string]any{
 		"namespace": []string{namespace},
 	})
 	if err != nil {
@@ -371,7 +340,7 @@ func TestStageCreateAndFinalizeFlow(t *testing.T) {
 		t.Fatalf("Create namespace status = %d, want 200 or 409", status)
 	}
 
-	status, badReqResp, err := doIcebergJSONRequest(env, http.MethodPost, icebergPath(bucketName, fmt.Sprintf("/v1/namespaces/%s/tables", namespace)), map[string]any{
+	status, badReqResp, err := doIcebergJSONRequest(env, http.MethodPost, fmt.Sprintf("/v1/namespaces/%s/tables", namespace), map[string]any{
 		"stage-create": true,
 	})
 	if err != nil {
@@ -389,7 +358,7 @@ func TestStageCreateAndFinalizeFlow(t *testing.T) {
 		t.Fatalf("error.message = %v, want it to include %q", errorObj["message"], "table name is required")
 	}
 
-	status, stageResp, err := doIcebergJSONRequest(env, http.MethodPost, icebergPath(bucketName, fmt.Sprintf("/v1/namespaces/%s/tables", namespace)), map[string]any{
+	status, stageResp, err := doIcebergJSONRequest(env, http.MethodPost, fmt.Sprintf("/v1/namespaces/%s/tables", namespace), map[string]any{
 		"name":         tableName,
 		"stage-create": true,
 	})
@@ -404,7 +373,7 @@ func TestStageCreateAndFinalizeFlow(t *testing.T) {
 		t.Fatalf("stage metadata-location = %q, want suffix /metadata/v1.metadata.json", stageLocation)
 	}
 
-	status, _, err = doIcebergJSONRequest(env, http.MethodGet, icebergPath(bucketName, fmt.Sprintf("/v1/namespaces/%s/tables/%s", namespace, tableName)), nil)
+	status, _, err = doIcebergJSONRequest(env, http.MethodGet, fmt.Sprintf("/v1/namespaces/%s/tables/%s", namespace, tableName), nil)
 	if err != nil {
 		t.Fatalf("Load staged table request failed: %v", err)
 	}
@@ -412,7 +381,7 @@ func TestStageCreateAndFinalizeFlow(t *testing.T) {
 		t.Fatalf("Load staged table status = %d, want 404", status)
 	}
 
-	status, commitResp, err := doIcebergJSONRequest(env, http.MethodPost, icebergPath(bucketName, fmt.Sprintf("/v1/namespaces/%s/tables/%s", namespace, tableName)), map[string]any{
+	status, commitResp, err := doIcebergJSONRequest(env, http.MethodPost, fmt.Sprintf("/v1/namespaces/%s/tables/%s", namespace, tableName), map[string]any{
 		"requirements": []map[string]any{
 			{"type": "assert-create"},
 		},
@@ -429,7 +398,7 @@ func TestStageCreateAndFinalizeFlow(t *testing.T) {
 		t.Fatalf("final metadata-location = %q, want suffix /metadata/v1.metadata.json", commitLocation)
 	}
 
-	status, loadResp, err := doIcebergJSONRequest(env, http.MethodGet, icebergPath(bucketName, fmt.Sprintf("/v1/namespaces/%s/tables/%s", namespace, tableName)), nil)
+	status, loadResp, err := doIcebergJSONRequest(env, http.MethodGet, fmt.Sprintf("/v1/namespaces/%s/tables/%s", namespace, tableName), nil)
 	if err != nil {
 		t.Fatalf("Load finalized table request failed: %v", err)
 	}
@@ -448,14 +417,16 @@ func TestCommitMissingTableWithoutAssertCreate(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	env := sharedEnv
-	bucketName := "warehouse-missing-" + randomSuffix()
-	createTableBucket(t, env, bucketName)
+	env := NewTestEnvironment(t)
+	defer env.Cleanup(t)
 
-	namespace := "stage_missing_assert_ns_" + randomSuffix()
+	env.StartSeaweedFS(t)
+	createTableBucket(t, env, "warehouse")
+
+	namespace := "stage_missing_assert_ns"
 	tableName := "missing_table"
 
-	status, _, err := doIcebergJSONRequest(env, http.MethodPost, icebergPath(bucketName, "/v1/namespaces"), map[string]any{
+	status, _, err := doIcebergJSONRequest(env, http.MethodPost, "/v1/namespaces", map[string]any{
 		"namespace": []string{namespace},
 	})
 	if err != nil {
@@ -465,7 +436,7 @@ func TestCommitMissingTableWithoutAssertCreate(t *testing.T) {
 		t.Fatalf("Create namespace status = %d, want 200 or 409", status)
 	}
 
-	status, _, err = doIcebergJSONRequest(env, http.MethodPost, icebergPath(bucketName, fmt.Sprintf("/v1/namespaces/%s/tables/%s", namespace, tableName)), map[string]any{
+	status, _, err = doIcebergJSONRequest(env, http.MethodPost, fmt.Sprintf("/v1/namespaces/%s/tables/%s", namespace, tableName), map[string]any{
 		"requirements": []any{},
 		"updates":      []any{},
 	})
@@ -520,21 +491,6 @@ func doIcebergJSONRequest(env *TestEnvironment, method, path string, payload any
 	return resp.StatusCode, decoded, nil
 }
 
-// icebergPath inserts the table bucket prefix into Iceberg REST API paths.
-// For example, "/v1/namespaces" with prefix "my-bucket" becomes
-// "/v1/my-bucket/namespaces".
-func icebergPath(prefix, path string) string {
-	if prefix == "" {
-		return path
-	}
-	const base = "/v1/"
-	if !strings.HasPrefix(path, base) {
-		return path
-	}
-	withPrefix := base + prefix + "/" + strings.TrimPrefix(path, base)
-	return withPrefix
-}
-
 // createTableBucket creates a table bucket via the S3Tables REST API
 func createTableBucket(t *testing.T, env *TestEnvironment, bucketName string) {
 	t.Helper()
@@ -564,11 +520,6 @@ func createTableBucket(t *testing.T, env *TestEnvironment, bucketName string) {
 	t.Logf("Created table bucket %s", bucketName)
 }
 
-// randomSuffix returns a short random hex suffix for unique resource naming.
-func randomSuffix() string {
-	return fmt.Sprintf("%x", time.Now().UnixNano()&0xffffffff)
-}
-
 // TestDuckDBIntegration tests Iceberg catalog operations using DuckDB
 // This test requires Docker to be available
 func TestDuckDBIntegration(t *testing.T) {
@@ -576,12 +527,15 @@ func TestDuckDBIntegration(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	env := sharedEnv
+	env := NewTestEnvironment(t)
+	defer env.Cleanup(t)
 
 	if !env.dockerAvailable {
 		t.Skip("Docker not available, skipping DuckDB integration test")
 	}
 
+	env.StartSeaweedFS(t)
+
 	// Create a temporary SQL file for DuckDB to execute
 	sqlFile := filepath.Join(env.dataDir, "test.sql")
 	sqlContent := fmt.Sprintf(`

test/s3tables/catalog/pyiceberg_test.go

@@ -26,14 +26,17 @@ func TestPyIcebergRestCatalog(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	env := sharedEnv
+	env := NewTestEnvironment(t)
+	defer env.Cleanup(t)
 
 	if !env.dockerAvailable {
 		t.Skip("Docker not available, skipping PyIceberg integration test")
 	}
 
+	env.StartSeaweedFS(t)
+
 	// Create the test bucket first
-	bucketName := "pyiceberg-compat-test-" + randomSuffix()
+	bucketName := "pyiceberg-compat-test"
 	createTableBucket(t, env, bucketName)
 
 	// Build the test working directory path
@@ -81,7 +84,8 @@ func TestPyIcebergRestCatalogAuthenticated(t *testing.T) {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	env := sharedEnv
+	env := NewTestEnvironment(t)
+	defer env.Cleanup(t)
 
 	if !env.dockerAvailable {
 		t.Skip("Docker not available, skipping PyIceberg integration test")
@@ -91,8 +95,11 @@ func TestPyIcebergRestCatalogAuthenticated(t *testing.T) {
 	testAccessKey := "admin"
 	testSecretKey := "admin"
 
+	// Start SeaweedFS (it will use default admin credentials from environment if set)
+	env.StartSeaweedFS(t)
+
 	// Create the test bucket first (using unauthenticated request, which works with DefaultAllow)
-	bucketName := "pyiceberg-auth-test-" + randomSuffix()
+	bucketName := "pyiceberg-auth-test"
 	createTableBucket(t, env, bucketName)
 
 	// Build the test working directory path

test/s3tables/catalog_trino/trino_catalog_test.go

@@ -40,7 +40,6 @@ type TestEnvironment struct {
 	dockerAvailable bool
 	accessKey       string
 	secretKey       string
-	closers         []io.Closer
 }
 
 func TestTrinoIcebergCatalog(t *testing.T) {
@@ -119,66 +118,30 @@ func NewTestEnvironment(t *testing.T) *TestEnvironment {
 
 	bindIP := testutil.FindBindIP()
 
-	env := &TestEnvironment{
-		seaweedDir: seaweedDir,
-		weedBinary: weedBinary,
-		dataDir:    dataDir,
-		bindIP:     bindIP,
-		closers:    []io.Closer{},
+	masterPort, masterGrpcPort := mustFreePortPair(t, "Master")
+	volumePort, volumeGrpcPort := mustFreePortPair(t, "Volume")
+	filerPort, filerGrpcPort := mustFreePortPair(t, "Filer")
+	s3Port, s3GrpcPort := mustFreePortPair(t, "S3")
+	icebergPort := mustFreePort(t, "Iceberg")
+
+	return &TestEnvironment{
+		seaweedDir:      seaweedDir,
+		weedBinary:      weedBinary,
+		dataDir:         dataDir,
+		bindIP:          bindIP,
+		s3Port:          s3Port,
+		s3GrpcPort:      s3GrpcPort,
+		icebergPort:     icebergPort,
+		masterPort:      masterPort,
+		masterGrpcPort:  masterGrpcPort,
+		filerPort:       filerPort,
+		filerGrpcPort:   filerGrpcPort,
+		volumePort:      volumePort,
+		volumeGrpcPort:  volumeGrpcPort,
+		dockerAvailable: hasDocker(),
+		accessKey:       "AKIAIOSFODNN7EXAMPLE",
+		secretKey:       "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
 	}
-
-	env.masterPort, env.masterGrpcPort = env.mustFreePortPair("Master")
-	env.volumePort, env.volumeGrpcPort = env.mustFreePortPair("Volume")
-	env.filerPort, env.filerGrpcPort = env.mustFreePortPair("Filer")
-	env.s3Port, env.s3GrpcPort = env.mustFreePortPair("S3")
-	env.icebergPort = env.mustFreePort("Iceberg")
-
-	env.dockerAvailable = hasDocker()
-	env.accessKey = "AKIAIOSFODNN7EXAMPLE"
-	env.secretKey = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
-
-	return env
-}
-
-func (env *TestEnvironment) mustFreePort(name string) int {
-	port, closer, err := getFreePort()
-	if err != nil {
-		panic(fmt.Sprintf("Failed to get free port for %s: %v", name, err))
-	}
-	env.closers = append(env.closers, closer)
-	return port
-}
-
-func (env *TestEnvironment) mustFreePortPair(name string) (int, int) {
-	httpPort, httpCloser, grpcPort, grpcCloser, err := findAvailablePortPair()
-	if err != nil {
-		panic(fmt.Sprintf("Failed to get free port pair for %s: %v", name, err))
-	}
-	env.closers = append(env.closers, httpCloser, grpcCloser)
-	return httpPort, grpcPort
-}
-
-func mustFreePort(t *testing.T, name string) int {
-	t.Helper()
-
-	port, closer, err := getFreePort()
-	if err != nil {
-		t.Fatalf("Failed to get free port for %s: %v", name, err)
-	}
-	closer.Close()
-	return port
-}
-
-func mustFreePortPair(t *testing.T, name string) (int, int) {
-	t.Helper()
-
-	httpPort, httpCloser, grpcPort, grpcCloser, err := findAvailablePortPair()
-	if err != nil {
-		t.Fatalf("Failed to get free port pair for %s: %v", name, err)
-	}
-	httpCloser.Close()
-	grpcCloser.Close()
-	return httpPort, grpcPort
 }
 
 func (env *TestEnvironment) StartSeaweedFS(t *testing.T) {
@@ -198,12 +161,6 @@ func (env *TestEnvironment) StartSeaweedFS(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	env.weedCancel = cancel
 
-	// Close all port listeners right before starting the weed process
-	for _, closer := range env.closers {
-		closer.Close()
-	}
-	env.closers = nil
-
 	cmd := exec.CommandContext(ctx, env.weedBinary, "mini",
 		"-master.port", fmt.Sprintf("%d", env.masterPort),
 		"-master.port.grpc", fmt.Sprintf("%d", env.masterGrpcPort),
@@ -514,27 +471,47 @@ func hasDocker() bool {
 	return cmd.Run() == nil
 }
 
-func findAvailablePortPair() (int, io.Closer, int, io.Closer, error) {
-	httpPort, httpCloser, err := getFreePort()
+func mustFreePort(t *testing.T, name string) int {
+	t.Helper()
+
+	port, err := getFreePort()
 	if err != nil {
-		return 0, nil, 0, nil, err
+		t.Fatalf("Failed to get free port for %s: %v", name, err)
 	}
-	grpcPort, grpcCloser, err := getFreePort()
-	if err != nil {
-		httpCloser.Close()
-		return 0, nil, 0, nil, err
-	}
-	return httpPort, httpCloser, grpcPort, grpcCloser, nil
+	return port
 }
 
-func getFreePort() (int, io.Closer, error) {
+func mustFreePortPair(t *testing.T, name string) (int, int) {
+	t.Helper()
+
+	httpPort, grpcPort, err := findAvailablePortPair()
+	if err != nil {
+		t.Fatalf("Failed to get free port pair for %s: %v", name, err)
+	}
+	return httpPort, grpcPort
+}
+
+func findAvailablePortPair() (int, int, error) {
+	httpPort, err := getFreePort()
+	if err != nil {
+		return 0, 0, err
+	}
+	grpcPort, err := getFreePort()
+	if err != nil {
+		return 0, 0, err
+	}
+	return httpPort, grpcPort, nil
+}
+
+func getFreePort() (int, error) {
 	listener, err := net.Listen("tcp", "0.0.0.0:0")
 	if err != nil {
-		return 0, nil, err
+		return 0, err
 	}
+	defer listener.Close()
 
 	addr := listener.Addr().(*net.TCPAddr)
-	return addr.Port, listener, nil
+	return addr.Port, nil
 }
 
 func randomString(length int) string {

test/s3tables/table-buckets/s3tables_integration_test.go

@@ -12,57 +12,33 @@ import (
 	"time"
 
 	cryptorand "crypto/rand"
+	"sync"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"flag"
-
 	"github.com/seaweedfs/seaweedfs/weed/command"
 	"github.com/seaweedfs/seaweedfs/weed/glog"
 	"github.com/seaweedfs/seaweedfs/weed/s3api/s3tables"
+	flag "github.com/seaweedfs/seaweedfs/weed/util/fla9"
 )
 
-// TestMain starts a single default weed mini cluster for the whole package and
-// tears it down after all tests have completed. Tests that require a different
-// cluster configuration (e.g. TestS3TablesCreateBucketIAMPolicy) start their
-// own cluster independently.
-func TestMain(m *testing.M) {
-	flag.Parse()
-	if testing.Short() {
-		// Tests self-skip with t.Skip when -short is set; no cluster needed.
-		os.Exit(m.Run())
-	}
-
-	// Create a temporary T-less context so we can use t.TempDir-equivalent.
-	testDir, err := os.MkdirTemp("", "seaweed-s3tables-shared-*")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "SKIP: failed to create shared temp dir: %v\n", err)
-		os.Exit(0)
-	}
-
-	cluster, err := startMiniClusterInDir(testDir, nil)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "SKIP: failed to start shared weed mini cluster: %v\n", err)
-		os.RemoveAll(testDir)
-		os.Exit(0)
-	}
-	sharedCluster = cluster
-
-	code := m.Run()
-
-	sharedCluster.Stop()
-	os.RemoveAll(testDir)
-	os.Exit(code)
-}
+var (
+	miniClusterMutex sync.Mutex
+)
 
 func TestS3TablesIntegration(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")
 	}
 
-	// Re-use the shared cluster started by TestMain.
-	client := NewS3TablesClient(sharedCluster.s3Endpoint, testRegion, testAccessKey, testSecretKey)
+	// Create and start test cluster
+	cluster, err := startMiniCluster(t)
+	require.NoError(t, err)
+	defer cluster.Stop()
+
+	// Create S3 Tables client
+	client := NewS3TablesClient(cluster.s3Endpoint, testRegion, testAccessKey, testSecretKey)
 
 	// Run test suite
 	t.Run("TableBucketLifecycle", func(t *testing.T) {
@@ -94,92 +70,6 @@ func TestS3TablesIntegration(t *testing.T) {
 	})
 }
 
-func TestS3TablesCreateBucketIAMPolicy(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping IAM integration test in short mode")
-	}
-
-	t.Setenv("AWS_ACCESS_KEY_ID", "env-admin")
-	t.Setenv("AWS_SECRET_ACCESS_KEY", "env-secret")
-
-	allowedBucket := "tables-allowed"
-	deniedBucket := "tables-denied"
-	iamConfigDir := t.TempDir()
-	iamConfigPath := filepath.Join(iamConfigDir, "iam_config.json")
-	iamConfig := fmt.Sprintf(`{
-  "sts": {
-    "tokenDuration": "1h",
-    "maxSessionLength": "12h",
-    "issuer": "seaweedfs-sts",
-    "signingKey": "%s"
-  },
-  "accounts": [
-    {
-      "id": "%s",
-      "displayName": "tables-integration"
-    }
-  ],
-  "identities": [
-    {
-      "name": "admin",
-      "credentials": [
-        {
-          "accessKey": "%s",
-          "secretKey": "%s"
-        }
-      ],
-      "account": {
-        "id": "%s",
-        "displayName": "tables-integration"
-      },
-      "policyNames": ["S3TablesBucketPolicy"]
-    }
-  ],
-  "policy": {
-    "defaultEffect": "Deny",
-    "storeType": "memory"
-  },
-  "policies": [
-    {
-      "name": "S3TablesBucketPolicy",
-      "document": {
-        "Version": "2012-10-17",
-        "Statement": [
-          {
-            "Effect": "Allow",
-            "Action": ["s3tables:CreateTableBucket"],
-            "Resource": [
-              "arn:aws:s3tables:*:*:bucket/%s",
-              "arn:aws:s3:::%s"
-            ]
-          }
-        ]
-      }
-    }
-  ]
-}`, testIAMSigningKey, testAccountID, testAccessKey, testSecretKey, testAccountID, allowedBucket, allowedBucket)
-	require.NoError(t, os.WriteFile(iamConfigPath, []byte(iamConfig), 0644))
-
-	cluster, err := startMiniClusterWithExtraArgs(t, []string{
-		"-s3.config=" + iamConfigPath,
-		"-s3.iam.config=" + iamConfigPath,
-	})
-	require.NoError(t, err, "failed to start cluster with IAM config")
-	defer cluster.Stop()
-
-	client := NewS3TablesClient(cluster.s3Endpoint, testRegion, testAccessKey, testSecretKey)
-
-	_, err = client.CreateTableBucket(deniedBucket, nil)
-	require.Error(t, err, "denied bucket creation should fail")
-	assert.Contains(t, err.Error(), "AccessDenied")
-
-	allowedResp, err := client.CreateTableBucket(allowedBucket, nil)
-	require.NoError(t, err, "allowed bucket creation should succeed")
-	defer func() {
-		_ = client.DeleteTableBucket(allowedResp.ARN)
-	}()
-}
-
 func testTableBucketLifecycle(t *testing.T, client *S3TablesClient) {
 	bucketName := "test-bucket-" + randomString(8)
 
@@ -618,12 +508,11 @@ func findAvailablePorts(n int) ([]int, error) {
 	return ports, nil
 }
 
-// startMiniClusterInDir starts a weed mini instance using testDir as the data
-// directory. It does not require a *testing.T so it can be called from TestMain.
-// extraArgs are appended to the default mini command flags.
-func startMiniClusterInDir(testDir string, extraArgs []string) (*TestCluster, error) {
-	// We need 10 unique ports: Master(2), Volume(2), Filer(2), S3(2), Admin(2)
-	ports, err := findAvailablePorts(10)
+// startMiniCluster starts a weed mini instance directly without exec
+func startMiniCluster(t *testing.T) (*TestCluster, error) {
+	// Find available ports
+	// We need 8 unique ports: Master(2), Volume(2), Filer(2), S3(2)
+	ports, err := findAvailablePorts(8)
 	if err != nil {
 		return nil, fmt.Errorf("failed to find available ports: %v", err)
 	}
@@ -636,8 +525,8 @@ func startMiniClusterInDir(testDir string, extraArgs []string) (*TestCluster, er
 	filerGrpcPort := ports[5]
 	s3Port := ports[6]
 	s3GrpcPort := ports[7]
-	adminPort := ports[8]
-	adminGrpcPort := ports[9]
+	// Create temporary directory for test data
+	testDir := t.TempDir()
 
 	// Ensure no configuration file from previous runs
 	configFile := filepath.Join(testDir, "mini.options")
@@ -648,6 +537,7 @@ func startMiniClusterInDir(testDir string, extraArgs []string) (*TestCluster, er
 
 	s3Endpoint := fmt.Sprintf("http://127.0.0.1:%d", s3Port)
 	cluster := &TestCluster{
+		t:          t,
 		dataDir:    testDir,
 		ctx:        ctx,
 		cancel:     cancel,
@@ -660,17 +550,18 @@ func startMiniClusterInDir(testDir string, extraArgs []string) (*TestCluster, er
 
 	// Create empty security.toml to disable JWT authentication in tests
 	securityToml := filepath.Join(testDir, "security.toml")
-	if err = os.WriteFile(securityToml, []byte("# Empty security config for testing\n"), 0644); err != nil {
+	err = os.WriteFile(securityToml, []byte("# Empty security config for testing\n"), 0644)
+	if err != nil {
 		cancel()
 		return nil, fmt.Errorf("failed to create security.toml: %v", err)
 	}
 
-	// Ensure AWS credentials are set (don't use t.Setenv here — we are in TestMain).
+	// Set environment variables for admin credentials safely for this test
 	if os.Getenv("AWS_ACCESS_KEY_ID") == "" {
-		os.Setenv("AWS_ACCESS_KEY_ID", "admin")
+		t.Setenv("AWS_ACCESS_KEY_ID", "admin")
 	}
 	if os.Getenv("AWS_SECRET_ACCESS_KEY") == "" {
-		os.Setenv("AWS_SECRET_ACCESS_KEY", "admin")
+		t.Setenv("AWS_SECRET_ACCESS_KEY", "admin")
 	}
 
 	// Start weed mini in a goroutine by calling the command directly
@@ -678,7 +569,11 @@ func startMiniClusterInDir(testDir string, extraArgs []string) (*TestCluster, er
 	go func() {
 		defer cluster.wg.Done()
 
-		// Save current directory and args, restore on exit.
+		// Protect global state mutation with a mutex
+		miniClusterMutex.Lock()
+		defer miniClusterMutex.Unlock()
+
+		// Save current directory and args
 		oldDir, _ := os.Getwd()
 		oldArgs := os.Args
 		defer func() {
@@ -686,24 +581,21 @@ func startMiniClusterInDir(testDir string, extraArgs []string) (*TestCluster, er
 			os.Args = oldArgs
 		}()
 
-		// Change to test directory so mini picks up security.toml.
+		// Change to test directory so mini picks up security.toml
 		os.Chdir(testDir)
 
-		baseArgs := []string{
+		// Configure args for mini command
+		os.Args = []string{
+			"weed",
 			"-dir=" + testDir,
-			"-master.dir=" + testDir,
 			"-master.port=" + strconv.Itoa(masterPort),
 			"-master.port.grpc=" + strconv.Itoa(masterGrpcPort),
 			"-volume.port=" + strconv.Itoa(volumePort),
 			"-volume.port.grpc=" + strconv.Itoa(volumeGrpcPort),
-			"-volume.port.public=" + strconv.Itoa(volumePort),
-			"-volume.publicUrl=127.0.0.1:" + strconv.Itoa(volumePort),
 			"-filer.port=" + strconv.Itoa(filerPort),
 			"-filer.port.grpc=" + strconv.Itoa(filerGrpcPort),
 			"-s3.port=" + strconv.Itoa(s3Port),
 			"-s3.port.grpc=" + strconv.Itoa(s3GrpcPort),
-			"-admin.port=" + strconv.Itoa(adminPort),
-			"-admin.port.grpc=" + strconv.Itoa(adminGrpcPort),
 			"-webdav.port=0",               // Disable WebDAV
 			"-admin.ui=false",              // Disable admin UI
 			"-master.volumeSizeLimitMB=32", // Small volumes for testing
@@ -711,10 +603,6 @@ func startMiniClusterInDir(testDir string, extraArgs []string) (*TestCluster, er
 			"-master.peers=none",     // Faster startup
 			"-s3.iam.readOnly=false", // Enable IAM write operations for tests
 		}
-		if len(extraArgs) > 0 {
-			baseArgs = append(baseArgs, extraArgs...)
-		}
-		os.Args = append([]string{"weed"}, baseArgs...)
 
 		// Suppress most logging during tests
 		glog.MaxSize = 1024 * 1024
@@ -733,34 +621,14 @@ func startMiniClusterInDir(testDir string, extraArgs []string) (*TestCluster, er
 	}()
 
 	// Wait for S3 service to be ready
-	if err = waitForS3Ready(cluster.s3Endpoint, 30*time.Second); err != nil {
+	err = waitForS3Ready(cluster.s3Endpoint, 30*time.Second)
+	if err != nil {
 		cancel()
 		return nil, fmt.Errorf("S3 service failed to start: %v", err)
 	}
 
 	cluster.isRunning = true
-	return cluster, nil
-}
 
-// startMiniClusterWithExtraArgs starts a weed mini instance for a single test.
-// It uses t.TempDir() for data isolation and t.Setenv for credential scoping.
-func startMiniClusterWithExtraArgs(t *testing.T, extraArgs []string) (*TestCluster, error) {
-	t.Helper()
-	testDir := t.TempDir()
-
-	// Scope credentials to the test so they are restored after test completion.
-	if os.Getenv("AWS_ACCESS_KEY_ID") == "" {
-		t.Setenv("AWS_ACCESS_KEY_ID", "admin")
-	}
-	if os.Getenv("AWS_SECRET_ACCESS_KEY") == "" {
-		t.Setenv("AWS_SECRET_ACCESS_KEY", "admin")
-	}
-
-	cluster, err := startMiniClusterInDir(testDir, extraArgs)
-	if err != nil {
-		return nil, err
-	}
-	cluster.t = t
 	t.Logf("Test cluster started successfully at %s", cluster.s3Endpoint)
 	return cluster, nil
 }
@@ -786,15 +654,22 @@ func (c *TestCluster) Stop() {
 	case <-done:
 		// Goroutine finished
 	case <-timer.C:
-		// Timeout - goroutine doesn't respond to context cancel.
-		// This may indicate the mini cluster didn't shut down cleanly.
-		if c.t != nil {
-			c.t.Log("Warning: Test cluster shutdown timed out after 2 seconds")
-		} else {
-			fmt.Println("Warning: Test cluster shutdown timed out after 2 seconds")
-		}
+		// Timeout - goroutine doesn't respond to context cancel
+		// This may indicate the mini cluster didn't shut down cleanly
+		c.t.Log("Warning: Test cluster shutdown timed out after 2 seconds")
 	}
 
+	// Reset the global cmdMini flags to prevent state leakage to other tests
+	for _, cmd := range command.Commands {
+		if cmd.Name() == "mini" {
+			// Reset flags to defaults
+			cmd.Flag.VisitAll(func(f *flag.Flag) {
+				// Reset to default value
+				f.Value.Set(f.DefValue)
+			})
+			break
+		}
+	}
 }
 
 // waitForS3Ready waits for the S3 service to be ready

test/s3tables/table-buckets/setup.go

@@ -8,11 +8,6 @@ import (
 	"time"
 )
 
-// sharedCluster is the single default TestCluster shared across all tests
-// that do not require a specialised cluster configuration.
-// It is initialised by TestMain and must not be modified by individual tests.
-var sharedCluster *TestCluster
-
 // TestCluster manages the weed mini instance for integration testing
 type TestCluster struct {
 	t          *testing.T
@@ -51,9 +46,8 @@ func NewS3TablesClient(endpoint, region, accessKey, secretKey string) *S3TablesC
 
 // Test configuration constants
 const (
-	testRegion        = "us-west-2"
-	testAccessKey     = "admin"
-	testSecretKey     = "admin"
-	testAccountID     = "111122223333"
-	testIAMSigningKey = "dGVzdC1zaWduaW5nLWtleS1mb3Itc3RzLWludGVncmF0aW9uLXRlc3Rz"
+	testRegion    = "us-west-2"
+	testAccessKey = "admin"
+	testSecretKey = "admin"
+	testAccountID = "111122223333"
 )

test/volume_server/framework/cluster_dual.go

@@ -1,17 +1,293 @@
 package framework
 
 import (
+	"fmt"
+	"net"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strconv"
+	"sync"
 	"testing"
 
 	"github.com/seaweedfs/seaweedfs/test/volume_server/matrix"
 )
 
-// DualVolumeCluster is deprecated. Use MultiVolumeCluster instead.
-// For backward compatibility, it's a type alias for MultiVolumeCluster.
-type DualVolumeCluster = MultiVolumeCluster
+type DualVolumeCluster struct {
+	testingTB testing.TB
+	profile   matrix.Profile
 
-// StartDualVolumeCluster starts a cluster with 2 volume servers.
-// Deprecated: Use StartMultiVolumeCluster(t, profile, 2) directly.
+	weedBinary string
+	baseDir    string
+	configDir  string
+	logsDir    string
+	keepLogs   bool
+
+	masterPort     int
+	masterGrpcPort int
+
+	volumePort0     int
+	volumeGrpcPort0 int
+	volumePubPort0  int
+	volumePort1     int
+	volumeGrpcPort1 int
+	volumePubPort1  int
+
+	masterCmd *exec.Cmd
+	volumeCmd0 *exec.Cmd
+	volumeCmd1 *exec.Cmd
+
+	cleanupOnce sync.Once
+}
+
 func StartDualVolumeCluster(t testing.TB, profile matrix.Profile) *DualVolumeCluster {
-	return StartMultiVolumeCluster(t, profile, 2)
+	t.Helper()
+
+	weedBinary, err := FindOrBuildWeedBinary()
+	if err != nil {
+		t.Fatalf("resolve weed binary: %v", err)
+	}
+
+	baseDir, keepLogs, err := newWorkDir()
+	if err != nil {
+		t.Fatalf("create temp test directory: %v", err)
+	}
+
+	configDir := filepath.Join(baseDir, "config")
+	logsDir := filepath.Join(baseDir, "logs")
+	masterDataDir := filepath.Join(baseDir, "master")
+	volumeDataDir0 := filepath.Join(baseDir, "volume0")
+	volumeDataDir1 := filepath.Join(baseDir, "volume1")
+	for _, dir := range []string{configDir, logsDir, masterDataDir, volumeDataDir0, volumeDataDir1} {
+		if mkErr := os.MkdirAll(dir, 0o755); mkErr != nil {
+			t.Fatalf("create %s: %v", dir, mkErr)
+		}
+	}
+
+	if err = writeSecurityConfig(configDir, profile); err != nil {
+		t.Fatalf("write security config: %v", err)
+	}
+
+	masterPort, masterGrpcPort, err := allocateMasterPortPair()
+	if err != nil {
+		t.Fatalf("allocate master port pair: %v", err)
+	}
+
+	ports, err := allocatePorts(6)
+	if err != nil {
+		t.Fatalf("allocate volume ports: %v", err)
+	}
+
+	c := &DualVolumeCluster{
+		testingTB:      t,
+		profile:        profile,
+		weedBinary:     weedBinary,
+		baseDir:        baseDir,
+		configDir:      configDir,
+		logsDir:        logsDir,
+		keepLogs:       keepLogs,
+		masterPort:     masterPort,
+		masterGrpcPort: masterGrpcPort,
+		volumePort0:    ports[0],
+		volumeGrpcPort0: ports[1],
+		volumePubPort0: ports[0],
+		volumePort1:    ports[2],
+		volumeGrpcPort1: ports[3],
+		volumePubPort1: ports[2],
+	}
+	if profile.SplitPublicPort {
+		c.volumePubPort0 = ports[4]
+		c.volumePubPort1 = ports[5]
+	}
+
+	if err = c.startMaster(masterDataDir); err != nil {
+		c.Stop()
+		t.Fatalf("start master: %v", err)
+	}
+	if err = c.waitForHTTP(c.MasterURL() + "/dir/status"); err != nil {
+		masterLog := c.tailLog("master.log")
+		c.Stop()
+		t.Fatalf("wait for master readiness: %v\nmaster log tail:\n%s", err, masterLog)
+	}
+
+	if err = c.startVolume(0, volumeDataDir0); err != nil {
+		masterLog := c.tailLog("master.log")
+		c.Stop()
+		t.Fatalf("start first volume server: %v\nmaster log tail:\n%s", err, masterLog)
+	}
+	if err = c.waitForHTTP(c.VolumeAdminURL(0) + "/status"); err != nil {
+		volumeLog := c.tailLog("volume0.log")
+		c.Stop()
+		t.Fatalf("wait for first volume readiness: %v\nvolume log tail:\n%s", err, volumeLog)
+	}
+	if err = c.waitForTCP(c.VolumeGRPCAddress(0)); err != nil {
+		volumeLog := c.tailLog("volume0.log")
+		c.Stop()
+		t.Fatalf("wait for first volume grpc readiness: %v\nvolume log tail:\n%s", err, volumeLog)
+	}
+
+	if err = c.startVolume(1, volumeDataDir1); err != nil {
+		volumeLog := c.tailLog("volume0.log")
+		c.Stop()
+		t.Fatalf("start second volume server: %v\nfirst volume log tail:\n%s", err, volumeLog)
+	}
+	if err = c.waitForHTTP(c.VolumeAdminURL(1) + "/status"); err != nil {
+		volumeLog := c.tailLog("volume1.log")
+		c.Stop()
+		t.Fatalf("wait for second volume readiness: %v\nvolume log tail:\n%s", err, volumeLog)
+	}
+	if err = c.waitForTCP(c.VolumeGRPCAddress(1)); err != nil {
+		volumeLog := c.tailLog("volume1.log")
+		c.Stop()
+		t.Fatalf("wait for second volume grpc readiness: %v\nvolume log tail:\n%s", err, volumeLog)
+	}
+
+	t.Cleanup(func() {
+		c.Stop()
+	})
+
+	return c
+}
+
+func (c *DualVolumeCluster) Stop() {
+	if c == nil {
+		return
+	}
+	c.cleanupOnce.Do(func() {
+		stopProcess(c.volumeCmd1)
+		stopProcess(c.volumeCmd0)
+		stopProcess(c.masterCmd)
+		if !c.keepLogs && !c.testingTB.Failed() {
+			_ = os.RemoveAll(c.baseDir)
+		} else if c.baseDir != "" {
+			c.testingTB.Logf("volume server integration logs kept at %s", c.baseDir)
+		}
+	})
+}
+
+func (c *DualVolumeCluster) startMaster(dataDir string) error {
+	logFile, err := os.Create(filepath.Join(c.logsDir, "master.log"))
+	if err != nil {
+		return err
+	}
+
+	args := []string{
+		"-config_dir=" + c.configDir,
+		"master",
+		"-ip=127.0.0.1",
+		"-port=" + strconv.Itoa(c.masterPort),
+		"-port.grpc=" + strconv.Itoa(c.masterGrpcPort),
+		"-mdir=" + dataDir,
+		"-peers=none",
+		"-volumeSizeLimitMB=" + strconv.Itoa(testVolumeSizeLimitMB),
+		"-defaultReplication=000",
+	}
+
+	c.masterCmd = exec.Command(c.weedBinary, args...)
+	c.masterCmd.Dir = c.baseDir
+	c.masterCmd.Stdout = logFile
+	c.masterCmd.Stderr = logFile
+	return c.masterCmd.Start()
+}
+
+func (c *DualVolumeCluster) startVolume(index int, dataDir string) error {
+	logName := fmt.Sprintf("volume%d.log", index)
+	logFile, err := os.Create(filepath.Join(c.logsDir, logName))
+	if err != nil {
+		return err
+	}
+
+	volumePort := c.volumePort0
+	volumeGrpcPort := c.volumeGrpcPort0
+	volumePubPort := c.volumePubPort0
+	if index == 1 {
+		volumePort = c.volumePort1
+		volumeGrpcPort = c.volumeGrpcPort1
+		volumePubPort = c.volumePubPort1
+	}
+
+	args := []string{
+		"-config_dir=" + c.configDir,
+		"volume",
+		"-ip=127.0.0.1",
+		"-port=" + strconv.Itoa(volumePort),
+		"-port.grpc=" + strconv.Itoa(volumeGrpcPort),
+		"-port.public=" + strconv.Itoa(volumePubPort),
+		"-dir=" + dataDir,
+		"-max=16",
+		"-master=127.0.0.1:" + strconv.Itoa(c.masterPort),
+		"-readMode=" + c.profile.ReadMode,
+		"-concurrentUploadLimitMB=" + strconv.Itoa(c.profile.ConcurrentUploadLimitMB),
+		"-concurrentDownloadLimitMB=" + strconv.Itoa(c.profile.ConcurrentDownloadLimitMB),
+	}
+	if c.profile.InflightUploadTimeout > 0 {
+		args = append(args, "-inflightUploadDataTimeout="+c.profile.InflightUploadTimeout.String())
+	}
+	if c.profile.InflightDownloadTimeout > 0 {
+		args = append(args, "-inflightDownloadDataTimeout="+c.profile.InflightDownloadTimeout.String())
+	}
+
+	cmd := exec.Command(c.weedBinary, args...)
+	cmd.Dir = c.baseDir
+	cmd.Stdout = logFile
+	cmd.Stderr = logFile
+
+	if err = cmd.Start(); err != nil {
+		return err
+	}
+	if index == 1 {
+		c.volumeCmd1 = cmd
+	} else {
+		c.volumeCmd0 = cmd
+	}
+	return nil
+}
+
+func (c *DualVolumeCluster) waitForHTTP(url string) error {
+	return (&Cluster{}).waitForHTTP(url)
+}
+
+func (c *DualVolumeCluster) waitForTCP(addr string) error {
+	return (&Cluster{}).waitForTCP(addr)
+}
+
+func (c *DualVolumeCluster) tailLog(logName string) string {
+	return (&Cluster{logsDir: c.logsDir}).tailLog(logName)
+}
+
+func (c *DualVolumeCluster) MasterAddress() string {
+	return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.masterPort))
+}
+
+func (c *DualVolumeCluster) MasterURL() string {
+	return "http://" + c.MasterAddress()
+}
+
+func (c *DualVolumeCluster) VolumeAdminAddress(index int) string {
+	if index == 1 {
+		return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.volumePort1))
+	}
+	return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.volumePort0))
+}
+
+func (c *DualVolumeCluster) VolumePublicAddress(index int) string {
+	if index == 1 {
+		return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.volumePubPort1))
+	}
+	return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.volumePubPort0))
+}
+
+func (c *DualVolumeCluster) VolumeGRPCAddress(index int) string {
+	if index == 1 {
+		return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.volumeGrpcPort1))
+	}
+	return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.volumeGrpcPort0))
+}
+
+func (c *DualVolumeCluster) VolumeAdminURL(index int) string {
+	return "http://" + c.VolumeAdminAddress(index)
+}
+
+func (c *DualVolumeCluster) VolumePublicURL(index int) string {
+	return "http://" + c.VolumePublicAddress(index)
 }

test/volume_server/framework/cluster_multi.go

@@ -1,303 +0,0 @@
-package framework
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strconv"
-	"sync"
-	"testing"
-
-	"github.com/seaweedfs/seaweedfs/test/volume_server/matrix"
-)
-
-type MultiVolumeCluster struct {
-	testingTB testing.TB
-	profile   matrix.Profile
-
-	weedBinary        string
-	baseDir           string
-	configDir         string
-	logsDir           string
-	keepLogs          bool
-	volumeServerCount int
-
-	masterPort     int
-	masterGrpcPort int
-
-	volumePorts     []int
-	volumeGrpcPorts []int
-	volumePubPorts  []int
-
-	masterCmd  *exec.Cmd
-	volumeCmds []*exec.Cmd
-
-	cleanupOnce sync.Once
-}
-
-// StartMultiVolumeCluster starts a cluster with a specified number of volume servers
-func StartMultiVolumeCluster(t testing.TB, profile matrix.Profile, serverCount int) *MultiVolumeCluster {
-	t.Helper()
-
-	if serverCount < 1 {
-		t.Fatalf("serverCount must be at least 1, got %d", serverCount)
-	}
-
-	weedBinary, err := FindOrBuildWeedBinary()
-	if err != nil {
-		t.Fatalf("resolve weed binary: %v", err)
-	}
-
-	baseDir, keepLogs, err := newWorkDir()
-	if err != nil {
-		t.Fatalf("create temp test directory: %v", err)
-	}
-
-	configDir := filepath.Join(baseDir, "config")
-	logsDir := filepath.Join(baseDir, "logs")
-	masterDataDir := filepath.Join(baseDir, "master")
-
-	// Create directories for master and all volume servers
-	dirs := []string{configDir, logsDir, masterDataDir}
-	for i := 0; i < serverCount; i++ {
-		dirs = append(dirs, filepath.Join(baseDir, fmt.Sprintf("volume%d", i)))
-	}
-	for _, dir := range dirs {
-		if mkErr := os.MkdirAll(dir, 0o755); mkErr != nil {
-			t.Fatalf("create %s: %v", dir, mkErr)
-		}
-	}
-
-	if err = writeSecurityConfig(configDir, profile); err != nil {
-		t.Fatalf("write security config: %v", err)
-	}
-
-	masterPort, masterGrpcPort, err := allocateMasterPortPair()
-	if err != nil {
-		t.Fatalf("allocate master port pair: %v", err)
-	}
-
-	// Allocate ports for all volume servers (3 ports per server: admin, grpc, public)
-	// If SplitPublicPort is true, we need an additional port per server
-	portsPerServer := 3
-	if profile.SplitPublicPort {
-		portsPerServer = 4
-	}
-	totalPorts := serverCount * portsPerServer
-	ports, err := allocatePorts(totalPorts)
-	if err != nil {
-		t.Fatalf("allocate volume ports: %v", err)
-	}
-
-	c := &MultiVolumeCluster{
-		testingTB:         t,
-		profile:           profile,
-		weedBinary:        weedBinary,
-		baseDir:           baseDir,
-		configDir:         configDir,
-		logsDir:           logsDir,
-		keepLogs:          keepLogs,
-		volumeServerCount: serverCount,
-		masterPort:        masterPort,
-		masterGrpcPort:    masterGrpcPort,
-		volumePorts:       make([]int, serverCount),
-		volumeGrpcPorts:   make([]int, serverCount),
-		volumePubPorts:    make([]int, serverCount),
-		volumeCmds:        make([]*exec.Cmd, serverCount),
-	}
-
-	// Assign ports to each volume server
-	for i := 0; i < serverCount; i++ {
-		baseIdx := i * portsPerServer
-		c.volumePorts[i] = ports[baseIdx]
-		c.volumeGrpcPorts[i] = ports[baseIdx+1]
-
-		// Assign public port, using baseIdx+3 if SplitPublicPort, else baseIdx+2
-		pubPortIdx := baseIdx + 2
-		if profile.SplitPublicPort {
-			pubPortIdx = baseIdx + 3
-		}
-		c.volumePubPorts[i] = ports[pubPortIdx]
-	}
-
-	// Start master
-	if err = c.startMaster(masterDataDir); err != nil {
-		c.Stop()
-		t.Fatalf("start master: %v", err)
-	}
-	if err = c.waitForHTTP(c.MasterURL() + "/dir/status"); err != nil {
-		masterLog := c.tailLog("master.log")
-		c.Stop()
-		t.Fatalf("wait for master readiness: %v\nmaster log tail:\n%s", err, masterLog)
-	}
-
-	// Start all volume servers
-	for i := 0; i < serverCount; i++ {
-		volumeDataDir := filepath.Join(baseDir, fmt.Sprintf("volume%d", i))
-		if err = c.startVolume(i, volumeDataDir); err != nil {
-			// Log current server's log for debugging startup failures
-			volumeLog := fmt.Sprintf("volume%d.log", i)
-			c.Stop()
-			t.Fatalf("start volume server %d: %v\nvolume log tail:\n%s", i, err, c.tailLog(volumeLog))
-		}
-		if err = c.waitForHTTP(c.VolumeAdminURL(i) + "/status"); err != nil {
-			volumeLog := fmt.Sprintf("volume%d.log", i)
-			c.Stop()
-			t.Fatalf("wait for volume server %d readiness: %v\nvolume log tail:\n%s", i, err, c.tailLog(volumeLog))
-		}
-		if err = c.waitForTCP(c.VolumeGRPCAddress(i)); err != nil {
-			volumeLog := fmt.Sprintf("volume%d.log", i)
-			c.Stop()
-			t.Fatalf("wait for volume server %d grpc readiness: %v\nvolume log tail:\n%s", i, err, c.tailLog(volumeLog))
-		}
-	}
-
-	t.Cleanup(func() {
-		c.Stop()
-	})
-
-	return c
-}
-
-// StartTripleVolumeCluster is a convenience wrapper that starts a cluster with 3 volume servers
-func StartTripleVolumeCluster(t testing.TB, profile matrix.Profile) *MultiVolumeCluster {
-	return StartMultiVolumeCluster(t, profile, 3)
-}
-
-func (c *MultiVolumeCluster) Stop() {
-	if c == nil {
-		return
-	}
-	c.cleanupOnce.Do(func() {
-		// Stop volume servers in reverse order
-		for i := len(c.volumeCmds) - 1; i >= 0; i-- {
-			stopProcess(c.volumeCmds[i])
-		}
-		stopProcess(c.masterCmd)
-		if !c.keepLogs && !c.testingTB.Failed() {
-			_ = os.RemoveAll(c.baseDir)
-		} else if c.baseDir != "" {
-			c.testingTB.Logf("volume server integration logs kept at %s", c.baseDir)
-		}
-	})
-}
-
-func (c *MultiVolumeCluster) startMaster(dataDir string) error {
-	logFile, err := os.Create(filepath.Join(c.logsDir, "master.log"))
-	if err != nil {
-		return err
-	}
-
-	args := []string{
-		"-config_dir=" + c.configDir,
-		"master",
-		"-ip=127.0.0.1",
-		"-port=" + strconv.Itoa(c.masterPort),
-		"-port.grpc=" + strconv.Itoa(c.masterGrpcPort),
-		"-mdir=" + dataDir,
-		"-peers=none",
-		"-volumeSizeLimitMB=" + strconv.Itoa(testVolumeSizeLimitMB),
-		"-defaultReplication=000",
-	}
-
-	c.masterCmd = exec.Command(c.weedBinary, args...)
-	c.masterCmd.Dir = c.baseDir
-	c.masterCmd.Stdout = logFile
-	c.masterCmd.Stderr = logFile
-	return c.masterCmd.Start()
-}
-
-func (c *MultiVolumeCluster) startVolume(index int, dataDir string) error {
-	logName := fmt.Sprintf("volume%d.log", index)
-	logFile, err := os.Create(filepath.Join(c.logsDir, logName))
-	if err != nil {
-		return err
-	}
-
-	args := []string{
-		"-config_dir=" + c.configDir,
-		"volume",
-		"-ip=127.0.0.1",
-		"-port=" + strconv.Itoa(c.volumePorts[index]),
-		"-port.grpc=" + strconv.Itoa(c.volumeGrpcPorts[index]),
-		"-port.public=" + strconv.Itoa(c.volumePubPorts[index]),
-		"-dir=" + dataDir,
-		"-max=16",
-		"-master=127.0.0.1:" + strconv.Itoa(c.masterPort),
-		"-readMode=" + c.profile.ReadMode,
-		"-concurrentUploadLimitMB=" + strconv.Itoa(c.profile.ConcurrentUploadLimitMB),
-		"-concurrentDownloadLimitMB=" + strconv.Itoa(c.profile.ConcurrentDownloadLimitMB),
-	}
-	if c.profile.InflightUploadTimeout > 0 {
-		args = append(args, "-inflightUploadDataTimeout="+c.profile.InflightUploadTimeout.String())
-	}
-	if c.profile.InflightDownloadTimeout > 0 {
-		args = append(args, "-inflightDownloadDataTimeout="+c.profile.InflightDownloadTimeout.String())
-	}
-
-	cmd := exec.Command(c.weedBinary, args...)
-	cmd.Dir = c.baseDir
-	cmd.Stdout = logFile
-	cmd.Stderr = logFile
-
-	if err = cmd.Start(); err != nil {
-		return err
-	}
-	c.volumeCmds[index] = cmd
-	return nil
-}
-
-func (c *MultiVolumeCluster) waitForHTTP(url string) error {
-	return (&Cluster{}).waitForHTTP(url)
-}
-
-func (c *MultiVolumeCluster) waitForTCP(addr string) error {
-	return (&Cluster{}).waitForTCP(addr)
-}
-
-func (c *MultiVolumeCluster) tailLog(logName string) string {
-	return (&Cluster{logsDir: c.logsDir}).tailLog(logName)
-}
-
-func (c *MultiVolumeCluster) MasterAddress() string {
-	return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.masterPort))
-}
-
-func (c *MultiVolumeCluster) MasterURL() string {
-	return "http://" + c.MasterAddress()
-}
-
-func (c *MultiVolumeCluster) VolumeAdminAddress(index int) string {
-	if index < 0 || index >= len(c.volumePorts) {
-		return ""
-	}
-	return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.volumePorts[index]))
-}
-
-func (c *MultiVolumeCluster) VolumePublicAddress(index int) string {
-	if index < 0 || index >= len(c.volumePubPorts) {
-		return ""
-	}
-	return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.volumePubPorts[index]))
-}
-
-func (c *MultiVolumeCluster) VolumeGRPCAddress(index int) string {
-	if index < 0 || index >= len(c.volumeGrpcPorts) {
-		return ""
-	}
-	return net.JoinHostPort("127.0.0.1", strconv.Itoa(c.volumeGrpcPorts[index]))
-}
-
-func (c *MultiVolumeCluster) VolumeAdminURL(index int) string {
-	return "http://" + c.VolumeAdminAddress(index)
-}
-
-func (c *MultiVolumeCluster) VolumePublicURL(index int) string {
-	return "http://" + c.VolumePublicAddress(index)
-}
-
-func (c *MultiVolumeCluster) BaseDir() string {
-	return c.baseDir
-}

test/volume_server/grpc/move_tail_timestamp_test.go

@@ -1,285 +0,0 @@
-package volume_server_grpc_test
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/seaweedfs/seaweedfs/test/volume_server/framework"
-	"github.com/seaweedfs/seaweedfs/test/volume_server/matrix"
-	"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
-	"github.com/seaweedfs/seaweedfs/weed/storage"
-	"github.com/seaweedfs/seaweedfs/weed/storage/backend"
-	"github.com/seaweedfs/seaweedfs/weed/storage/idx"
-	"github.com/seaweedfs/seaweedfs/weed/storage/needle"
-	"github.com/seaweedfs/seaweedfs/weed/storage/types"
-	"github.com/seaweedfs/seaweedfs/weed/util"
-)
-
-func TestVolumeCopyReturnsPreciseLastAppendTimestamp(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
-
-	cluster := framework.StartDualVolumeCluster(t, matrix.P1())
-	sourceConn, sourceClient := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(0))
-	defer sourceConn.Close()
-	destConn, destClient := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(1))
-	defer destConn.Close()
-
-	const volumeID = uint32(999)
-	framework.AllocateVolume(t, sourceClient, volumeID, "")
-
-	httpClient := framework.NewHTTPClient()
-	fid := framework.NewFileID(volumeID, 1, 0x42)
-	payload := []byte("move-tail-timestamp-payload")
-	uploadResp := framework.UploadBytes(t, httpClient, cluster.VolumeAdminURL(0), fid, payload)
-	_ = framework.ReadAllAndClose(t, uploadResp)
-	if uploadResp.StatusCode != http.StatusCreated {
-		t.Fatalf("source upload failed: status %d", uploadResp.StatusCode)
-	}
-
-	sourceDir := filepath.Join(cluster.BaseDir(), "volume0")
-	datPath := storage.VolumeFileName(sourceDir, "", int(volumeID)) + ".dat"
-	futureTime := time.Now().Add(2 * time.Hour)
-	if err := os.Chtimes(datPath, futureTime, futureTime); err != nil {
-		t.Fatalf("set future dat timestamp: %v", err)
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	sourceDataNode := cluster.VolumeAdminAddress(0) + "." + strings.Split(cluster.VolumeGRPCAddress(0), ":")[1]
-	copyStream, err := destClient.VolumeCopy(ctx, &volume_server_pb.VolumeCopyRequest{
-		VolumeId:       volumeID,
-		SourceDataNode: sourceDataNode,
-	})
-	if err != nil {
-		t.Fatalf("VolumeCopy start failed: %v", err)
-	}
-
-	var lastAppendAtNs uint64
-	for {
-		resp, recvErr := copyStream.Recv()
-		if recvErr == io.EOF {
-			break
-		}
-		if recvErr != nil {
-			t.Fatalf("VolumeCopy recv failed: %v", recvErr)
-		}
-		if ts := resp.GetLastAppendAtNs(); ts > 0 {
-			lastAppendAtNs = ts
-		}
-	}
-	if lastAppendAtNs == 0 {
-		t.Fatalf("volume copy did not return a last append timestamp")
-	}
-
-	destDir := filepath.Join(cluster.BaseDir(), "volume1")
-	actualLastAppend := readLastAppendAtNs(t, destDir, volumeID)
-	if actualLastAppend == 0 {
-		t.Fatalf("failed to compute last append timestamp from destination files")
-	}
-
-	if lastAppendAtNs != actualLastAppend {
-		t.Fatalf("last append timestamp mismatch: got %d, actual %d", lastAppendAtNs, actualLastAppend)
-	}
-}
-
-func readLastAppendAtNs(t testing.TB, volumeDir string, volumeID uint32) uint64 {
-	t.Helper()
-
-	baseName := storage.VolumeFileName(volumeDir, "", int(volumeID))
-	idxPath := baseName + ".idx"
-	idxFile, err := os.Open(idxPath)
-	if err != nil {
-		t.Fatalf("open idx file %s: %v", idxPath, err)
-	}
-	defer idxFile.Close()
-
-	stat, err := idxFile.Stat()
-	if err != nil {
-		t.Fatalf("stat idx file %s: %v", idxPath, err)
-	}
-	if stat.Size() == 0 {
-		return 0
-	}
-	if stat.Size()%int64(types.NeedleMapEntrySize) != 0 {
-		t.Fatalf("unexpected idx file size %d", stat.Size())
-	}
-
-	buf := make([]byte, types.NeedleMapEntrySize)
-	if _, err := idxFile.ReadAt(buf, stat.Size()-int64(types.NeedleMapEntrySize)); err != nil {
-		t.Fatalf("read idx entry: %v", err)
-	}
-	_, offset, _ := idx.IdxFileEntry(buf)
-	if offset.IsZero() {
-		return 0
-	}
-
-	datPath := baseName + ".dat"
-	datFile, err := os.Open(datPath)
-	if err != nil {
-		t.Fatalf("open dat file %s: %v", datPath, err)
-	}
-	defer datFile.Close()
-
-	datBackend := backend.NewDiskFile(datFile)
-	n, _, _, err := needle.ReadNeedleHeader(datBackend, needle.GetCurrentVersion(), offset.ToActualOffset())
-	if err != nil {
-		t.Fatalf("read needle header: %v", err)
-	}
-
-	tailOffset := offset.ToActualOffset() + int64(types.NeedleHeaderSize) + int64(n.Size)
-	tail := make([]byte, needle.NeedleChecksumSize+types.TimestampSize)
-	readCount, readErr := datBackend.ReadAt(tail, tailOffset)
-	if readErr == io.EOF && readCount == len(tail) {
-		readErr = nil
-	}
-	if readErr != nil {
-		t.Fatalf("read needle tail: %v", readErr)
-	}
-
-	return util.BytesToUint64(tail[needle.NeedleChecksumSize : needle.NeedleChecksumSize+types.TimestampSize])
-}
-
-func TestVolumeMoveHandlesInFlightWrites(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
-
-	cluster := framework.StartDualVolumeCluster(t, matrix.P1())
-	sourceConn, sourceClient := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(0))
-	defer sourceConn.Close()
-	destConn, destClient := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(1))
-	defer destConn.Close()
-
-	const volumeID = uint32(988)
-	framework.AllocateVolume(t, sourceClient, volumeID, "")
-
-	httpClient := framework.NewHTTPClient()
-	fid := framework.NewFileID(volumeID, 7, 0xABCDEF01)
-	payload := []byte("volume-move-live-payload")
-	uploadResp := framework.UploadBytes(t, httpClient, cluster.VolumeAdminURL(0), fid, payload)
-	_ = framework.ReadAllAndClose(t, uploadResp)
-	if uploadResp.StatusCode != http.StatusCreated {
-		t.Fatalf("initial upload failed: %d", uploadResp.StatusCode)
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	sourceDataNode := cluster.VolumeAdminAddress(0) + "." + strings.Split(cluster.VolumeGRPCAddress(0), ":")[1]
-	copyStream, err := destClient.VolumeCopy(ctx, &volume_server_pb.VolumeCopyRequest{
-		VolumeId:       volumeID,
-		SourceDataNode: sourceDataNode,
-	})
-	if err != nil {
-		t.Fatalf("VolumeCopy start failed: %v", err)
-	}
-
-	var lastAppendAtNs uint64
-	for {
-		resp, recvErr := copyStream.Recv()
-		if recvErr == io.EOF {
-			break
-		}
-		if recvErr != nil {
-			t.Fatalf("VolumeCopy recv failed: %v", recvErr)
-		}
-		if ts := resp.GetLastAppendAtNs(); ts > 0 {
-			lastAppendAtNs = ts
-		}
-	}
-	if lastAppendAtNs == 0 {
-		t.Fatalf("volume copy did not return a last append timestamp")
-	}
-
-	type written struct {
-		fid  string
-		data []byte
-	}
-
-	var writesMu sync.Mutex
-	var writes []written
-	var uploadErr error
-	writeCtx, writeCancel := context.WithCancel(context.Background())
-	var writerWG sync.WaitGroup
-	writerWG.Add(1)
-	go func() {
-		defer writerWG.Done()
-		client := framework.NewHTTPClient()
-		for i := 0; i < 12; i++ {
-			select {
-			case <-writeCtx.Done():
-				return
-			default:
-			}
-			livePayload := []byte("live-data-" + fmt.Sprintf("%02d", i))
-			liveFid := framework.NewFileID(volumeID, uint64(2000+i), 0xAAAA1111+uint32(i))
-			resp := framework.UploadBytes(t, client, cluster.VolumeAdminURL(0), liveFid, livePayload)
-			_ = framework.ReadAllAndClose(t, resp)
-			if resp.StatusCode != http.StatusCreated {
-				uploadErr = fmt.Errorf("live upload failed: %d", resp.StatusCode)
-				return
-			}
-			writesMu.Lock()
-			writes = append(writes, written{fid: liveFid, data: livePayload})
-			writesMu.Unlock()
-			time.Sleep(250 * time.Millisecond)
-		}
-	}()
-
-	tailCtx, tailCancel := context.WithTimeout(context.Background(), 60*time.Second)
-	defer tailCancel()
-	_, err = destClient.VolumeTailReceiver(tailCtx, &volume_server_pb.VolumeTailReceiverRequest{
-		VolumeId:           volumeID,
-		SourceVolumeServer: sourceDataNode,
-		SinceNs:            lastAppendAtNs,
-		IdleTimeoutSeconds: 3,
-	})
-	if err != nil {
-		writeCancel()
-		writerWG.Wait()
-		t.Fatalf("VolumeTailReceiver failed: %v", err)
-	}
-
-	writeCancel()
-	writerWG.Wait()
-
-	if uploadErr != nil {
-		t.Fatalf("upload goroutine error: %v", uploadErr)
-	}
-
-	writesMu.Lock()
-	sampleCount := len(writes)
-	if sampleCount == 0 {
-		writesMu.Unlock()
-		t.Fatal("no live writes captured")
-	}
-	sample := writes
-	if sampleCount > 3 {
-		sample = writes[sampleCount-3:]
-	}
-	writesMu.Unlock()
-
-	httpCheckClient := framework.NewHTTPClient()
-	for _, w := range sample {
-		resp := framework.ReadBytes(t, httpCheckClient, cluster.VolumeAdminURL(1), w.fid)
-		body := framework.ReadAllAndClose(t, resp)
-		if resp.StatusCode != http.StatusOK {
-			t.Fatalf("dest read %s status %d", w.fid, resp.StatusCode)
-		}
-		if !bytes.Equal(body, w.data) {
-			t.Fatalf("dest read body mismatch for %s: %q vs %q", w.fid, string(body), string(w.data))
-		}
-	}
-}

test/volume_server/merge/volume_merge_test.go

@@ -1,454 +0,0 @@
-package volume_server_merge_test
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/seaweedfs/seaweedfs/test/volume_server/framework"
-	"github.com/seaweedfs/seaweedfs/test/volume_server/matrix"
-	"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
-)
-
-// runWeedShell executes a weed shell command by providing commands via stdin with lock/unlock.
-// It uses a timeout to prevent hanging if the weed shell process becomes unresponsive.
-func runWeedShell(t *testing.T, weedBinary, masterAddr, shellCommand string) (output string, err error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	cmd := exec.CommandContext(ctx, weedBinary, "shell", "-master="+masterAddr)
-	// Wrap command in lock/unlock for cluster-wide operations
-	shellCommands := "lock\n" + shellCommand + "\nunlock\nexit\n"
-	cmd.Stdin = strings.NewReader(shellCommands)
-	outputBytes, err := cmd.CombinedOutput()
-	output = string(outputBytes)
-	if err != nil {
-		if ctx.Err() == context.DeadlineExceeded {
-			t.Logf("weed shell command '%s' timed out after 30s", shellCommand)
-		} else {
-			t.Logf("weed shell command '%s' output: %s, error: %v", shellCommand, output, err)
-		}
-	}
-	return output, err
-}
-
-// TestVolumeMergeBasic verifies the basic volume.merge workflow using the weed shell command
-func TestVolumeMergeBasic(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
-
-	// Start a triple cluster with 3 volume servers (needed for merge which allocates to a third location)
-	cluster := framework.StartTripleVolumeCluster(t, matrix.P1())
-
-	// Connect to volume servers to allocate volumes
-	conn0, volumeClient0 := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(0))
-	defer conn0.Close()
-
-	conn1, volumeClient1 := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(1))
-	defer conn1.Close()
-
-	const volumeID = uint32(100)
-
-	// Allocate volume on only 2 servers (replicas)
-	// The merge command will allocate on the 3rd server as a temporary location
-	framework.AllocateVolume(t, volumeClient0, volumeID, "")
-	framework.AllocateVolume(t, volumeClient1, volumeID, "")
-
-	t.Logf("Successfully allocated volume %d on servers 0 and 1 as replicas", volumeID)
-
-	// Get weed binary
-	weedBinary := os.Getenv("WEED_BINARY")
-	if weedBinary == "" {
-		var err error
-		weedBinary, err = framework.FindOrBuildWeedBinary()
-		if err != nil {
-			t.Fatalf("failed to find weed binary: %v", err)
-		}
-	}
-
-	// Execute volume.merge command via weed shell
-	output, err := runWeedShell(t, weedBinary, cluster.MasterAddress(), fmt.Sprintf("volume.merge -volumeId %d", volumeID))
-
-	t.Logf("volume.merge command output:\n%s", output)
-
-	if err != nil {
-		t.Fatalf("volume.merge command failed: %v\noutput: %s", err, output)
-	}
-
-	// Verify the success message in output
-	if !strings.Contains(output, fmt.Sprintf("merged volume %d", volumeID)) {
-		t.Fatalf("expected success message in output, got: %s", output)
-	}
-
-	t.Logf("Successfully executed volume.merge command for volume %d", volumeID)
-}
-
-// TestVolumeMergeReadonly verifies that volume.merge requires readonly state
-func TestVolumeMergeReadonly(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
-
-	cluster := framework.StartTripleVolumeCluster(t, matrix.P1())
-
-	// Connect to volume servers
-	conn0, volumeClient0 := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(0))
-	defer conn0.Close()
-
-	conn1, volumeClient1 := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(1))
-	defer conn1.Close()
-
-	const volumeID = uint32(101)
-
-	// Allocate volumes on only 2 servers (the merge will allocate on the 3rd)
-	framework.AllocateVolume(t, volumeClient0, volumeID, "")
-	framework.AllocateVolume(t, volumeClient1, volumeID, "")
-
-	// Get weed binary
-	weedBinary := os.Getenv("WEED_BINARY")
-	if weedBinary == "" {
-		var err error
-		weedBinary, err = framework.FindOrBuildWeedBinary()
-		if err != nil {
-			t.Fatalf("failed to find weed binary: %v", err)
-		}
-	}
-
-	// Test 1: Merge while writable (merge command will mark volumes readonly as needed)
-	output, err := runWeedShell(t, weedBinary, cluster.MasterAddress(), fmt.Sprintf("volume.merge -volumeId %d", volumeID))
-	if err != nil {
-		t.Logf("merge on writable volumes failed: %v\noutput: %s", err, output)
-		t.Fatalf("volume.merge should work on writable volumes (marks them readonly internally)")
-	}
-
-	if !strings.Contains(output, fmt.Sprintf("merged volume %d", volumeID)) {
-		t.Fatalf("expected success message in output, got: %s", output)
-	}
-
-	// Verify volumes were marked readonly during merge and restored after
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	// Check that volumes are writable again after merge (were restored)
-	status0, err := volumeClient0.VolumeStatus(ctx, &volume_server_pb.VolumeStatusRequest{
-		VolumeId: volumeID,
-	})
-	if err != nil {
-		t.Fatalf("failed to get status after merge: %v", err)
-	}
-
-	status1, err := volumeClient1.VolumeStatus(ctx, &volume_server_pb.VolumeStatusRequest{
-		VolumeId: volumeID,
-	})
-	if err != nil {
-		t.Fatalf("failed to get status from server 1 after merge: %v", err)
-	}
-
-	if status0.GetIsReadOnly() {
-		t.Fatalf("expected volume to be writable again after merge on server 0")
-	}
-
-	if status1.GetIsReadOnly() {
-		t.Fatalf("expected volume to be writable again after merge on server 1")
-	}
-
-	t.Logf("Successfully tested merge on writable volumes and writable restoration")
-}
-
-// TestVolumeMergeRestore verifies that merge restores writable state for originally-writable replicas
-func TestVolumeMergeRestore(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
-
-	cluster := framework.StartTripleVolumeCluster(t, matrix.P1())
-
-	conn0, volumeClient0 := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(0))
-	defer conn0.Close()
-
-	conn1, volumeClient1 := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(1))
-	defer conn1.Close()
-
-	const volumeID = uint32(102)
-
-	// Allocate volume on only 2 servers (the merge will allocate on the 3rd)
-	framework.AllocateVolume(t, volumeClient0, volumeID, "")
-	framework.AllocateVolume(t, volumeClient1, volumeID, "")
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	// Mark both as readonly
-	_, err := volumeClient0.VolumeMarkReadonly(ctx, &volume_server_pb.VolumeMarkReadonlyRequest{
-		VolumeId: volumeID,
-		Persist:  false,
-	})
-	if err != nil {
-		t.Fatalf("failed to mark readonly: %v", err)
-	}
-
-	_, err = volumeClient1.VolumeMarkReadonly(ctx, &volume_server_pb.VolumeMarkReadonlyRequest{
-		VolumeId: volumeID,
-		Persist:  false,
-	})
-	if err != nil {
-		t.Fatalf("failed to mark readonly on server 1: %v", err)
-	}
-
-	// Get weed binary
-	weedBinary := os.Getenv("WEED_BINARY")
-	if weedBinary == "" {
-		var err error
-		weedBinary, err = framework.FindOrBuildWeedBinary()
-		if err != nil {
-			t.Fatalf("failed to find weed binary: %v", err)
-		}
-	}
-
-	// Execute volume.merge via shell
-	output, err := runWeedShell(t, weedBinary, cluster.MasterAddress(), fmt.Sprintf("volume.merge -volumeId %d", volumeID))
-
-	t.Logf("volume.merge output: %s, error: %v", output, err)
-
-	if err != nil {
-		t.Fatalf("volume.merge failed: %v\noutput: %s", err, output)
-	}
-
-	if !strings.Contains(output, fmt.Sprintf("merged volume %d", volumeID)) {
-		t.Fatalf("expected success message in output, got: %s", output)
-	}
-
-	// After merge, verify that originally-writable replicas are writable again
-	// (The merge command should restore writable state for replicas that were writable before readonly)
-	// Actually both were writable initially, then marked readonly, so both should be restored
-
-	// Poll for writable state restoration instead of fixed sleep
-	maxRetries := 50 // ~5s total with 100ms sleeps
-	for retries := 0; retries < maxRetries; retries++ {
-		status0, err := volumeClient0.VolumeStatus(ctx, &volume_server_pb.VolumeStatusRequest{
-			VolumeId: volumeID,
-		})
-		if err == nil && !status0.GetIsReadOnly() {
-			// Server 0 is writable, check server 1
-			status1, err := volumeClient1.VolumeStatus(ctx, &volume_server_pb.VolumeStatusRequest{
-				VolumeId: volumeID,
-			})
-			if err == nil && !status1.GetIsReadOnly() {
-				// Both are writable, break out
-				break
-			}
-		}
-		if retries < maxRetries-1 {
-			time.Sleep(100 * time.Millisecond)
-		}
-	}
-
-	status0Final, err := volumeClient0.VolumeStatus(ctx, &volume_server_pb.VolumeStatusRequest{
-		VolumeId: volumeID,
-	})
-	if err != nil {
-		t.Fatalf("failed to get final status for server 0: %v", err)
-	}
-
-	status1Final, err := volumeClient1.VolumeStatus(ctx, &volume_server_pb.VolumeStatusRequest{
-		VolumeId: volumeID,
-	})
-	if err != nil {
-		t.Fatalf("failed to get final status for server 1: %v", err)
-	}
-
-	if status0Final.GetIsReadOnly() {
-		t.Fatalf("expected volume %d to be writable on server 0 after merge, but it's still readonly", volumeID)
-	}
-
-	if status1Final.GetIsReadOnly() {
-		t.Fatalf("expected volume %d to be writable on server 1 after merge, but it's still readonly", volumeID)
-	}
-
-	t.Logf("After merge - volume %d on server 0: readonly=%v, server 1: readonly=%v", volumeID, status0Final.GetIsReadOnly(), status1Final.GetIsReadOnly())
-
-	t.Logf("Successfully tested merge and restore workflow for volume %d", volumeID)
-}
-
-// TestVolumeMergeTailNeedles verifies the volume.merge command with empty volumes
-func TestVolumeMergeTailNeedles(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
-
-	cluster := framework.StartTripleVolumeCluster(t, matrix.P1())
-
-	conn0, volumeClient0 := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(0))
-	defer conn0.Close()
-
-	conn1, volumeClient1 := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(1))
-	defer conn1.Close()
-
-	const volumeID = uint32(200)
-
-	// Allocate empty volumes on only 2 servers (the merge will allocate on the 3rd)
-	framework.AllocateVolume(t, volumeClient0, volumeID, "")
-	framework.AllocateVolume(t, volumeClient1, volumeID, "")
-
-	// Mark as readonly
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	_, err := volumeClient0.VolumeMarkReadonly(ctx, &volume_server_pb.VolumeMarkReadonlyRequest{
-		VolumeId: volumeID,
-		Persist:  false,
-	})
-	if err != nil {
-		t.Fatalf("failed to mark readonly on server 0: %v", err)
-	}
-
-	_, err = volumeClient1.VolumeMarkReadonly(ctx, &volume_server_pb.VolumeMarkReadonlyRequest{
-		VolumeId: volumeID,
-		Persist:  false,
-	})
-	if err != nil {
-		t.Fatalf("failed to mark readonly on server 1: %v", err)
-	}
-
-	// Get weed binary
-	weedBinary := os.Getenv("WEED_BINARY")
-	if weedBinary == "" {
-		var err error
-		weedBinary, err = framework.FindOrBuildWeedBinary()
-		if err != nil {
-			t.Fatalf("failed to find weed binary: %v", err)
-		}
-	}
-
-	// Execute volume.merge command on empty volumes
-	output, err := runWeedShell(t, weedBinary, cluster.MasterAddress(), fmt.Sprintf("volume.merge -volumeId %d", volumeID))
-
-	t.Logf("merge empty volumes - output: %s, error: %v", output, err)
-
-	if err != nil {
-		t.Fatalf("volume.merge failed on empty volumes: %v\noutput: %s", err, output)
-	}
-
-	// Verify merge completed successfully
-	if !strings.Contains(output, fmt.Sprintf("merged volume %d", volumeID)) {
-		t.Fatalf("expected success message in output, got: %s", output)
-	}
-
-	t.Logf("Successfully merged empty volumes %d", volumeID)
-}
-
-// TestVolumeMergeDivergentReplicas simulates a realistic merge scenario using shell command
-func TestVolumeMergeDivergentReplicas(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
-
-	cluster := framework.StartTripleVolumeCluster(t, matrix.P1())
-
-	// Connect to both servers
-	conn0, volumeClient0 := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(0))
-	defer conn0.Close()
-
-	conn1, volumeClient1 := framework.DialVolumeServer(t, cluster.VolumeGRPCAddress(1))
-	defer conn1.Close()
-
-	const volumeID = uint32(201)
-
-	// Allocate the same volume on only 2 servers (the merge will allocate on the 3rd)
-	framework.AllocateVolume(t, volumeClient0, volumeID, "")
-	framework.AllocateVolume(t, volumeClient1, volumeID, "")
-
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	// Verify both volumes are initially writable
-	status0, err := volumeClient0.VolumeStatus(ctx, &volume_server_pb.VolumeStatusRequest{
-		VolumeId: volumeID,
-	})
-	if err != nil {
-		t.Fatalf("failed to get status for server 0: %v", err)
-	}
-
-	status1, err := volumeClient1.VolumeStatus(ctx, &volume_server_pb.VolumeStatusRequest{
-		VolumeId: volumeID,
-	})
-	if err != nil {
-		t.Fatalf("failed to get status for server 1: %v", err)
-	}
-
-	if status0.GetIsReadOnly() || status1.GetIsReadOnly() {
-		t.Fatalf("expected both volumes to be writable initially")
-	}
-
-	// Mark both as readonly to simulate merge precondition
-	_, err = volumeClient0.VolumeMarkReadonly(ctx, &volume_server_pb.VolumeMarkReadonlyRequest{
-		VolumeId: volumeID,
-		Persist:  false,
-	})
-	if err != nil {
-		t.Fatalf("failed to mark readonly on server 0: %v", err)
-	}
-
-	_, err = volumeClient1.VolumeMarkReadonly(ctx, &volume_server_pb.VolumeMarkReadonlyRequest{
-		VolumeId: volumeID,
-		Persist:  false,
-	})
-	if err != nil {
-		t.Fatalf("failed to mark readonly on server 1: %v", err)
-	}
-
-	// Verify both are readonly
-	status0Again, err := volumeClient0.VolumeStatus(ctx, &volume_server_pb.VolumeStatusRequest{
-		VolumeId: volumeID,
-	})
-	if err != nil {
-		t.Fatalf("failed to get status after readonly: %v", err)
-	}
-
-	if !status0Again.GetIsReadOnly() {
-		t.Fatalf("expected volume %d to be readonly", volumeID)
-	}
-
-	// Also verify server 1 is readonly
-	status1Again, err := volumeClient1.VolumeStatus(ctx, &volume_server_pb.VolumeStatusRequest{
-		VolumeId: volumeID,
-	})
-	if err != nil {
-		t.Fatalf("failed to get status on server 1 after readonly: %v", err)
-	}
-
-	if !status1Again.GetIsReadOnly() {
-		t.Fatalf("expected volume %d to be readonly on server 1", volumeID)
-	}
-
-	// Get weed binary
-	weedBinary := os.Getenv("WEED_BINARY")
-	if weedBinary == "" {
-		var err error
-		weedBinary, err = framework.FindOrBuildWeedBinary()
-		if err != nil {
-			t.Fatalf("failed to find weed binary: %v", err)
-		}
-	}
-
-	// Execute volume.merge command via shell
-	output, err := runWeedShell(t, weedBinary, cluster.MasterAddress(), fmt.Sprintf("volume.merge -volumeId %d", volumeID))
-
-	t.Logf("merge divergent replicas - output: %s, error: %v", output, err)
-
-	if err != nil {
-		t.Fatalf("volume.merge failed: %v\noutput: %s", err, output)
-	}
-
-	// Verify merge completed successfully
-	if !strings.Contains(output, fmt.Sprintf("merged volume %d", volumeID)) {
-		t.Fatalf("expected success message in output, got: %s", output)
-	}
-
-	t.Logf("Successfully merged divergent replicas for volume %d using shell command", volumeID)
-}

unmaintained/disk/disk_status.go

@@ -1,4 +1,5 @@
 //go:build !windows && !openbsd && !netbsd && !plan9 && !solaris
+// +build !windows,!openbsd,!netbsd,!plan9,!solaris
 
 package main
 

unmaintained/stress/ec_stress_runner.go

@@ -1,515 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	mrand "math/rand"
-	"net/http"
-	"net/url"
-	"os/signal"
-	"path"
-	"sort"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/seaweedfs/seaweedfs/weed/pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
-	"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
-	"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-)
-
-type config struct {
-	MasterAddresses    []string
-	FilerURL           string
-	PathPrefix         string
-	Collection         string
-	FileSizeBytes      int64
-	BatchSize          int
-	WriteInterval      time.Duration
-	CleanupInterval    time.Duration
-	EcMinAge           time.Duration
-	MaxCleanupPerCycle int
-	RequestTimeout     time.Duration
-	MaxRuntime         time.Duration
-	DryRun             bool
-}
-
-type runner struct {
-	cfg config
-
-	httpClient     *http.Client
-	grpcDialOption grpc.DialOption
-
-	mu            sync.Mutex
-	sequence      int64
-	ecFirstSeenAt map[uint32]time.Time
-	rng           *mrand.Rand
-}
-
-type ecVolumeInfo struct {
-	Collection string
-	NodeShards map[pb.ServerAddress][]uint32
-}
-
-type ecCleanupCandidate struct {
-	VolumeID    uint32
-	FirstSeenAt time.Time
-	Info        *ecVolumeInfo
-}
-
-func main() {
-	cfg, err := loadConfig()
-	if err != nil {
-		log.Fatalf("invalid flags: %v", err)
-	}
-
-	ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
-	defer stop()
-
-	if cfg.MaxRuntime > 0 {
-		runCtx, cancel := context.WithTimeout(ctx, cfg.MaxRuntime)
-		defer cancel()
-		ctx = runCtx
-	}
-
-	r := &runner{
-		cfg:            cfg,
-		httpClient:     &http.Client{Timeout: cfg.RequestTimeout},
-		grpcDialOption: grpc.WithTransportCredentials(insecure.NewCredentials()),
-		ecFirstSeenAt:  make(map[uint32]time.Time),
-		rng:            mrand.New(mrand.NewSource(time.Now().UnixNano())),
-	}
-
-	log.Printf(
-		"starting EC stress runner: masters=%s filer=%s prefix=%s collection=%s file_size=%d batch=%d write_interval=%s cleanup_interval=%s ec_min_age=%s max_cleanup=%d dry_run=%v",
-		strings.Join(cfg.MasterAddresses, ","),
-		cfg.FilerURL,
-		cfg.PathPrefix,
-		cfg.Collection,
-		cfg.FileSizeBytes,
-		cfg.BatchSize,
-		cfg.WriteInterval,
-		cfg.CleanupInterval,
-		cfg.EcMinAge,
-		cfg.MaxCleanupPerCycle,
-		cfg.DryRun,
-	)
-
-	if err := r.run(ctx); err != nil && !errors.Is(err, context.Canceled) && !errors.Is(err, context.DeadlineExceeded) {
-		log.Fatalf("runner stopped with error: %v", err)
-	}
-
-	log.Printf("runner stopped")
-}
-
-func loadConfig() (config, error) {
-	var masters string
-	cfg := config{}
-
-	flag.StringVar(&masters, "masters", "127.0.0.1:9333", "comma-separated master server addresses")
-	flag.StringVar(&cfg.FilerURL, "filer", "http://127.0.0.1:8888", "filer base URL")
-	flag.StringVar(&cfg.PathPrefix, "path_prefix", "/tmp/ec-stress", "filer path prefix for generated files")
-	flag.StringVar(&cfg.Collection, "collection", "ec_stress", "target collection for stress data")
-
-	fileSizeMB := flag.Int("file_size_mb", 8, "size per generated file in MB")
-	flag.IntVar(&cfg.BatchSize, "batch_size", 4, "files generated per write cycle")
-	flag.DurationVar(&cfg.WriteInterval, "write_interval", 5*time.Second, "interval between write cycles")
-	flag.DurationVar(&cfg.CleanupInterval, "cleanup_interval", 2*time.Minute, "interval between EC cleanup cycles")
-	flag.DurationVar(&cfg.EcMinAge, "ec_min_age", 30*time.Minute, "minimum observed EC age before deletion")
-	flag.IntVar(&cfg.MaxCleanupPerCycle, "max_cleanup_per_cycle", 4, "maximum EC volumes deleted per cleanup cycle")
-	flag.DurationVar(&cfg.RequestTimeout, "request_timeout", 20*time.Second, "HTTP/gRPC request timeout")
-	flag.DurationVar(&cfg.MaxRuntime, "max_runtime", 0, "maximum run duration; 0 means run until interrupted")
-	flag.BoolVar(&cfg.DryRun, "dry_run", false, "log actions without deleting EC shards")
-	flag.Parse()
-
-	cfg.MasterAddresses = splitNonEmpty(masters)
-	cfg.FileSizeBytes = int64(*fileSizeMB) * 1024 * 1024
-
-	if len(cfg.MasterAddresses) == 0 {
-		return cfg, fmt.Errorf("at least one master is required")
-	}
-	if cfg.FileSizeBytes <= 0 {
-		return cfg, fmt.Errorf("file_size_mb must be positive")
-	}
-	if cfg.BatchSize <= 0 {
-		return cfg, fmt.Errorf("batch_size must be positive")
-	}
-	if cfg.WriteInterval <= 0 {
-		return cfg, fmt.Errorf("write_interval must be positive")
-	}
-	if cfg.CleanupInterval <= 0 {
-		return cfg, fmt.Errorf("cleanup_interval must be positive")
-	}
-	if cfg.EcMinAge < 0 {
-		return cfg, fmt.Errorf("ec_min_age must be zero or positive")
-	}
-	// Note: EcMinAge == 0 intentionally disables the age guard, making EC volumes eligible for cleanup immediately.
-	if cfg.MaxCleanupPerCycle <= 0 {
-		return cfg, fmt.Errorf("max_cleanup_per_cycle must be positive")
-	}
-	if cfg.RequestTimeout <= 0 {
-		return cfg, fmt.Errorf("request_timeout must be positive")
-	}
-
-	cfg.PathPrefix = ensureLeadingSlash(strings.TrimSpace(cfg.PathPrefix))
-	cfg.Collection = strings.TrimSpace(cfg.Collection)
-
-	cfg.FilerURL = strings.TrimRight(strings.TrimSpace(cfg.FilerURL), "/")
-	if cfg.FilerURL == "" {
-		return cfg, fmt.Errorf("filer URL is required")
-	}
-
-	if _, err := url.ParseRequestURI(cfg.FilerURL); err != nil {
-		return cfg, fmt.Errorf("invalid filer URL %q: %w", cfg.FilerURL, err)
-	}
-
-	return cfg, nil
-}
-
-func (r *runner) run(ctx context.Context) error {
-	writeTicker := time.NewTicker(r.cfg.WriteInterval)
-	defer writeTicker.Stop()
-
-	cleanupTicker := time.NewTicker(r.cfg.CleanupInterval)
-	defer cleanupTicker.Stop()
-
-	r.runWriteCycle(ctx)
-	r.runCleanupCycle(ctx)
-
-	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-writeTicker.C:
-			r.runWriteCycle(ctx)
-		case <-cleanupTicker.C:
-			r.runCleanupCycle(ctx)
-		}
-	}
-}
-
-func (r *runner) runWriteCycle(ctx context.Context) {
-	for i := 0; i < r.cfg.BatchSize; i++ {
-		if ctx.Err() != nil {
-			return
-		}
-		if err := r.uploadOneFile(ctx); err != nil {
-			log.Printf("upload failed: %v", err)
-		}
-	}
-}
-
-func (r *runner) uploadOneFile(ctx context.Context) error {
-	sequence := r.nextSequence()
-	filePath := path.Join(r.cfg.PathPrefix, fmt.Sprintf("ec-stress-%d-%d.bin", time.Now().UnixNano(), sequence))
-	fileURL := r.cfg.FilerURL + filePath
-	if r.cfg.Collection != "" {
-		fileURL += "?collection=" + url.QueryEscape(r.cfg.Collection)
-	}
-
-	uploadCtx, cancel := context.WithTimeout(ctx, r.cfg.RequestTimeout)
-	defer cancel()
-
-	body := io.LimitReader(r.rng, r.cfg.FileSizeBytes)
-	request, err := http.NewRequestWithContext(uploadCtx, http.MethodPut, fileURL, body)
-	if err != nil {
-		return err
-	}
-	request.ContentLength = r.cfg.FileSizeBytes
-	request.Header.Set("Content-Type", "application/octet-stream")
-
-	response, err := r.httpClient.Do(request)
-	if err != nil {
-		return err
-	}
-	defer response.Body.Close()
-
-	io.Copy(io.Discard, response.Body)
-	if response.StatusCode < http.StatusOK || response.StatusCode >= http.StatusMultipleChoices {
-		return fmt.Errorf("upload %s returned %s", filePath, response.Status)
-	}
-
-	log.Printf("uploaded %s size=%d", filePath, r.cfg.FileSizeBytes)
-	return nil
-}
-
-func (r *runner) runCleanupCycle(ctx context.Context) {
-	volumeList, err := r.fetchVolumeList(ctx)
-	if err != nil {
-		log.Printf("cleanup skipped: fetch volume list failed: %v", err)
-		return
-	}
-	if volumeList == nil || volumeList.TopologyInfo == nil {
-		log.Printf("cleanup skipped: topology is empty")
-		return
-	}
-
-	ecVolumes := collectEcVolumes(volumeList.TopologyInfo, r.cfg.Collection)
-	candidates := r.selectCleanupCandidates(ecVolumes)
-	if len(candidates) == 0 {
-		log.Printf("cleanup: no EC volume candidate aged >= %s in collection=%q", r.cfg.EcMinAge, r.cfg.Collection)
-		return
-	}
-
-	log.Printf("cleanup: deleting up to %d EC volumes (found=%d)", r.cfg.MaxCleanupPerCycle, len(candidates))
-	deleted := 0
-	for _, candidate := range candidates {
-		if ctx.Err() != nil {
-			return
-		}
-
-		if r.cfg.DryRun {
-			log.Printf(
-				"cleanup dry-run: would delete EC volume=%d collection=%q seen_for=%s nodes=%d",
-				candidate.VolumeID,
-				candidate.Info.Collection,
-				time.Since(candidate.FirstSeenAt).Round(time.Second),
-				len(candidate.Info.NodeShards),
-			)
-			continue
-		}
-
-		if err := r.deleteEcVolume(ctx, candidate.VolumeID, candidate.Info); err != nil {
-			log.Printf("cleanup volume=%d failed: %v", candidate.VolumeID, err)
-			continue
-		}
-
-		deleted++
-		r.mu.Lock()
-		delete(r.ecFirstSeenAt, candidate.VolumeID)
-		r.mu.Unlock()
-		log.Printf("cleanup volume=%d completed", candidate.VolumeID)
-	}
-
-	log.Printf("cleanup finished: deleted=%d attempted=%d", deleted, len(candidates))
-}
-
-func (r *runner) fetchVolumeList(ctx context.Context) (*master_pb.VolumeListResponse, error) {
-	var lastErr error
-	for _, master := range r.cfg.MasterAddresses {
-		masterAddress := strings.TrimSpace(master)
-		if masterAddress == "" {
-			continue
-		}
-
-		var response *master_pb.VolumeListResponse
-		err := pb.WithMasterClient(false, pb.ServerAddress(masterAddress), r.grpcDialOption, false, func(client master_pb.SeaweedClient) error {
-			callCtx, cancel := context.WithTimeout(ctx, r.cfg.RequestTimeout)
-			defer cancel()
-
-			resp, callErr := client.VolumeList(callCtx, &master_pb.VolumeListRequest{})
-			if callErr != nil {
-				return callErr
-			}
-			response = resp
-			return nil
-		})
-		if err == nil {
-			return response, nil
-		}
-
-		lastErr = err
-	}
-
-	if lastErr == nil {
-		lastErr = fmt.Errorf("no valid master address")
-	}
-	return nil, lastErr
-}
-
-func collectEcVolumes(topology *master_pb.TopologyInfo, collection string) map[uint32]*ecVolumeInfo {
-	normalizedCollection := strings.TrimSpace(collection)
-	volumeShardSets := make(map[uint32]map[pb.ServerAddress]map[uint32]struct{})
-	volumeCollection := make(map[uint32]string)
-
-	for _, dc := range topology.GetDataCenterInfos() {
-		for _, rack := range dc.GetRackInfos() {
-			for _, node := range rack.GetDataNodeInfos() {
-				server := pb.NewServerAddressFromDataNode(node)
-				for _, disk := range node.GetDiskInfos() {
-					for _, shardInfo := range disk.GetEcShardInfos() {
-						if shardInfo == nil || shardInfo.Id == 0 {
-							continue
-						}
-						if normalizedCollection != "" && strings.TrimSpace(shardInfo.Collection) != normalizedCollection {
-							continue
-						}
-
-						shards := erasure_coding.ShardsInfoFromVolumeEcShardInformationMessage(shardInfo).IdsUint32()
-						if len(shards) == 0 {
-							continue
-						}
-
-						perVolume := volumeShardSets[shardInfo.Id]
-						if perVolume == nil {
-							perVolume = make(map[pb.ServerAddress]map[uint32]struct{})
-							volumeShardSets[shardInfo.Id] = perVolume
-						}
-						perNode := perVolume[server]
-						if perNode == nil {
-							perNode = make(map[uint32]struct{})
-							perVolume[server] = perNode
-						}
-						for _, shardID := range shards {
-							perNode[shardID] = struct{}{}
-						}
-						volumeCollection[shardInfo.Id] = shardInfo.Collection
-					}
-				}
-			}
-		}
-	}
-
-	result := make(map[uint32]*ecVolumeInfo, len(volumeShardSets))
-	for volumeID, perNode := range volumeShardSets {
-		info := &ecVolumeInfo{
-			Collection: volumeCollection[volumeID],
-			NodeShards: make(map[pb.ServerAddress][]uint32, len(perNode)),
-		}
-		for server, shardSet := range perNode {
-			shardIDs := make([]uint32, 0, len(shardSet))
-			for shardID := range shardSet {
-				shardIDs = append(shardIDs, shardID)
-			}
-			sort.Slice(shardIDs, func(i, j int) bool { return shardIDs[i] < shardIDs[j] })
-			info.NodeShards[server] = shardIDs
-		}
-		result[volumeID] = info
-	}
-
-	return result
-}
-
-func (r *runner) selectCleanupCandidates(ecVolumes map[uint32]*ecVolumeInfo) []ecCleanupCandidate {
-	now := time.Now()
-
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	for volumeID := range ecVolumes {
-		if _, exists := r.ecFirstSeenAt[volumeID]; !exists {
-			r.ecFirstSeenAt[volumeID] = now
-		}
-	}
-	for volumeID := range r.ecFirstSeenAt {
-		if _, exists := ecVolumes[volumeID]; !exists {
-			delete(r.ecFirstSeenAt, volumeID)
-		}
-	}
-
-	candidates := make([]ecCleanupCandidate, 0, len(ecVolumes))
-	for volumeID, info := range ecVolumes {
-		firstSeenAt := r.ecFirstSeenAt[volumeID]
-		if r.cfg.EcMinAge > 0 && now.Sub(firstSeenAt) < r.cfg.EcMinAge {
-			continue
-		}
-		candidates = append(candidates, ecCleanupCandidate{
-			VolumeID:    volumeID,
-			FirstSeenAt: firstSeenAt,
-			Info:        info,
-		})
-	}
-
-	sort.Slice(candidates, func(i, j int) bool {
-		if candidates[i].FirstSeenAt.Equal(candidates[j].FirstSeenAt) {
-			return candidates[i].VolumeID < candidates[j].VolumeID
-		}
-		return candidates[i].FirstSeenAt.Before(candidates[j].FirstSeenAt)
-	})
-
-	if len(candidates) > r.cfg.MaxCleanupPerCycle {
-		candidates = candidates[:r.cfg.MaxCleanupPerCycle]
-	}
-	return candidates
-}
-
-func (r *runner) deleteEcVolume(ctx context.Context, volumeID uint32, info *ecVolumeInfo) error {
-	if info == nil {
-		return fmt.Errorf("ec volume %d has no topology info", volumeID)
-	}
-
-	failureCount := 0
-	for server, shardIDs := range info.NodeShards {
-		err := pb.WithVolumeServerClient(false, server, r.grpcDialOption, func(client volume_server_pb.VolumeServerClient) error {
-			unmountCtx, unmountCancel := context.WithTimeout(ctx, r.cfg.RequestTimeout)
-			defer unmountCancel()
-			if _, err := client.VolumeEcShardsUnmount(unmountCtx, &volume_server_pb.VolumeEcShardsUnmountRequest{
-				VolumeId: volumeID,
-				ShardIds: shardIDs,
-			}); err != nil {
-				log.Printf("volume %d ec shards unmount on %s failed: %v", volumeID, server, err)
-			}
-
-			if len(shardIDs) > 0 {
-				deleteCtx, deleteCancel := context.WithTimeout(ctx, r.cfg.RequestTimeout)
-				defer deleteCancel()
-				if _, err := client.VolumeEcShardsDelete(deleteCtx, &volume_server_pb.VolumeEcShardsDeleteRequest{
-					VolumeId:   volumeID,
-					Collection: r.cfg.Collection,
-					ShardIds:   shardIDs,
-				}); err != nil {
-					return err
-				}
-			}
-
-			finalDeleteCtx, finalDeleteCancel := context.WithTimeout(ctx, r.cfg.RequestTimeout)
-			defer finalDeleteCancel()
-			if _, err := client.VolumeDelete(finalDeleteCtx, &volume_server_pb.VolumeDeleteRequest{
-				VolumeId: volumeID,
-			}); err != nil {
-				log.Printf("volume %d delete on %s failed: %v", volumeID, server, err)
-			}
-			return nil
-		})
-
-		if err != nil {
-			failureCount++
-			log.Printf("cleanup volume=%d server=%s shards=%v failed: %v", volumeID, server, shardIDs, err)
-		}
-	}
-
-	if failureCount == len(info.NodeShards) && failureCount > 0 {
-		return fmt.Errorf("all shard deletions failed for volume %d", volumeID)
-	}
-	if failureCount > 0 {
-		return fmt.Errorf("partial shard deletion failure for volume %d", volumeID)
-	}
-	return nil
-}
-
-func (r *runner) nextSequence() int64 {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	r.sequence++
-	return r.sequence
-}
-
-func splitNonEmpty(value string) []string {
-	parts := strings.Split(value, ",")
-	result := make([]string, 0, len(parts))
-	for _, part := range parts {
-		trimmed := strings.TrimSpace(part)
-		if trimmed != "" {
-			result = append(result, trimmed)
-		}
-	}
-	return result
-}
-
-func ensureLeadingSlash(value string) string {
-	if value == "" {
-		return "/"
-	}
-	if strings.HasPrefix(value, "/") {
-		return value
-	}
-	return "/" + value
-}

weed/Makefile

@@ -9,14 +9,6 @@ all: install
 install:
 	go install -ldflags="-s -w"
 
-.PHONY: weed-db weed-sql
-
-weed-db:
-	go build -ldflags="-s -w" -o weed-db ./cmd/weed-db
-
-weed-sql:
-	go build -ldflags="-s -w" -o weed-sql ./cmd/weed-sql
-
 build_docker:
 	CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w"
 

weed/admin/Makefile

@@ -23,7 +23,7 @@ install-templ:
 .PHONY: generate
 generate: install-templ
 	@echo "Generating templ files..."
-	@templ generate ./view
+	@cd $(BUILD_DIR) && templ generate
 	@echo "Generated: $(TEMPL_GO_FILES)"
 
 # Clean generated files

weed/admin/dash/admin_data.go

@@ -6,10 +6,10 @@ import (
 	"sort"
 	"time"
 
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/cluster"
 	"github.com/seaweedfs/seaweedfs/weed/glog"
 	"github.com/seaweedfs/seaweedfs/weed/iam"
-	"github.com/seaweedfs/seaweedfs/weed/pb"
 	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
 )
 
@@ -184,28 +184,28 @@ func (s *AdminServer) GetAdminData(username string) (AdminData, error) {
 }
 
 // ShowAdmin displays the main admin page (now uses GetAdminData)
-func (s *AdminServer) ShowAdmin(w http.ResponseWriter, r *http.Request) {
-	username := UsernameFromContext(r.Context())
+func (s *AdminServer) ShowAdmin(c *gin.Context) {
+	username := c.GetString("username")
 
 	adminData, err := s.GetAdminData(username)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get admin data: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get admin data: " + err.Error()})
 		return
 	}
 
 	// Return JSON for API calls
-	writeJSON(w, http.StatusOK, adminData)
+	c.JSON(http.StatusOK, adminData)
 }
 
 // ShowOverview displays cluster overview
-func (s *AdminServer) ShowOverview(w http.ResponseWriter, r *http.Request) {
+func (s *AdminServer) ShowOverview(c *gin.Context) {
 	topology, err := s.GetClusterTopology()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, topology)
+	c.JSON(http.StatusOK, topology)
 }
 
 // getMasterNodesStatus checks status of all master nodes
@@ -233,7 +233,7 @@ func (s *AdminServer) getMasterNodesStatus() []MasterNode {
 	currentMaster := s.masterClient.GetMaster(context.Background())
 	if currentMaster != "" {
 		masterNodes = append(masterNodes, MasterNode{
-			Address:  pb.ServerAddress(currentMaster).ToHttpAddress(),
+			Address:  string(currentMaster),
 			IsLeader: isLeader,
 		})
 	}
@@ -257,7 +257,7 @@ func (s *AdminServer) getFilerNodesStatus() []FilerNode {
 		// Process each filer node
 		for _, node := range resp.ClusterNodes {
 			filerNodes = append(filerNodes, FilerNode{
-				Address:     pb.ServerAddress(node.Address).ToHttpAddress(),
+				Address:     node.Address,
 				DataCenter:  node.DataCenter,
 				Rack:        node.Rack,
 				LastUpdated: time.Now(),

weed/admin/dash/auth_middleware.go

@@ -4,91 +4,81 @@ import (
 	"crypto/subtle"
 	"net/http"
 
-	"github.com/gorilla/sessions"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/glog"
 )
 
-// ShowLogin displays the login page.
-func (s *AdminServer) ShowLogin(w http.ResponseWriter, r *http.Request) {
-	http.Redirect(w, r, "/login", http.StatusSeeOther)
+// ShowLogin displays the login page
+func (s *AdminServer) ShowLogin(c *gin.Context) {
+	// If authentication is not required, redirect to admin
+	session := sessions.Default(c)
+	if session.Get("authenticated") == true {
+		c.Redirect(http.StatusSeeOther, "/admin")
+		return
+	}
+
+	// For now, return a simple login form as JSON
+	c.HTML(http.StatusOK, "login.html", gin.H{
+		"title": "SeaweedFS Admin Login",
+		"error": c.Query("error"),
+	})
 }
 
-// HandleLogin handles login form submission.
-func (s *AdminServer) HandleLogin(store sessions.Store, adminUser, adminPassword, readOnlyUser, readOnlyPassword string) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		if err := r.ParseForm(); err != nil {
-			http.Redirect(w, r, "/login?error=Invalid form submission", http.StatusSeeOther)
-			return
-		}
-		session, err := store.Get(r, sessionName)
-		if err != nil {
-			http.Redirect(w, r, "/login?error=Unable to create session. Please try again or contact administrator.", http.StatusSeeOther)
-			return
-		}
-
-		if err := ValidateSessionCSRFToken(session, r); err != nil {
-			http.Redirect(w, r, "/login?error=Invalid CSRF token", http.StatusSeeOther)
-			return
-		}
-
-		loginUsername := r.FormValue("username")
-		loginPassword := r.FormValue("password")
+// HandleLogin handles login form submission
+func (s *AdminServer) HandleLogin(adminUser, adminPassword, readOnlyUser, readOnlyPassword string) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		loginUsername := c.PostForm("username")
+		loginPassword := c.PostForm("password")
 
 		var role string
 		var authenticated bool
 
-		// Check admin credentials.
+		// Check admin credentials
 		if adminPassword != "" && loginUsername == adminUser && subtle.ConstantTimeCompare([]byte(loginPassword), []byte(adminPassword)) == 1 {
 			role = "admin"
 			authenticated = true
 		} else if readOnlyPassword != "" && loginUsername == readOnlyUser && subtle.ConstantTimeCompare([]byte(loginPassword), []byte(readOnlyPassword)) == 1 {
-			// Check read-only credentials.
+			// Check read-only credentials
 			role = "readonly"
 			authenticated = true
 		}
 
 		if authenticated {
-			for key := range session.Values {
-				delete(session.Values, key)
-			}
-			session.Values["authenticated"] = true
-			session.Values["username"] = loginUsername
-			session.Values["role"] = role
+			session := sessions.Default(c)
+			// Clear any existing invalid session data before setting new values
+			session.Clear()
+			session.Set("authenticated", true)
+			session.Set("username", loginUsername)
+			session.Set("role", role)
 			csrfToken, err := generateCSRFToken()
 			if err != nil {
-				http.Redirect(w, r, "/login?error=Unable to create session. Please try again or contact administrator.", http.StatusSeeOther)
+				c.Redirect(http.StatusSeeOther, "/login?error=Unable to create session. Please try again or contact administrator.")
 				return
 			}
-			session.Values[sessionCSRFTokenKey] = csrfToken
-			if err := session.Save(r, w); err != nil {
-				// Log the detailed error server-side for diagnostics.
+			session.Set(sessionCSRFTokenKey, csrfToken)
+			if err := session.Save(); err != nil {
+				// Log the detailed error server-side for diagnostics
 				glog.Errorf("Failed to save session for user %s: %v", loginUsername, err)
-				http.Redirect(w, r, "/login?error=Unable to create session. Please try again or contact administrator.", http.StatusSeeOther)
+				c.Redirect(http.StatusSeeOther, "/login?error=Unable to create session. Please try again or contact administrator.")
 				return
 			}
 
-			http.Redirect(w, r, "/admin", http.StatusSeeOther)
+			c.Redirect(http.StatusSeeOther, "/admin")
 			return
 		}
 
-		// Authentication failed.
-		http.Redirect(w, r, "/login?error=Invalid credentials", http.StatusSeeOther)
+		// Authentication failed
+		c.Redirect(http.StatusSeeOther, "/login?error=Invalid credentials")
 	}
 }
 
-// HandleLogout handles user logout.
-func (s *AdminServer) HandleLogout(store sessions.Store, w http.ResponseWriter, r *http.Request) {
-	session, err := store.Get(r, sessionName)
-	if err != nil {
-		http.Redirect(w, r, "/login", http.StatusSeeOther)
-		return
-	}
-	for key := range session.Values {
-		delete(session.Values, key)
-	}
-	session.Options.MaxAge = -1
-	if err := session.Save(r, w); err != nil {
+// HandleLogout handles user logout
+func (s *AdminServer) HandleLogout(c *gin.Context) {
+	session := sessions.Default(c)
+	session.Clear()
+	if err := session.Save(); err != nil {
 		glog.Warningf("Failed to save session during logout: %v", err)
 	}
-	http.Redirect(w, r, "/login", http.StatusSeeOther)
+	c.Redirect(http.StatusSeeOther, "/login")
 }

weed/admin/dash/bucket_management.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gorilla/mux"
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
 	"github.com/seaweedfs/seaweedfs/weed/s3api"
 	"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
@@ -29,7 +29,7 @@ type S3BucketsData struct {
 }
 
 type CreateBucketRequest struct {
-	Name                string `json:"name"` // validated manually in CreateBucket
+	Name                string `json:"name" binding:"required"`
 	Region              string `json:"region"`
 	QuotaSize           int64  `json:"quota_size"`            // Quota size in bytes
 	QuotaUnit           string `json:"quota_unit"`            // Unit: MB, GB, TB
@@ -45,51 +45,47 @@ type CreateBucketRequest struct {
 // S3 Bucket Management Handlers
 
 // ShowS3Buckets displays the Object Store buckets management page
-func (s *AdminServer) ShowS3Buckets(w http.ResponseWriter, r *http.Request) {
-	username := UsernameFromContext(r.Context())
+func (s *AdminServer) ShowS3Buckets(c *gin.Context) {
+	username := c.GetString("username")
 
 	data, err := s.GetS3BucketsData()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get Object Store buckets: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get Object Store buckets: " + err.Error()})
 		return
 	}
 
 	data.Username = username
-	writeJSON(w, http.StatusOK, data)
+	c.JSON(http.StatusOK, data)
 }
 
 // ShowBucketDetails displays detailed information about a specific bucket
-func (s *AdminServer) ShowBucketDetails(w http.ResponseWriter, r *http.Request) {
-	bucketName := mux.Vars(r)["bucket"]
+func (s *AdminServer) ShowBucketDetails(c *gin.Context) {
+	bucketName := c.Param("bucket")
 	if bucketName == "" {
-		writeJSONError(w, http.StatusBadRequest, "Bucket name is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Bucket name is required"})
 		return
 	}
 
 	details, err := s.GetBucketDetails(bucketName)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get bucket details: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get bucket details: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, details)
+	c.JSON(http.StatusOK, details)
 }
 
 // CreateBucket creates a new S3 bucket
-func (s *AdminServer) CreateBucket(w http.ResponseWriter, r *http.Request) {
+func (s *AdminServer) CreateBucket(c *gin.Context) {
 	var req CreateBucketRequest
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
-		return
-	}
-	if strings.TrimSpace(req.Name) == "" {
-		writeJSONError(w, http.StatusBadRequest, "Bucket name is required")
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	// Validate bucket name (basic validation)
 	if len(req.Name) < 3 || len(req.Name) > 63 {
-		writeJSONError(w, http.StatusBadRequest, "Bucket name must be between 3 and 63 characters")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Bucket name must be between 3 and 63 characters"})
 		return
 	}
 
@@ -100,47 +96,42 @@ func (s *AdminServer) CreateBucket(w http.ResponseWriter, r *http.Request) {
 
 		// Validate object lock mode
 		if req.ObjectLockMode != "GOVERNANCE" && req.ObjectLockMode != "COMPLIANCE" {
-			writeJSONError(w, http.StatusBadRequest, "Object lock mode must be either GOVERNANCE or COMPLIANCE")
+			c.JSON(http.StatusBadRequest, gin.H{"error": "Object lock mode must be either GOVERNANCE or COMPLIANCE"})
 			return
 		}
 
 		// Validate retention duration if default retention is enabled
 		if req.SetDefaultRetention {
 			if req.ObjectLockDuration <= 0 {
-				writeJSONError(w, http.StatusBadRequest, "Object lock duration must be greater than 0 days when default retention is enabled")
+				c.JSON(http.StatusBadRequest, gin.H{"error": "Object lock duration must be greater than 0 days when default retention is enabled"})
 				return
 			}
 		}
 	}
 
-	normalizedUnit, err := normalizeQuotaUnit(req.QuotaUnit)
-	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, err.Error())
-		return
-	}
-	req.QuotaUnit = normalizedUnit
-	quotaBytes := convertQuotaToBytes(req.QuotaSize, normalizedUnit)
+	// Convert quota to bytes
+	quotaBytes := convertQuotaToBytes(req.QuotaSize, req.QuotaUnit)
 
 	// Validate quota: if enabled, size must be greater than 0
 	if req.QuotaEnabled && quotaBytes <= 0 {
-		writeJSONError(w, http.StatusBadRequest, "Quota size must be greater than 0 when quota is enabled")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Quota size must be greater than 0 when quota is enabled"})
 		return
 	}
 
 	// Sanitize owner: trim whitespace and enforce max length
 	owner := strings.TrimSpace(req.Owner)
 	if len(owner) > MaxOwnerNameLength {
-		writeJSONError(w, http.StatusBadRequest, fmt.Sprintf("Owner name must be %d characters or less", MaxOwnerNameLength))
+		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("Owner name must be %d characters or less", MaxOwnerNameLength)})
 		return
 	}
 
-	err = s.CreateS3BucketWithObjectLock(req.Name, quotaBytes, req.QuotaEnabled, req.VersioningEnabled, req.ObjectLockEnabled, req.ObjectLockMode, req.SetDefaultRetention, req.ObjectLockDuration, owner)
+	err := s.CreateS3BucketWithObjectLock(req.Name, quotaBytes, req.QuotaEnabled, req.VersioningEnabled, req.ObjectLockEnabled, req.ObjectLockMode, req.SetDefaultRetention, req.ObjectLockDuration, owner)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to create bucket: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create bucket: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusCreated, map[string]interface{}{
+	c.JSON(http.StatusCreated, gin.H{
 		"message":              "Bucket created successfully",
 		"bucket":               req.Name,
 		"quota_size":           req.QuotaSize,
@@ -155,10 +146,10 @@ func (s *AdminServer) CreateBucket(w http.ResponseWriter, r *http.Request) {
 }
 
 // UpdateBucketQuota updates the quota settings for a bucket
-func (s *AdminServer) UpdateBucketQuota(w http.ResponseWriter, r *http.Request) {
-	bucketName := mux.Vars(r)["bucket"]
+func (s *AdminServer) UpdateBucketQuota(c *gin.Context) {
+	bucketName := c.Param("bucket")
 	if bucketName == "" {
-		writeJSONError(w, http.StatusBadRequest, "Bucket name is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Bucket name is required"})
 		return
 	}
 
@@ -167,32 +158,21 @@ func (s *AdminServer) UpdateBucketQuota(w http.ResponseWriter, r *http.Request)
 		QuotaUnit    string `json:"quota_unit"`
 		QuotaEnabled bool   `json:"quota_enabled"`
 	}
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
-	if req.QuotaEnabled && req.QuotaSize <= 0 {
-		writeJSONError(w, http.StatusBadRequest, "quota_size must be > 0 when quota_enabled is true")
-		return
-	}
-
-	normalizedUnit, err := normalizeQuotaUnit(req.QuotaUnit)
-	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, err.Error())
-		return
-	}
-	req.QuotaUnit = normalizedUnit
 	// Convert quota to bytes
-	quotaBytes := convertQuotaToBytes(req.QuotaSize, normalizedUnit)
+	quotaBytes := convertQuotaToBytes(req.QuotaSize, req.QuotaUnit)
 
-	err = s.SetBucketQuota(bucketName, quotaBytes, req.QuotaEnabled)
+	err := s.SetBucketQuota(bucketName, quotaBytes, req.QuotaEnabled)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to update bucket quota: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update bucket quota: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message":       "Bucket quota updated successfully",
 		"bucket":        bucketName,
 		"quota_size":    req.QuotaSize,
@@ -202,30 +182,30 @@ func (s *AdminServer) UpdateBucketQuota(w http.ResponseWriter, r *http.Request)
 }
 
 // DeleteBucket deletes an S3 bucket
-func (s *AdminServer) DeleteBucket(w http.ResponseWriter, r *http.Request) {
-	bucketName := mux.Vars(r)["bucket"]
+func (s *AdminServer) DeleteBucket(c *gin.Context) {
+	bucketName := c.Param("bucket")
 	if bucketName == "" {
-		writeJSONError(w, http.StatusBadRequest, "Bucket name is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Bucket name is required"})
 		return
 	}
 
 	err := s.DeleteS3Bucket(bucketName)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to delete bucket: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete bucket: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message": "Bucket deleted successfully",
 		"bucket":  bucketName,
 	})
 }
 
 // UpdateBucketOwner updates the owner of an S3 bucket
-func (s *AdminServer) UpdateBucketOwner(w http.ResponseWriter, r *http.Request) {
-	bucketName := mux.Vars(r)["bucket"]
+func (s *AdminServer) UpdateBucketOwner(c *gin.Context) {
+	bucketName := c.Param("bucket")
 	if bucketName == "" {
-		writeJSONError(w, http.StatusBadRequest, "Bucket name is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Bucket name is required"})
 		return
 	}
 
@@ -233,31 +213,31 @@ func (s *AdminServer) UpdateBucketOwner(w http.ResponseWriter, r *http.Request)
 	var req struct {
 		Owner *string `json:"owner"`
 	}
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	// Require owner field to be explicitly provided
 	if req.Owner == nil {
-		writeJSONError(w, http.StatusBadRequest, "Owner field is required (use empty string to clear owner)")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Owner field is required (use empty string to clear owner)"})
 		return
 	}
 
 	// Trim and validate owner
 	owner := strings.TrimSpace(*req.Owner)
 	if len(owner) > MaxOwnerNameLength {
-		writeJSONError(w, http.StatusBadRequest, fmt.Sprintf("Owner name must be %d characters or less", MaxOwnerNameLength))
+		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("Owner name must be %d characters or less", MaxOwnerNameLength)})
 		return
 	}
 
 	err := s.SetBucketOwner(bucketName, owner)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to update bucket owner: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update bucket owner: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message": "Bucket owner updated successfully",
 		"bucket":  bucketName,
 		"owner":   owner,
@@ -304,14 +284,14 @@ func (s *AdminServer) SetBucketOwner(bucketName string, owner string) error {
 }
 
 // ListBucketsAPI returns the list of buckets as JSON
-func (s *AdminServer) ListBucketsAPI(w http.ResponseWriter, r *http.Request) {
+func (s *AdminServer) ListBucketsAPI(c *gin.Context) {
 	buckets, err := s.GetS3Buckets()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get buckets: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get buckets: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"buckets": buckets,
 		"total":   len(buckets),
 	})
@@ -323,32 +303,16 @@ func convertQuotaToBytes(size int64, unit string) int64 {
 		return 0
 	}
 
-	switch unit {
+	switch strings.ToUpper(unit) {
 	case "TB":
 		return size * 1024 * 1024 * 1024 * 1024
 	case "GB":
 		return size * 1024 * 1024 * 1024
 	case "MB":
 		return size * 1024 * 1024
-	case "KB":
-		return size * 1024
-	case "B":
-		return size
 	default:
-		return 0
-	}
-}
-
-func normalizeQuotaUnit(unit string) (string, error) {
-	normalized := strings.ToUpper(strings.TrimSpace(unit))
-	if normalized == "" {
-		return "MB", nil
-	}
-	switch normalized {
-	case "B", "KB", "MB", "GB", "TB":
-		return normalized, nil
-	default:
-		return "", fmt.Errorf("unsupported quota unit: %s", unit)
+		// Default to MB if unit is not recognized
+		return size * 1024 * 1024
 	}
 }
 

weed/admin/dash/config_persistence.go

@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 	"sort"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/seaweedfs/seaweedfs/weed/admin/maintenance"
@@ -88,11 +87,6 @@ func isValidTaskID(taskID string) bool {
 // ConfigPersistence handles saving and loading configuration files
 type ConfigPersistence struct {
 	dataDir string
-	// tasksMu serializes all filesystem operations on the tasks/ directory.
-	// SaveTaskState, LoadTaskState, LoadAllTaskStates, DeleteTaskState, and
-	// CleanupCompletedTasks are called from multiple goroutines concurrently
-	// after saveTaskState was moved outside mq.mutex in the maintenance queue.
-	tasksMu sync.Mutex
 }
 
 // NewConfigPersistence creates a new configuration persistence manager
@@ -943,8 +937,6 @@ func (cp *ConfigPersistence) ListTaskDetails() ([]string, error) {
 
 // CleanupCompletedTasks removes old completed tasks beyond the retention limit
 func (cp *ConfigPersistence) CleanupCompletedTasks() error {
-	cp.tasksMu.Lock()
-	defer cp.tasksMu.Unlock()
 	if cp.dataDir == "" {
 		return fmt.Errorf("no data directory specified, cannot cleanup completed tasks")
 	}
@@ -954,8 +946,8 @@ func (cp *ConfigPersistence) CleanupCompletedTasks() error {
 		return nil // No tasks directory, nothing to cleanup
 	}
 
-	// Use unlocked helpers to avoid deadlock (tasksMu is already held)
-	allTasks, err := cp.loadAllTaskStatesLocked()
+	// Load all tasks and find completed/failed ones
+	allTasks, err := cp.LoadAllTaskStates()
 	if err != nil {
 		return fmt.Errorf("failed to load tasks for cleanup: %w", err)
 	}
@@ -1006,7 +998,7 @@ func (cp *ConfigPersistence) CleanupCompletedTasks() error {
 	if len(completedTasks) > MaxCompletedTasks {
 		tasksToDelete := completedTasks[MaxCompletedTasks:]
 		for _, task := range tasksToDelete {
-			if err := cp.deleteTaskStateLocked(task.ID); err != nil {
+			if err := cp.DeleteTaskState(task.ID); err != nil {
 				glog.Warningf("Failed to delete old completed task %s: %v", task.ID, err)
 			} else {
 				glog.V(2).Infof("Cleaned up old completed task %s (completed: %v)", task.ID, task.CompletedAt)
@@ -1020,8 +1012,6 @@ func (cp *ConfigPersistence) CleanupCompletedTasks() error {
 
 // SaveTaskState saves a task state to protobuf file
 func (cp *ConfigPersistence) SaveTaskState(task *maintenance.MaintenanceTask) error {
-	cp.tasksMu.Lock()
-	defer cp.tasksMu.Unlock()
 	if cp.dataDir == "" {
 		return fmt.Errorf("no data directory specified, cannot save task state")
 	}
@@ -1061,13 +1051,6 @@ func (cp *ConfigPersistence) SaveTaskState(task *maintenance.MaintenanceTask) er
 
 // LoadTaskState loads a task state from protobuf file
 func (cp *ConfigPersistence) LoadTaskState(taskID string) (*maintenance.MaintenanceTask, error) {
-	cp.tasksMu.Lock()
-	defer cp.tasksMu.Unlock()
-	return cp.loadTaskStateLocked(taskID)
-}
-
-// loadTaskStateLocked loads a single task state. Must be called with tasksMu held.
-func (cp *ConfigPersistence) loadTaskStateLocked(taskID string) (*maintenance.MaintenanceTask, error) {
 	if cp.dataDir == "" {
 		return nil, fmt.Errorf("no data directory specified, cannot load task state")
 	}
@@ -1101,13 +1084,6 @@ func (cp *ConfigPersistence) loadTaskStateLocked(taskID string) (*maintenance.Ma
 
 // LoadAllTaskStates loads all task states from disk
 func (cp *ConfigPersistence) LoadAllTaskStates() ([]*maintenance.MaintenanceTask, error) {
-	cp.tasksMu.Lock()
-	defer cp.tasksMu.Unlock()
-	return cp.loadAllTaskStatesLocked()
-}
-
-// loadAllTaskStatesLocked loads all task states from disk. Must be called with tasksMu held.
-func (cp *ConfigPersistence) loadAllTaskStatesLocked() ([]*maintenance.MaintenanceTask, error) {
 	if cp.dataDir == "" {
 		return []*maintenance.MaintenanceTask{}, nil
 	}
@@ -1126,7 +1102,7 @@ func (cp *ConfigPersistence) loadAllTaskStatesLocked() ([]*maintenance.Maintenan
 	for _, entry := range entries {
 		if !entry.IsDir() && filepath.Ext(entry.Name()) == ".pb" {
 			taskID := entry.Name()[:len(entry.Name())-3] // Remove .pb extension
-			task, err := cp.loadTaskStateLocked(taskID)
+			task, err := cp.LoadTaskState(taskID)
 			if err != nil {
 				glog.Warningf("Failed to load task state for %s: %v", taskID, err)
 				continue
@@ -1141,13 +1117,6 @@ func (cp *ConfigPersistence) loadAllTaskStatesLocked() ([]*maintenance.Maintenan
 
 // DeleteTaskState removes a task state file from disk
 func (cp *ConfigPersistence) DeleteTaskState(taskID string) error {
-	cp.tasksMu.Lock()
-	defer cp.tasksMu.Unlock()
-	return cp.deleteTaskStateLocked(taskID)
-}
-
-// deleteTaskStateLocked removes a task state file. Must be called with tasksMu held.
-func (cp *ConfigPersistence) deleteTaskStateLocked(taskID string) error {
 	if cp.dataDir == "" {
 		return fmt.Errorf("no data directory specified, cannot delete task state")
 	}

weed/admin/dash/context.go

@@ -1,58 +0,0 @@
-package dash
-
-import "context"
-
-type contextKey string
-
-const (
-	contextUsernameKey contextKey = "admin.username"
-	contextRoleKey     contextKey = "admin.role"
-	contextCSRFKey     contextKey = "admin.csrf"
-)
-
-// WithAuthContext stores auth metadata on the request context.
-func WithAuthContext(ctx context.Context, username, role, csrfToken string) context.Context {
-	if username != "" {
-		ctx = context.WithValue(ctx, contextUsernameKey, username)
-	}
-	if role != "" {
-		ctx = context.WithValue(ctx, contextRoleKey, role)
-	}
-	if csrfToken != "" {
-		ctx = context.WithValue(ctx, contextCSRFKey, csrfToken)
-	}
-	return ctx
-}
-
-// UsernameFromContext retrieves the username from context.
-func UsernameFromContext(ctx context.Context) string {
-	if ctx == nil {
-		return ""
-	}
-	if value, ok := ctx.Value(contextUsernameKey).(string); ok {
-		return value
-	}
-	return ""
-}
-
-// RoleFromContext retrieves the role from context.
-func RoleFromContext(ctx context.Context) string {
-	if ctx == nil {
-		return ""
-	}
-	if value, ok := ctx.Value(contextRoleKey).(string); ok {
-		return value
-	}
-	return ""
-}
-
-// CSRFTokenFromContext retrieves the CSRF token from context.
-func CSRFTokenFromContext(ctx context.Context) string {
-	if ctx == nil {
-		return ""
-	}
-	if value, ok := ctx.Value(contextCSRFKey).(string); ok {
-		return value
-	}
-	return ""
-}

weed/admin/dash/csrf.go

@@ -4,10 +4,10 @@ import (
 	"crypto/rand"
 	"crypto/subtle"
 	"encoding/hex"
-	"fmt"
 	"net/http"
 
-	"github.com/gorilla/sessions"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
 )
 
 const sessionCSRFTokenKey = "csrf_token"
@@ -20,77 +20,41 @@ func generateCSRFToken() (string, error) {
 	return hex.EncodeToString(tokenBytes), nil
 }
 
-func getOrCreateSessionCSRFToken(session *sessions.Session, r *http.Request, w http.ResponseWriter) (string, error) {
-	if existing, ok := session.Values[sessionCSRFTokenKey].(string); ok && existing != "" {
+func getOrCreateSessionCSRFToken(session sessions.Session) (string, error) {
+	if existing, ok := session.Get(sessionCSRFTokenKey).(string); ok && existing != "" {
 		return existing, nil
 	}
 	token, err := generateCSRFToken()
 	if err != nil {
 		return "", err
 	}
-	session.Values[sessionCSRFTokenKey] = token
-	if err := session.Save(r, w); err != nil {
+	session.Set(sessionCSRFTokenKey, token)
+	if err := session.Save(); err != nil {
 		return "", err
 	}
 	return token, nil
 }
 
-func requireSessionCSRFToken(w http.ResponseWriter, r *http.Request) bool {
-	expectedToken := CSRFTokenFromContext(r.Context())
-	username := UsernameFromContext(r.Context())
-	if expectedToken == "" {
+func requireSessionCSRFToken(c *gin.Context) bool {
+	session := sessions.Default(c)
+	if session.Get("authenticated") != true {
 		// Admin UI can run without auth; in that mode CSRF token checks are not applicable.
-		if username == "" {
-			return true
-		}
-		writeJSONError(w, http.StatusForbidden, "missing CSRF session token")
+		return true
+	}
+
+	expectedToken, ok := session.Get(sessionCSRFTokenKey).(string)
+	if !ok || expectedToken == "" {
+		c.JSON(http.StatusForbidden, gin.H{"error": "missing CSRF session token"})
 		return false
 	}
 
-	providedToken, err := getProvidedCSRFToken(r)
-	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Failed to parse form: "+err.Error())
-		return false
+	providedToken := c.GetHeader("X-CSRF-Token")
+	if providedToken == "" {
+		providedToken = c.PostForm("csrf_token")
 	}
 	if providedToken == "" || subtle.ConstantTimeCompare([]byte(expectedToken), []byte(providedToken)) != 1 {
-		writeJSONError(w, http.StatusForbidden, "invalid CSRF token")
+		c.JSON(http.StatusForbidden, gin.H{"error": "invalid CSRF token"})
 		return false
 	}
 	return true
 }
-
-func getProvidedCSRFToken(r *http.Request) (string, error) {
-	providedToken := r.Header.Get("X-CSRF-Token")
-	if providedToken != "" {
-		return providedToken, nil
-	}
-	if err := r.ParseForm(); err != nil {
-		return "", err
-	}
-	return r.FormValue("csrf_token"), nil
-}
-
-func EnsureSessionCSRFToken(session *sessions.Session, r *http.Request, w http.ResponseWriter) (string, error) {
-	if session == nil {
-		return "", fmt.Errorf("session is nil")
-	}
-	return getOrCreateSessionCSRFToken(session, r, w)
-}
-
-func ValidateSessionCSRFToken(session *sessions.Session, r *http.Request) error {
-	if session == nil {
-		return fmt.Errorf("session is nil")
-	}
-	expectedToken, _ := session.Values[sessionCSRFTokenKey].(string)
-	providedToken, err := getProvidedCSRFToken(r)
-	if err != nil {
-		return fmt.Errorf("failed to read CSRF token: %w", err)
-	}
-	if expectedToken == "" {
-		return fmt.Errorf("missing session CSRF token")
-	}
-	if providedToken == "" || subtle.ConstantTimeCompare([]byte(expectedToken), []byte(providedToken)) != 1 {
-		return fmt.Errorf("invalid CSRF token")
-	}
-	return nil
-}

weed/admin/dash/ec_shard_management.go

@@ -6,7 +6,10 @@ import (
 	"sort"
 	"time"
 
+	"github.com/seaweedfs/seaweedfs/weed/glog"
+	"github.com/seaweedfs/seaweedfs/weed/pb"
 	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
+	"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
 	"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
 )
 
@@ -330,19 +333,10 @@ func (s *AdminServer) GetClusterEcVolumes(page int, pageSize int, sortBy string,
 
 								// Process each shard this server has for this volume
 								shardBits := ecShardInfo.EcIndexBits
-								shardSizes := ecShardInfo.ShardSizes
-								sizeIndex := 0
 								for shardId := 0; shardId < erasure_coding.MaxShardCount; shardId++ {
 									if (shardBits & (1 << uint(shardId))) != 0 {
 										// Record shard location
 										volume.ShardLocations[shardId] = node.Id
-										if sizeIndex < len(shardSizes) {
-											size := shardSizes[sizeIndex]
-											if size >= 0 {
-												volume.ShardSizes[shardId] = size
-											}
-										}
-										sizeIndex++
 										totalShards++
 									}
 								}
@@ -360,6 +354,38 @@ func (s *AdminServer) GetClusterEcVolumes(page int, pageSize int, sortBy string,
 		return nil, err
 	}
 
+	// Collect shard size information from volume servers
+	for volumeId, volume := range volumeData {
+		// Group servers by volume to minimize gRPC calls
+		serverHasVolume := make(map[string]bool)
+		for _, server := range volume.Servers {
+			serverHasVolume[server] = true
+		}
+
+		// Query each server for shard sizes
+		for server := range serverHasVolume {
+			err := s.WithVolumeServerClient(pb.ServerAddress(server), func(client volume_server_pb.VolumeServerClient) error {
+				resp, err := client.VolumeEcShardsInfo(context.Background(), &volume_server_pb.VolumeEcShardsInfoRequest{
+					VolumeId: volumeId,
+				})
+				if err != nil {
+					glog.V(1).Infof("Failed to get EC shard info from %s for volume %d: %v", server, volumeId, err)
+					return nil // Continue with other servers, don't fail the entire request
+				}
+
+				// Update shard sizes
+				for _, shardInfo := range resp.EcShardInfos {
+					volume.ShardSizes[int(shardInfo.ShardId)] = shardInfo.Size
+				}
+
+				return nil
+			})
+			if err != nil {
+				glog.V(1).Infof("Failed to connect to volume server %s: %v", server, err)
+			}
+		}
+	}
+
 	// Calculate completeness for each volume
 	completeVolumes := 0
 	incompleteVolumes := 0
@@ -590,23 +616,13 @@ func (s *AdminServer) GetEcVolumeDetails(volumeID uint32, sortBy string, sortOrd
 
 									// Create individual shard entries for each shard this server has
 									shardBits := ecShardInfo.EcIndexBits
-									shardSizes := ecShardInfo.ShardSizes
-									sizeIndex := 0
 									for shardId := 0; shardId < erasure_coding.MaxShardCount; shardId++ {
 										if (shardBits & (1 << uint(shardId))) != 0 {
-											var shardSize uint64
-											if sizeIndex < len(shardSizes) {
-												size := shardSizes[sizeIndex]
-												if size >= 0 {
-													shardSize = uint64(size)
-												}
-											}
-											sizeIndex++
 											ecShard := EcShardWithInfo{
 												VolumeID:     ecShardInfo.Id,
 												ShardID:      uint32(shardId),
 												Collection:   ecShardInfo.Collection,
-												Size:         shardSize,
+												Size:         0, // EC shards don't have individual size in the API response
 												Server:       node.Id,
 												DataCenter:   dc.Id,
 												Rack:         rack.Id,
@@ -637,6 +653,46 @@ func (s *AdminServer) GetEcVolumeDetails(volumeID uint32, sortBy string, sortOrd
 		return nil, fmt.Errorf("EC volume %d not found", volumeID)
 	}
 
+	// Collect shard size information from volume servers
+	shardSizeMap := make(map[string]map[uint32]uint64) // server -> shardId -> size
+	for _, shard := range shards {
+		server := shard.Server
+		if _, exists := shardSizeMap[server]; !exists {
+			// Query this server for shard sizes
+			err := s.WithVolumeServerClient(pb.ServerAddress(server), func(client volume_server_pb.VolumeServerClient) error {
+				resp, err := client.VolumeEcShardsInfo(context.Background(), &volume_server_pb.VolumeEcShardsInfoRequest{
+					VolumeId: volumeID,
+				})
+				if err != nil {
+					glog.V(1).Infof("Failed to get EC shard info from %s for volume %d: %v", server, volumeID, err)
+					return nil // Continue with other servers, don't fail the entire request
+				}
+
+				// Store shard sizes for this server
+				shardSizeMap[server] = make(map[uint32]uint64)
+				for _, shardInfo := range resp.EcShardInfos {
+					shardSizeMap[server][shardInfo.ShardId] = uint64(shardInfo.Size)
+				}
+
+				return nil
+			})
+			if err != nil {
+				glog.V(1).Infof("Failed to connect to volume server %s: %v", server, err)
+			}
+		}
+	}
+
+	// Update shard sizes in the shards array
+	for i := range shards {
+		server := shards[i].Server
+		shardId := shards[i].ShardID
+		if serverSizes, exists := shardSizeMap[server]; exists {
+			if size, exists := serverSizes[shardId]; exists {
+				shards[i].Size = size
+			}
+		}
+	}
+
 	// Calculate completeness based on unique shard IDs
 	foundShards := make(map[int]bool)
 	for _, shard := range shards {

weed/admin/dash/http_helpers.go

@@ -1,24 +0,0 @@
-package dash
-
-import (
-	"io"
-	"net/http"
-
-	"github.com/seaweedfs/seaweedfs/weed/admin/internal/httputil"
-)
-
-func writeJSON(w http.ResponseWriter, status int, payload interface{}) {
-	httputil.WriteJSON(w, status, payload)
-}
-
-func writeJSONError(w http.ResponseWriter, status int, message string) {
-	httputil.WriteJSONError(w, status, message)
-}
-
-func decodeJSONBody(r io.Reader, v interface{}) error {
-	return httputil.DecodeJSONBody(r, v)
-}
-
-func newJSONMaxReader(w http.ResponseWriter, r *http.Request) io.Reader {
-	return httputil.NewJSONMaxReader(w, r)
-}

weed/admin/dash/middleware.go

@@ -4,129 +4,109 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/gorilla/mux"
-	"github.com/gorilla/sessions"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
 )
 
-const sessionName = "admin-session"
-
-// SessionName returns the cookie session name used by the admin UI.
-func SessionName() string {
-	return sessionName
-}
-
-type sessionValidationErrorKind int
-
-const (
-	sessionValidationErrorKindUnauthenticated sessionValidationErrorKind = iota
-	sessionValidationErrorKindSessionInit
-)
-
-type sessionValidationError struct {
-	kind sessionValidationErrorKind
-	err  error
-}
-
-func (e *sessionValidationError) Error() string {
-	if e.err != nil {
-		return e.err.Error()
+// setAuthContext sets username and role in context for use in handlers
+func setAuthContext(c *gin.Context, username, role interface{}) {
+	c.Set("username", username)
+	if role != nil {
+		c.Set("role", role)
+	} else {
+		// Default to admin for backward compatibility
+		c.Set("role", "admin")
 	}
-	return "session validation failed"
 }
 
-func (e *sessionValidationError) Unwrap() error {
-	return e.err
+// RequireAuth checks if user is authenticated
+func RequireAuth() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		session := sessions.Default(c)
+		authenticated := session.Get("authenticated")
+		username := session.Get("username")
+		role := session.Get("role")
+
+		if authenticated != true || username == nil {
+			c.Redirect(http.StatusTemporaryRedirect, "/login")
+			c.Abort()
+			return
+		}
+
+		csrfToken, err := getOrCreateSessionCSRFToken(session)
+		if err != nil {
+			c.Redirect(http.StatusTemporaryRedirect, "/login?error=Unable to initialize session")
+			c.Abort()
+			return
+		}
+
+		// Set username and role in context for use in handlers
+		setAuthContext(c, username, role)
+		c.Set("csrf_token", csrfToken)
+		c.Next()
+	}
 }
 
-func validateSession(store sessions.Store, w http.ResponseWriter, r *http.Request) (string, string, string, error) {
-	session, err := store.Get(r, sessionName)
-	if err != nil {
-		return "", "", "", &sessionValidationError{kind: sessionValidationErrorKindSessionInit, err: err}
-	}
+// RequireAuthAPI checks if user is authenticated for API endpoints
+// Returns JSON error instead of redirecting to login page
+func RequireAuthAPI() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		session := sessions.Default(c)
+		authenticated := session.Get("authenticated")
+		username := session.Get("username")
+		role := session.Get("role")
 
-	authenticated, _ := session.Values["authenticated"].(bool)
-	username, _ := session.Values["username"].(string)
-	role, _ := session.Values["role"].(string)
-	if !authenticated || username == "" {
-		return "", "", "", &sessionValidationError{kind: sessionValidationErrorKindUnauthenticated}
-	}
+		if authenticated != true || username == nil {
+			c.JSON(http.StatusUnauthorized, gin.H{
+				"error":   "Authentication required",
+				"message": "Please log in to access this endpoint",
+			})
+			c.Abort()
+			return
+		}
 
-	csrfToken, err := getOrCreateSessionCSRFToken(session, r, w)
-	if err != nil {
-		return "", "", "", &sessionValidationError{kind: sessionValidationErrorKindSessionInit, err: err}
-	}
+		csrfToken, err := getOrCreateSessionCSRFToken(session)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{
+				"error":   "Failed to initialize session",
+				"message": "Unable to initialize CSRF token",
+			})
+			c.Abort()
+			return
+		}
 
-	return username, role, csrfToken, nil
+		// Set username and role in context for use in handlers
+		setAuthContext(c, username, role)
+		c.Set("csrf_token", csrfToken)
+		c.Next()
+	}
 }
 
-// RequireAuth checks if user is authenticated.
-func RequireAuth(store sessions.Store) mux.MiddlewareFunc {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			username, role, csrfToken, err := validateSession(store, w, r)
-			if err != nil {
-				if verr, ok := err.(*sessionValidationError); ok && verr.kind == sessionValidationErrorKindUnauthenticated {
-					http.Redirect(w, r, "/login", http.StatusTemporaryRedirect)
-				} else {
-					http.Redirect(w, r, "/login?error=Unable to initialize session", http.StatusTemporaryRedirect)
-				}
-				return
+// RequireWriteAccess checks if user has admin role (write access)
+// Returns JSON error for API endpoints, redirects for HTML endpoints
+func RequireWriteAccess() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		role, exists := c.Get("role")
+		if !exists {
+			role = "admin" // Default for backward compatibility
+		}
+
+		roleStr, ok := role.(string)
+		if !ok || roleStr != "admin" {
+			// Check if this is an API request (path starts with /api) or HTML request
+			path := c.Request.URL.Path
+			if strings.HasPrefix(path, "/api") {
+				c.JSON(http.StatusForbidden, gin.H{
+					"error":   "Insufficient permissions",
+					"message": "This operation requires admin access. Read-only users can only view data.",
+				})
+			} else {
+				c.Redirect(http.StatusSeeOther, "/admin?error=Insufficient permissions")
 			}
+			c.Abort()
+			return
+		}
 
-			ctx := WithAuthContext(r.Context(), username, role, csrfToken)
-			next.ServeHTTP(w, r.WithContext(ctx))
-		})
-	}
-}
-
-// RequireAuthAPI checks if user is authenticated for API endpoints.
-// Returns JSON error instead of redirecting to login page.
-func RequireAuthAPI(store sessions.Store) mux.MiddlewareFunc {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			username, role, csrfToken, err := validateSession(store, w, r)
-			if err != nil {
-				if verr, ok := err.(*sessionValidationError); ok && verr.kind == sessionValidationErrorKindUnauthenticated {
-					writeJSON(w, http.StatusUnauthorized, map[string]string{
-						"error":   "Authentication required",
-						"message": "Please log in to access this endpoint",
-					})
-				} else {
-					writeJSON(w, http.StatusInternalServerError, map[string]string{
-						"error":   "Failed to initialize session",
-						"message": "Unable to initialize session",
-					})
-				}
-				return
-			}
-
-			ctx := WithAuthContext(r.Context(), username, role, csrfToken)
-			next.ServeHTTP(w, r.WithContext(ctx))
-		})
-	}
-}
-
-// RequireWriteAccess checks if user has admin role (write access).
-// Returns JSON error for API endpoints, redirects for HTML endpoints.
-func RequireWriteAccess() mux.MiddlewareFunc {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			role := RoleFromContext(r.Context())
-
-			if role != "admin" {
-				// Check if this is an API request (path starts with /api) or HTML request.
-				if strings.HasPrefix(r.URL.Path, "/api") {
-					writeJSON(w, http.StatusForbidden, map[string]string{
-						"error":   "Insufficient permissions",
-						"message": "This operation requires admin access. Read-only users can only view data.",
-					})
-				} else {
-					http.Redirect(w, r, "/admin?error=Insufficient permissions", http.StatusSeeOther)
-				}
-				return
-			}
-
-			next.ServeHTTP(w, r)
-		})
+		c.Next()
 	}
 }

weed/admin/dash/plugin_api.go

@@ -1,740 +0,0 @@
-package dash
-
-import (
-	"context"
-	"crypto/rand"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/gorilla/mux"
-	"github.com/seaweedfs/seaweedfs/weed/admin/plugin"
-	"github.com/seaweedfs/seaweedfs/weed/glog"
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/timestamppb"
-)
-
-const (
-	defaultPluginDetectionTimeout = 45 * time.Second
-	defaultPluginExecutionTimeout = 90 * time.Second
-	maxPluginDetectionTimeout     = 5 * time.Minute
-	maxPluginExecutionTimeout     = 10 * time.Minute
-	defaultPluginRunTimeout       = 5 * time.Minute
-	maxPluginRunTimeout           = 30 * time.Minute
-)
-
-// GetPluginStatusAPI returns plugin status.
-func (s *AdminServer) GetPluginStatusAPI(w http.ResponseWriter, r *http.Request) {
-	plugin := s.GetPlugin()
-	if plugin == nil {
-		writeJSON(w, http.StatusOK, map[string]interface{}{
-			"enabled":          false,
-			"worker_grpc_port": s.GetWorkerGrpcPort(),
-		})
-		return
-	}
-
-	writeJSON(w, http.StatusOK, map[string]interface{}{
-		"enabled":          true,
-		"configured":       plugin.IsConfigured(),
-		"base_dir":         plugin.BaseDir(),
-		"worker_count":     len(plugin.ListWorkers()),
-		"worker_grpc_port": s.GetWorkerGrpcPort(),
-	})
-}
-
-// GetPluginWorkersAPI returns currently connected plugin workers.
-func (s *AdminServer) GetPluginWorkersAPI(w http.ResponseWriter, r *http.Request) {
-	workers := s.GetPluginWorkers()
-	if workers == nil {
-		writeJSON(w, http.StatusOK, []interface{}{})
-		return
-	}
-	writeJSON(w, http.StatusOK, workers)
-}
-
-// GetPluginJobTypesAPI returns known plugin job types from workers and persisted data.
-func (s *AdminServer) GetPluginJobTypesAPI(w http.ResponseWriter, r *http.Request) {
-	jobTypes, err := s.ListPluginJobTypes()
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	if jobTypes == nil {
-		writeJSON(w, http.StatusOK, []interface{}{})
-		return
-	}
-	writeJSON(w, http.StatusOK, jobTypes)
-}
-
-// GetPluginJobsAPI returns tracked jobs for monitoring.
-func (s *AdminServer) GetPluginJobsAPI(w http.ResponseWriter, r *http.Request) {
-	query := r.URL.Query()
-	jobType := strings.TrimSpace(query.Get("job_type"))
-	state := strings.TrimSpace(query.Get("state"))
-	limit := parsePositiveInt(query.Get("limit"), 200)
-	jobs := s.ListPluginJobs(jobType, state, limit)
-	if jobs == nil {
-		writeJSON(w, http.StatusOK, []interface{}{})
-		return
-	}
-	writeJSON(w, http.StatusOK, jobs)
-}
-
-// GetPluginJobAPI returns one tracked job.
-func (s *AdminServer) GetPluginJobAPI(w http.ResponseWriter, r *http.Request) {
-	jobID := strings.TrimSpace(mux.Vars(r)["jobId"])
-	if jobID == "" {
-		writeJSONError(w, http.StatusBadRequest, "jobId is required")
-		return
-	}
-
-	job, found := s.GetPluginJob(jobID)
-	if !found {
-		writeJSONError(w, http.StatusNotFound, "job not found")
-		return
-	}
-	writeJSON(w, http.StatusOK, job)
-}
-
-// GetPluginJobDetailAPI returns detailed information for one tracked plugin job.
-func (s *AdminServer) GetPluginJobDetailAPI(w http.ResponseWriter, r *http.Request) {
-	jobID := strings.TrimSpace(mux.Vars(r)["jobId"])
-	if jobID == "" {
-		writeJSONError(w, http.StatusBadRequest, "jobId is required")
-		return
-	}
-
-	query := r.URL.Query()
-	activityLimit := parsePositiveInt(query.Get("activity_limit"), 500)
-	relatedLimit := parsePositiveInt(query.Get("related_limit"), 20)
-
-	detail, found, err := s.GetPluginJobDetail(jobID, activityLimit, relatedLimit)
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	if !found || detail == nil {
-		writeJSONError(w, http.StatusNotFound, "job detail not found")
-		return
-	}
-
-	writeJSON(w, http.StatusOK, detail)
-}
-
-// GetPluginActivitiesAPI returns recent plugin activities.
-func (s *AdminServer) GetPluginActivitiesAPI(w http.ResponseWriter, r *http.Request) {
-	query := r.URL.Query()
-	jobType := strings.TrimSpace(query.Get("job_type"))
-	limit := parsePositiveInt(query.Get("limit"), 500)
-	activities := s.ListPluginActivities(jobType, limit)
-	if activities == nil {
-		writeJSON(w, http.StatusOK, []interface{}{})
-		return
-	}
-	writeJSON(w, http.StatusOK, activities)
-}
-
-// GetPluginSchedulerStatesAPI returns per-job-type scheduler status for monitoring.
-func (s *AdminServer) GetPluginSchedulerStatesAPI(w http.ResponseWriter, r *http.Request) {
-	jobTypeFilter := strings.TrimSpace(r.URL.Query().Get("job_type"))
-
-	states, err := s.ListPluginSchedulerStates()
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-
-	if jobTypeFilter != "" {
-		filtered := make([]interface{}, 0, len(states))
-		for _, state := range states {
-			if state.JobType == jobTypeFilter {
-				filtered = append(filtered, state)
-			}
-		}
-		writeJSON(w, http.StatusOK, filtered)
-		return
-	}
-
-	if states == nil {
-		writeJSON(w, http.StatusOK, []interface{}{})
-		return
-	}
-
-	writeJSON(w, http.StatusOK, states)
-}
-
-// RequestPluginJobTypeSchemaAPI asks a worker for one job type schema.
-func (s *AdminServer) RequestPluginJobTypeSchemaAPI(w http.ResponseWriter, r *http.Request) {
-	jobType := strings.TrimSpace(mux.Vars(r)["jobType"])
-	if jobType == "" {
-		writeJSONError(w, http.StatusBadRequest, "jobType is required")
-		return
-	}
-
-	forceRefresh := strings.EqualFold(r.URL.Query().Get("force_refresh"), "true")
-
-	ctx, cancel := context.WithTimeout(r.Context(), defaultPluginDetectionTimeout)
-	defer cancel()
-	descriptor, err := s.RequestPluginJobTypeDescriptor(ctx, jobType, forceRefresh)
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-
-	renderProtoJSON(w, http.StatusOK, descriptor)
-}
-
-// GetPluginJobTypeDescriptorAPI returns persisted descriptor for a job type.
-func (s *AdminServer) GetPluginJobTypeDescriptorAPI(w http.ResponseWriter, r *http.Request) {
-	jobType := strings.TrimSpace(mux.Vars(r)["jobType"])
-	if jobType == "" {
-		writeJSONError(w, http.StatusBadRequest, "jobType is required")
-		return
-	}
-
-	descriptor, err := s.LoadPluginJobTypeDescriptor(jobType)
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	if descriptor == nil {
-		writeJSONError(w, http.StatusNotFound, "descriptor not found")
-		return
-	}
-
-	renderProtoJSON(w, http.StatusOK, descriptor)
-}
-
-// GetPluginJobTypeConfigAPI loads persisted config for a job type.
-func (s *AdminServer) GetPluginJobTypeConfigAPI(w http.ResponseWriter, r *http.Request) {
-	jobType := strings.TrimSpace(mux.Vars(r)["jobType"])
-	if jobType == "" {
-		writeJSONError(w, http.StatusBadRequest, "jobType is required")
-		return
-	}
-
-	config, err := s.LoadPluginJobTypeConfig(jobType)
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	if config == nil {
-		config = &plugin_pb.PersistedJobTypeConfig{
-			JobType:            jobType,
-			AdminConfigValues:  map[string]*plugin_pb.ConfigValue{},
-			WorkerConfigValues: map[string]*plugin_pb.ConfigValue{},
-			AdminRuntime:       &plugin_pb.AdminRuntimeConfig{},
-		}
-	}
-
-	renderProtoJSON(w, http.StatusOK, config)
-}
-
-// UpdatePluginJobTypeConfigAPI stores persisted config for a job type.
-func (s *AdminServer) UpdatePluginJobTypeConfigAPI(w http.ResponseWriter, r *http.Request) {
-	jobType := strings.TrimSpace(mux.Vars(r)["jobType"])
-	if jobType == "" {
-		writeJSONError(w, http.StatusBadRequest, "jobType is required")
-		return
-	}
-
-	config := &plugin_pb.PersistedJobTypeConfig{}
-	if err := parseProtoJSONBody(w, r, config); err != nil {
-		writeJSONError(w, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	config.JobType = jobType
-	if config.UpdatedAt == nil {
-		config.UpdatedAt = timestamppb.Now()
-	}
-	if config.AdminRuntime == nil {
-		config.AdminRuntime = &plugin_pb.AdminRuntimeConfig{}
-	}
-	if config.AdminConfigValues == nil {
-		config.AdminConfigValues = map[string]*plugin_pb.ConfigValue{}
-	}
-	if config.WorkerConfigValues == nil {
-		config.WorkerConfigValues = map[string]*plugin_pb.ConfigValue{}
-	}
-
-	username := UsernameFromContext(r.Context())
-	if username == "" {
-		username = "admin"
-	}
-	config.UpdatedBy = username
-
-	if err := s.SavePluginJobTypeConfig(config); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-
-	renderProtoJSON(w, http.StatusOK, config)
-}
-
-// GetPluginRunHistoryAPI returns bounded run history for a job type.
-func (s *AdminServer) GetPluginRunHistoryAPI(w http.ResponseWriter, r *http.Request) {
-	jobType := strings.TrimSpace(mux.Vars(r)["jobType"])
-	if jobType == "" {
-		writeJSONError(w, http.StatusBadRequest, "jobType is required")
-		return
-	}
-
-	history, err := s.GetPluginRunHistory(jobType)
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	if history == nil {
-		writeJSON(w, http.StatusOK, map[string]interface{}{
-			"job_type":          jobType,
-			"successful_runs":   []interface{}{},
-			"error_runs":        []interface{}{},
-			"last_updated_time": nil,
-		})
-		return
-	}
-
-	writeJSON(w, http.StatusOK, history)
-}
-
-// TriggerPluginDetectionAPI runs one detector for this job type and returns proposals.
-func (s *AdminServer) TriggerPluginDetectionAPI(w http.ResponseWriter, r *http.Request) {
-	jobType := strings.TrimSpace(mux.Vars(r)["jobType"])
-	if jobType == "" {
-		writeJSONError(w, http.StatusBadRequest, "jobType is required")
-		return
-	}
-
-	var req struct {
-		ClusterContext json.RawMessage `json:"cluster_context"`
-		MaxResults     int32           `json:"max_results"`
-		TimeoutSeconds int             `json:"timeout_seconds"`
-	}
-
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil && err != io.EOF {
-		writeJSONError(w, http.StatusBadRequest, "invalid request body: "+err.Error())
-		return
-	}
-
-	clusterContext, err := s.parseOrBuildClusterContext(req.ClusterContext)
-	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	timeout := normalizeTimeout(req.TimeoutSeconds, defaultPluginDetectionTimeout, maxPluginDetectionTimeout)
-	ctx, cancel := context.WithTimeout(r.Context(), timeout)
-	defer cancel()
-
-	report, err := s.RunPluginDetectionWithReport(ctx, jobType, clusterContext, req.MaxResults)
-	proposals := make([]*plugin_pb.JobProposal, 0)
-	requestID := ""
-	detectorWorkerID := ""
-	totalProposals := int32(0)
-	if report != nil {
-		proposals = report.Proposals
-		requestID = report.RequestID
-		detectorWorkerID = report.WorkerID
-		if report.Complete != nil {
-			totalProposals = report.Complete.TotalProposals
-		}
-	}
-
-	proposalPayloads := make([]map[string]interface{}, 0, len(proposals))
-	for _, proposal := range proposals {
-		payload, marshalErr := protoMessageToMap(proposal)
-		if marshalErr != nil {
-			glog.Warningf("failed to marshal proposal for jobType=%s: %v", jobType, marshalErr)
-			continue
-		}
-		proposalPayloads = append(proposalPayloads, payload)
-	}
-
-	sort.Slice(proposalPayloads, func(i, j int) bool {
-		iPriorityStr, _ := proposalPayloads[i]["priority"].(string)
-		jPriorityStr, _ := proposalPayloads[j]["priority"].(string)
-
-		iPriority := plugin_pb.JobPriority_value[iPriorityStr]
-		jPriority := plugin_pb.JobPriority_value[jPriorityStr]
-
-		if iPriority != jPriority {
-			return iPriority > jPriority
-		}
-		iID, _ := proposalPayloads[i]["proposal_id"].(string)
-		jID, _ := proposalPayloads[j]["proposal_id"].(string)
-		return iID < jID
-	})
-
-	activities := s.ListPluginActivities(jobType, 500)
-	filteredActivities := make([]interface{}, 0, len(activities))
-	if requestID != "" {
-		for i := len(activities) - 1; i >= 0; i-- {
-			activity := activities[i]
-			if activity.RequestID != requestID {
-				continue
-			}
-			filteredActivities = append(filteredActivities, activity)
-		}
-	}
-
-	response := map[string]interface{}{
-		"job_type":           jobType,
-		"request_id":         requestID,
-		"detector_worker_id": detectorWorkerID,
-		"total_proposals":    totalProposals,
-		"count":              len(proposalPayloads),
-		"proposals":          proposalPayloads,
-		"activities":         filteredActivities,
-	}
-
-	if err != nil {
-		response["error"] = err.Error()
-		writeJSON(w, http.StatusInternalServerError, response)
-		return
-	}
-
-	writeJSON(w, http.StatusOK, response)
-}
-
-// RunPluginJobTypeAPI runs full workflow for one job type: detect then dispatch detected jobs.
-func (s *AdminServer) RunPluginJobTypeAPI(w http.ResponseWriter, r *http.Request) {
-	jobType := strings.TrimSpace(mux.Vars(r)["jobType"])
-	if jobType == "" {
-		writeJSONError(w, http.StatusBadRequest, "jobType is required")
-		return
-	}
-
-	var req struct {
-		ClusterContext json.RawMessage `json:"cluster_context"`
-		MaxResults     int32           `json:"max_results"`
-		TimeoutSeconds int             `json:"timeout_seconds"`
-		Attempt        int32           `json:"attempt"`
-	}
-
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil && err != io.EOF {
-		writeJSONError(w, http.StatusBadRequest, "invalid request body: "+err.Error())
-		return
-	}
-	if req.Attempt < 1 {
-		req.Attempt = 1
-	}
-
-	clusterContext, err := s.parseOrBuildClusterContext(req.ClusterContext)
-	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	timeout := normalizeTimeout(req.TimeoutSeconds, defaultPluginRunTimeout, maxPluginRunTimeout)
-	ctx, cancel := context.WithTimeout(r.Context(), timeout)
-	defer cancel()
-
-	proposals, err := s.RunPluginDetection(ctx, jobType, clusterContext, req.MaxResults)
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	detectedCount := len(proposals)
-
-	filteredProposals, skippedActiveCount, err := s.FilterPluginProposalsWithActiveJobs(jobType, proposals)
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-
-	type executionResult struct {
-		JobID      string                 `json:"job_id"`
-		Success    bool                   `json:"success"`
-		Error      string                 `json:"error,omitempty"`
-		Completion map[string]interface{} `json:"completion,omitempty"`
-	}
-
-	results := make([]executionResult, 0, len(filteredProposals))
-	successCount := 0
-	errorCount := 0
-
-	for index, proposal := range filteredProposals {
-		job := buildJobSpecFromProposal(jobType, proposal, index)
-		completed, execErr := s.ExecutePluginJob(ctx, job, clusterContext, req.Attempt)
-
-		result := executionResult{
-			JobID:   job.JobId,
-			Success: execErr == nil,
-		}
-
-		if completed != nil {
-			if payload, marshalErr := protoMessageToMap(completed); marshalErr == nil {
-				result.Completion = payload
-			}
-		}
-
-		if execErr != nil {
-			result.Error = execErr.Error()
-			errorCount++
-		} else {
-			successCount++
-		}
-
-		results = append(results, result)
-	}
-
-	writeJSON(w, http.StatusOK, map[string]interface{}{
-		"job_type":               jobType,
-		"detected_count":         detectedCount,
-		"ready_to_execute_count": len(filteredProposals),
-		"skipped_active_count":   skippedActiveCount,
-		"executed_count":         len(results),
-		"success_count":          successCount,
-		"error_count":            errorCount,
-		"execution_results":      results,
-	})
-}
-
-// ExecutePluginJobAPI executes one job on a capable worker and waits for completion.
-func (s *AdminServer) ExecutePluginJobAPI(w http.ResponseWriter, r *http.Request) {
-	var req struct {
-		Job            json.RawMessage `json:"job"`
-		ClusterContext json.RawMessage `json:"cluster_context"`
-		Attempt        int32           `json:"attempt"`
-		TimeoutSeconds int             `json:"timeout_seconds"`
-	}
-
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "invalid request body: "+err.Error())
-		return
-	}
-	if len(req.Job) == 0 {
-		writeJSONError(w, http.StatusBadRequest, "job is required")
-		return
-	}
-
-	job := &plugin_pb.JobSpec{}
-	if err := (protojson.UnmarshalOptions{DiscardUnknown: true}).Unmarshal(req.Job, job); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "invalid job payload: "+err.Error())
-		return
-	}
-
-	clusterContext, err := s.parseOrBuildClusterContext(req.ClusterContext)
-	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	if req.Attempt < 1 {
-		req.Attempt = 1
-	}
-
-	timeout := normalizeTimeout(req.TimeoutSeconds, defaultPluginExecutionTimeout, maxPluginExecutionTimeout)
-	ctx, cancel := context.WithTimeout(r.Context(), timeout)
-	defer cancel()
-
-	completed, err := s.ExecutePluginJob(ctx, job, clusterContext, req.Attempt)
-	if err != nil {
-		if completed != nil {
-			payload, marshalErr := protoMessageToMap(completed)
-			if marshalErr == nil {
-				writeJSON(w, http.StatusInternalServerError, map[string]interface{}{"error": err.Error(), "completion": payload})
-				return
-			}
-		}
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-
-	renderProtoJSON(w, http.StatusOK, completed)
-}
-
-func (s *AdminServer) parseOrBuildClusterContext(raw json.RawMessage) (*plugin_pb.ClusterContext, error) {
-	if len(raw) == 0 {
-		return s.buildDefaultPluginClusterContext(), nil
-	}
-
-	contextMessage := &plugin_pb.ClusterContext{}
-	if err := (protojson.UnmarshalOptions{DiscardUnknown: true}).Unmarshal(raw, contextMessage); err != nil {
-		return nil, fmt.Errorf("invalid cluster_context payload: %w", err)
-	}
-
-	fallback := s.buildDefaultPluginClusterContext()
-	if len(contextMessage.MasterGrpcAddresses) == 0 {
-		contextMessage.MasterGrpcAddresses = append(contextMessage.MasterGrpcAddresses, fallback.MasterGrpcAddresses...)
-	}
-	if len(contextMessage.FilerGrpcAddresses) == 0 {
-		contextMessage.FilerGrpcAddresses = append(contextMessage.FilerGrpcAddresses, fallback.FilerGrpcAddresses...)
-	}
-	if len(contextMessage.VolumeGrpcAddresses) == 0 {
-		contextMessage.VolumeGrpcAddresses = append(contextMessage.VolumeGrpcAddresses, fallback.VolumeGrpcAddresses...)
-	}
-	if contextMessage.Metadata == nil {
-		contextMessage.Metadata = map[string]string{}
-	}
-	contextMessage.Metadata["source"] = "admin"
-
-	return contextMessage, nil
-}
-
-func (s *AdminServer) buildDefaultPluginClusterContext() *plugin_pb.ClusterContext {
-	clusterContext := &plugin_pb.ClusterContext{
-		MasterGrpcAddresses: make([]string, 0),
-		FilerGrpcAddresses:  make([]string, 0),
-		VolumeGrpcAddresses: make([]string, 0),
-		Metadata: map[string]string{
-			"source": "admin",
-		},
-	}
-
-	masterAddress := string(s.masterClient.GetMaster(context.Background()))
-	if masterAddress != "" {
-		clusterContext.MasterGrpcAddresses = append(clusterContext.MasterGrpcAddresses, masterAddress)
-	}
-
-	filerSeen := map[string]struct{}{}
-	for _, filer := range s.GetAllFilers() {
-		filer = strings.TrimSpace(filer)
-		if filer == "" {
-			continue
-		}
-		if _, exists := filerSeen[filer]; exists {
-			continue
-		}
-		filerSeen[filer] = struct{}{}
-		clusterContext.FilerGrpcAddresses = append(clusterContext.FilerGrpcAddresses, filer)
-	}
-
-	volumeSeen := map[string]struct{}{}
-	if volumeServers, err := s.GetClusterVolumeServers(); err == nil {
-		for _, server := range volumeServers.VolumeServers {
-			address := strings.TrimSpace(server.GetDisplayAddress())
-			if address == "" {
-				address = strings.TrimSpace(server.Address)
-			}
-			if address == "" {
-				continue
-			}
-			if _, exists := volumeSeen[address]; exists {
-				continue
-			}
-			volumeSeen[address] = struct{}{}
-			clusterContext.VolumeGrpcAddresses = append(clusterContext.VolumeGrpcAddresses, address)
-		}
-	} else {
-		glog.V(1).Infof("failed to build default plugin volume context: %v", err)
-	}
-
-	sort.Strings(clusterContext.MasterGrpcAddresses)
-	sort.Strings(clusterContext.FilerGrpcAddresses)
-	sort.Strings(clusterContext.VolumeGrpcAddresses)
-
-	return clusterContext
-}
-
-const parseProtoJSONBodyMaxBytes = 1 << 20 // 1 MB
-
-func parseProtoJSONBody(w http.ResponseWriter, r *http.Request, message proto.Message) error {
-	limitedBody := http.MaxBytesReader(w, r.Body, parseProtoJSONBodyMaxBytes)
-	data, err := io.ReadAll(limitedBody)
-	if err != nil {
-		return fmt.Errorf("failed to read request body: %w", err)
-	}
-	if len(data) == 0 {
-		return fmt.Errorf("request body is empty")
-	}
-	if err := (protojson.UnmarshalOptions{DiscardUnknown: true}).Unmarshal(data, message); err != nil {
-		return fmt.Errorf("invalid protobuf json: %w", err)
-	}
-	return nil
-}
-
-func renderProtoJSON(w http.ResponseWriter, statusCode int, message proto.Message) {
-	payload, err := protojson.MarshalOptions{
-		UseProtoNames:   true,
-		EmitUnpopulated: true,
-	}.Marshal(message)
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "failed to encode response: "+err.Error())
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(statusCode)
-	_, _ = w.Write(payload)
-}
-
-func protoMessageToMap(message proto.Message) (map[string]interface{}, error) {
-	payload, err := protojson.MarshalOptions{UseProtoNames: true}.Marshal(message)
-	if err != nil {
-		return nil, err
-	}
-	out := map[string]interface{}{}
-	if err := json.Unmarshal(payload, &out); err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func normalizeTimeout(timeoutSeconds int, defaultTimeout, maxTimeout time.Duration) time.Duration {
-	if timeoutSeconds <= 0 {
-		return defaultTimeout
-	}
-	timeout := time.Duration(timeoutSeconds) * time.Second
-	if timeout > maxTimeout {
-		return maxTimeout
-	}
-	return timeout
-}
-
-func buildJobSpecFromProposal(jobType string, proposal *plugin_pb.JobProposal, index int) *plugin_pb.JobSpec {
-	now := timestamppb.Now()
-	suffix := make([]byte, 4)
-	if _, err := rand.Read(suffix); err != nil {
-		// Fallback to simpler ID if rand fails
-		suffix = []byte(fmt.Sprintf("%d", index))
-	}
-	jobID := fmt.Sprintf("%s-%d-%s", jobType, now.AsTime().UnixNano(), hex.EncodeToString(suffix))
-
-	jobSpec := &plugin_pb.JobSpec{
-		JobId:      jobID,
-		JobType:    jobType,
-		Priority:   plugin_pb.JobPriority_JOB_PRIORITY_NORMAL,
-		CreatedAt:  now,
-		Labels:     make(map[string]string),
-		Parameters: make(map[string]*plugin_pb.ConfigValue),
-		DedupeKey:  "",
-	}
-
-	if proposal != nil {
-		jobSpec.Summary = proposal.Summary
-		jobSpec.Detail = proposal.Detail
-		if proposal.Priority != plugin_pb.JobPriority_JOB_PRIORITY_UNSPECIFIED {
-			jobSpec.Priority = proposal.Priority
-		}
-		jobSpec.DedupeKey = proposal.DedupeKey
-		jobSpec.Parameters = plugin.CloneConfigValueMap(proposal.Parameters)
-		if proposal.Labels != nil {
-			for k, v := range proposal.Labels {
-				jobSpec.Labels[k] = v
-			}
-		}
-	}
-
-	return jobSpec
-}
-
-func parsePositiveInt(raw string, defaultValue int) int {
-	value, err := strconv.Atoi(strings.TrimSpace(raw))
-	if err != nil || value <= 0 {
-		return defaultValue
-	}
-	return value
-}
-
-// cloneConfigValueMap is now exported by the plugin package as CloneConfigValueMap

weed/admin/dash/plugin_api_test.go

@@ -1,33 +0,0 @@
-package dash
-
-import (
-	"testing"
-
-	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
-)
-
-func TestBuildJobSpecFromProposalDoesNotReuseProposalID(t *testing.T) {
-	t.Parallel()
-
-	proposal := &plugin_pb.JobProposal{
-		ProposalId: "vacuum-2",
-		DedupeKey:  "vacuum:2",
-		JobType:    "vacuum",
-	}
-
-	jobA := buildJobSpecFromProposal("vacuum", proposal, 0)
-	jobB := buildJobSpecFromProposal("vacuum", proposal, 1)
-
-	if jobA.JobId == proposal.ProposalId {
-		t.Fatalf("job id must not reuse proposal id: %s", jobA.JobId)
-	}
-	if jobB.JobId == proposal.ProposalId {
-		t.Fatalf("job id must not reuse proposal id: %s", jobB.JobId)
-	}
-	if jobA.JobId == jobB.JobId {
-		t.Fatalf("job ids must be unique across jobs: %s", jobA.JobId)
-	}
-	if jobA.DedupeKey != proposal.DedupeKey {
-		t.Fatalf("dedupe key must be preserved: got=%s want=%s", jobA.DedupeKey, proposal.DedupeKey)
-	}
-}

weed/admin/dash/s3tables_management.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/glog"
 	"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
 	"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
@@ -66,10 +67,10 @@ func parseNamespaceInput(namespace string) ([]string, error) {
 	return s3tables.ParseNamespace(namespace)
 }
 
-func (s *AdminServer) parseNamespaceFromRequest(w http.ResponseWriter, namespace string) ([]string, bool) {
+func (s *AdminServer) parseNamespaceFromGin(c *gin.Context, namespace string) ([]string, bool) {
 	parts, err := parseNamespaceInput(namespace)
 	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid namespace: "+err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid namespace: " + err.Error()})
 		return nil, false
 	}
 	return parts, true
@@ -568,61 +569,58 @@ func parseSummaryInt(summary map[string]string, keys ...string) (int64, bool) {
 
 // API handlers
 
-func (s *AdminServer) ListS3TablesBucketsAPI(w http.ResponseWriter, r *http.Request) {
-	data, err := s.GetS3TablesBucketsData(r.Context())
+func (s *AdminServer) ListS3TablesBucketsAPI(c *gin.Context) {
+	data, err := s.GetS3TablesBucketsData(c.Request.Context())
 	if err != nil {
-		writeS3TablesError(w, err)
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, data)
+	c.JSON(200, data)
 }
 
-func (s *AdminServer) CreateS3TablesBucket(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
-		return
-	}
+func (s *AdminServer) CreateS3TablesBucket(c *gin.Context) {
 	var req struct {
 		Name  string            `json:"name"`
 		Tags  map[string]string `json:"tags"`
 		Owner string            `json:"owner"`
 	}
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(400, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 	if req.Name == "" {
-		writeJSONError(w, http.StatusBadRequest, "Bucket name is required")
+		c.JSON(400, gin.H{"error": "Bucket name is required"})
 		return
 	}
 	owner := strings.TrimSpace(req.Owner)
 	if len(owner) > MaxOwnerNameLength {
-		writeJSONError(w, http.StatusBadRequest, fmt.Sprintf("Owner name must be %d characters or less", MaxOwnerNameLength))
+		c.JSON(400, gin.H{"error": fmt.Sprintf("Owner name must be %d characters or less", MaxOwnerNameLength)})
 		return
 	}
 	if len(req.Tags) > 0 {
 		if err := s3tables.ValidateTags(req.Tags); err != nil {
-			writeJSONError(w, http.StatusBadRequest, "Invalid tags: "+err.Error())
+			c.JSON(400, gin.H{"error": "Invalid tags: " + err.Error()})
 			return
 		}
 	}
 	createReq := &s3tables.CreateTableBucketRequest{Name: req.Name, Tags: req.Tags}
 	var resp s3tables.CreateTableBucketResponse
-	if err := s.executeS3TablesOperation(r.Context(), "CreateTableBucket", createReq, &resp); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "CreateTableBucket", createReq, &resp); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
 	if owner != "" {
-		if err := s.SetTableBucketOwner(r.Context(), req.Name, owner); err != nil {
+		if err := s.SetTableBucketOwner(c.Request.Context(), req.Name, owner); err != nil {
 			deleteReq := &s3tables.DeleteTableBucketRequest{TableBucketARN: resp.ARN}
-			if deleteErr := s.executeS3TablesOperation(r.Context(), "DeleteTableBucket", deleteReq, nil); deleteErr != nil {
-				writeJSONError(w, http.StatusInternalServerError, fmt.Sprintf("Failed to set table bucket owner: %v; rollback delete failed: %v", err, deleteErr))
+			if deleteErr := s.executeS3TablesOperation(c.Request.Context(), "DeleteTableBucket", deleteReq, nil); deleteErr != nil {
+				c.JSON(500, gin.H{"error": fmt.Sprintf("Failed to set table bucket owner: %v; rollback delete failed: %v", err, deleteErr)})
 				return
 			}
-			writeS3TablesError(w, err)
+			writeS3TablesError(c, err)
 			return
 		}
 	}
-	writeJSON(w, http.StatusCreated, map[string]interface{}{"arn": resp.ARN})
+	c.JSON(201, gin.H{"arn": resp.ARN})
 }
 
 func (s *AdminServer) SetTableBucketOwner(ctx context.Context, bucketName, owner string) error {
@@ -665,107 +663,101 @@ func (s *AdminServer) SetTableBucketOwner(ctx context.Context, bucketName, owner
 	})
 }
 
-func (s *AdminServer) DeleteS3TablesBucket(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
-		return
-	}
-	bucketArn := r.URL.Query().Get("bucket")
+func (s *AdminServer) DeleteS3TablesBucket(c *gin.Context) {
+	bucketArn := c.Query("bucket")
 	if bucketArn == "" {
-		writeJSONError(w, http.StatusBadRequest, "Bucket ARN is required")
+		c.JSON(400, gin.H{"error": "Bucket ARN is required"})
 		return
 	}
 	req := &s3tables.DeleteTableBucketRequest{TableBucketARN: bucketArn}
-	if err := s.executeS3TablesOperation(r.Context(), "DeleteTableBucket", req, nil); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "DeleteTableBucket", req, nil); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "Bucket deleted"})
+	c.JSON(200, gin.H{"message": "Bucket deleted"})
 }
 
-func (s *AdminServer) ListS3TablesNamespacesAPI(w http.ResponseWriter, r *http.Request) {
-	bucketArn := r.URL.Query().Get("bucket")
+func (s *AdminServer) ListS3TablesNamespacesAPI(c *gin.Context) {
+	bucketArn := c.Query("bucket")
 	if bucketArn == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket query parameter is required")
+		c.JSON(400, gin.H{"error": "bucket query parameter is required"})
 		return
 	}
-	data, err := s.GetS3TablesNamespacesData(r.Context(), bucketArn)
+	data, err := s.GetS3TablesNamespacesData(c.Request.Context(), bucketArn)
 	if err != nil {
-		writeS3TablesError(w, err)
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, data)
+	c.JSON(200, data)
 }
 
-func (s *AdminServer) CreateS3TablesNamespace(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
+func (s *AdminServer) CreateS3TablesNamespace(c *gin.Context) {
+	if !requireSessionCSRFToken(c) {
 		return
 	}
 	var req struct {
 		BucketARN string `json:"bucket_arn"`
 		Name      string `json:"name"`
 	}
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(400, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 	if req.BucketARN == "" || req.Name == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket_arn and name are required")
+		c.JSON(400, gin.H{"error": "bucket_arn and name are required"})
 		return
 	}
-	namespaceParts, ok := s.parseNamespaceFromRequest(w, req.Name)
+	namespaceParts, ok := s.parseNamespaceFromGin(c, req.Name)
 	if !ok {
 		return
 	}
 	createReq := &s3tables.CreateNamespaceRequest{TableBucketARN: req.BucketARN, Namespace: namespaceParts}
 	var resp s3tables.CreateNamespaceResponse
-	if err := s.executeS3TablesOperation(r.Context(), "CreateNamespace", createReq, &resp); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "CreateNamespace", createReq, &resp); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusCreated, map[string]interface{}{"namespace": resp.Namespace})
+	c.JSON(201, gin.H{"namespace": resp.Namespace})
 }
 
-func (s *AdminServer) DeleteS3TablesNamespace(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
+func (s *AdminServer) DeleteS3TablesNamespace(c *gin.Context) {
+	if !requireSessionCSRFToken(c) {
 		return
 	}
-	bucketArn := r.URL.Query().Get("bucket")
-	namespace := r.URL.Query().Get("name")
+	bucketArn := c.Query("bucket")
+	namespace := c.Query("name")
 	if bucketArn == "" || namespace == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket and name query parameters are required")
+		c.JSON(400, gin.H{"error": "bucket and name query parameters are required"})
 		return
 	}
-	namespaceParts, ok := s.parseNamespaceFromRequest(w, namespace)
+	namespaceParts, ok := s.parseNamespaceFromGin(c, namespace)
 	if !ok {
 		return
 	}
 	req := &s3tables.DeleteNamespaceRequest{TableBucketARN: bucketArn, Namespace: namespaceParts}
-	if err := s.executeS3TablesOperation(r.Context(), "DeleteNamespace", req, nil); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "DeleteNamespace", req, nil); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "Namespace deleted"})
+	c.JSON(200, gin.H{"message": "Namespace deleted"})
 }
 
-func (s *AdminServer) ListS3TablesTablesAPI(w http.ResponseWriter, r *http.Request) {
-	bucketArn := r.URL.Query().Get("bucket")
+func (s *AdminServer) ListS3TablesTablesAPI(c *gin.Context) {
+	bucketArn := c.Query("bucket")
 	if bucketArn == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket query parameter is required")
+		c.JSON(400, gin.H{"error": "bucket query parameter is required"})
 		return
 	}
-	namespace := r.URL.Query().Get("namespace")
-	data, err := s.GetS3TablesTablesData(r.Context(), bucketArn, namespace)
+	namespace := c.Query("namespace")
+	data, err := s.GetS3TablesTablesData(c.Request.Context(), bucketArn, namespace)
 	if err != nil {
-		writeS3TablesError(w, err)
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, data)
+	c.JSON(200, data)
 }
 
-func (s *AdminServer) CreateS3TablesTable(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
-		return
-	}
+func (s *AdminServer) CreateS3TablesTable(c *gin.Context) {
 	var req struct {
 		BucketARN string                  `json:"bucket_arn"`
 		Namespace string                  `json:"namespace"`
@@ -774,15 +766,15 @@ func (s *AdminServer) CreateS3TablesTable(w http.ResponseWriter, r *http.Request
 		Tags      map[string]string       `json:"tags"`
 		Metadata  *s3tables.TableMetadata `json:"metadata"`
 	}
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(400, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 	if req.BucketARN == "" || req.Namespace == "" || req.Name == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket_arn, namespace, and name are required")
+		c.JSON(400, gin.H{"error": "bucket_arn, namespace, and name are required"})
 		return
 	}
-	namespaceParts, ok := s.parseNamespaceFromRequest(w, req.Namespace)
+	namespaceParts, ok := s.parseNamespaceFromGin(c, req.Namespace)
 	if !ok {
 		return
 	}
@@ -792,7 +784,7 @@ func (s *AdminServer) CreateS3TablesTable(w http.ResponseWriter, r *http.Request
 	}
 	if len(req.Tags) > 0 {
 		if err := s3tables.ValidateTags(req.Tags); err != nil {
-			writeJSONError(w, http.StatusBadRequest, "Invalid tags: "+err.Error())
+			c.JSON(400, gin.H{"error": "Invalid tags: " + err.Error()})
 			return
 		}
 	}
@@ -805,232 +797,211 @@ func (s *AdminServer) CreateS3TablesTable(w http.ResponseWriter, r *http.Request
 		Metadata:       req.Metadata,
 	}
 	var resp s3tables.CreateTableResponse
-	if err := s.executeS3TablesOperation(r.Context(), "CreateTable", createReq, &resp); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "CreateTable", createReq, &resp); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusCreated, map[string]interface{}{"table_arn": resp.TableARN, "version_token": resp.VersionToken})
+	c.JSON(201, gin.H{"table_arn": resp.TableARN, "version_token": resp.VersionToken})
 }
 
-func (s *AdminServer) DeleteS3TablesTable(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
-		return
-	}
-	bucketArn := r.URL.Query().Get("bucket")
-	namespace := r.URL.Query().Get("namespace")
-	name := r.URL.Query().Get("name")
-	version := r.URL.Query().Get("version")
+func (s *AdminServer) DeleteS3TablesTable(c *gin.Context) {
+	bucketArn := c.Query("bucket")
+	namespace := c.Query("namespace")
+	name := c.Query("name")
+	version := c.Query("version")
 	if bucketArn == "" || namespace == "" || name == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket, namespace, and name query parameters are required")
+		c.JSON(400, gin.H{"error": "bucket, namespace, and name query parameters are required"})
 		return
 	}
-	namespaceParts, ok := s.parseNamespaceFromRequest(w, namespace)
+	namespaceParts, ok := s.parseNamespaceFromGin(c, namespace)
 	if !ok {
 		return
 	}
 	req := &s3tables.DeleteTableRequest{TableBucketARN: bucketArn, Namespace: namespaceParts, Name: name, VersionToken: version}
-	if err := s.executeS3TablesOperation(r.Context(), "DeleteTable", req, nil); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "DeleteTable", req, nil); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "Table deleted"})
+	c.JSON(200, gin.H{"message": "Table deleted"})
 }
 
-func (s *AdminServer) PutS3TablesBucketPolicy(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
-		return
-	}
+func (s *AdminServer) PutS3TablesBucketPolicy(c *gin.Context) {
 	var req struct {
 		BucketARN string `json:"bucket_arn"`
 		Policy    string `json:"policy"`
 	}
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(400, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 	if req.BucketARN == "" || req.Policy == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket_arn and policy are required")
+		c.JSON(400, gin.H{"error": "bucket_arn and policy are required"})
 		return
 	}
 	putReq := &s3tables.PutTableBucketPolicyRequest{TableBucketARN: req.BucketARN, ResourcePolicy: req.Policy}
-	if err := s.executeS3TablesOperation(r.Context(), "PutTableBucketPolicy", putReq, nil); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "PutTableBucketPolicy", putReq, nil); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "Policy updated"})
+	c.JSON(200, gin.H{"message": "Policy updated"})
 }
 
-func (s *AdminServer) GetS3TablesBucketPolicy(w http.ResponseWriter, r *http.Request) {
-	bucketArn := r.URL.Query().Get("bucket")
+func (s *AdminServer) GetS3TablesBucketPolicy(c *gin.Context) {
+	bucketArn := c.Query("bucket")
 	if bucketArn == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket query parameter is required")
+		c.JSON(400, gin.H{"error": "bucket query parameter is required"})
 		return
 	}
 	getReq := &s3tables.GetTableBucketPolicyRequest{TableBucketARN: bucketArn}
 	var resp s3tables.GetTableBucketPolicyResponse
-	if err := s.executeS3TablesOperation(r.Context(), "GetTableBucketPolicy", getReq, &resp); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "GetTableBucketPolicy", getReq, &resp); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"policy": resp.ResourcePolicy})
+	c.JSON(200, gin.H{"policy": resp.ResourcePolicy})
 }
 
-func (s *AdminServer) DeleteS3TablesBucketPolicy(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
-		return
-	}
-	bucketArn := r.URL.Query().Get("bucket")
+func (s *AdminServer) DeleteS3TablesBucketPolicy(c *gin.Context) {
+	bucketArn := c.Query("bucket")
 	if bucketArn == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket query parameter is required")
+		c.JSON(400, gin.H{"error": "bucket query parameter is required"})
 		return
 	}
 	deleteReq := &s3tables.DeleteTableBucketPolicyRequest{TableBucketARN: bucketArn}
-	if err := s.executeS3TablesOperation(r.Context(), "DeleteTableBucketPolicy", deleteReq, nil); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "DeleteTableBucketPolicy", deleteReq, nil); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "Policy deleted"})
+	c.JSON(200, gin.H{"message": "Policy deleted"})
 }
 
-func (s *AdminServer) PutS3TablesTablePolicy(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
-		return
-	}
+func (s *AdminServer) PutS3TablesTablePolicy(c *gin.Context) {
 	var req struct {
 		BucketARN string `json:"bucket_arn"`
 		Namespace string `json:"namespace"`
 		Name      string `json:"name"`
 		Policy    string `json:"policy"`
 	}
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(400, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 	if req.BucketARN == "" || req.Namespace == "" || req.Name == "" || req.Policy == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket_arn, namespace, name, and policy are required")
+		c.JSON(400, gin.H{"error": "bucket_arn, namespace, name, and policy are required"})
 		return
 	}
-	namespaceParts, ok := s.parseNamespaceFromRequest(w, req.Namespace)
+	namespaceParts, ok := s.parseNamespaceFromGin(c, req.Namespace)
 	if !ok {
 		return
 	}
 	putReq := &s3tables.PutTablePolicyRequest{TableBucketARN: req.BucketARN, Namespace: namespaceParts, Name: req.Name, ResourcePolicy: req.Policy}
-	if err := s.executeS3TablesOperation(r.Context(), "PutTablePolicy", putReq, nil); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "PutTablePolicy", putReq, nil); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "Policy updated"})
+	c.JSON(200, gin.H{"message": "Policy updated"})
 }
 
-func (s *AdminServer) GetS3TablesTablePolicy(w http.ResponseWriter, r *http.Request) {
-	bucketArn := r.URL.Query().Get("bucket")
-	namespace := r.URL.Query().Get("namespace")
-	name := r.URL.Query().Get("name")
+func (s *AdminServer) GetS3TablesTablePolicy(c *gin.Context) {
+	bucketArn := c.Query("bucket")
+	namespace := c.Query("namespace")
+	name := c.Query("name")
 	if bucketArn == "" || namespace == "" || name == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket, namespace, and name query parameters are required")
+		c.JSON(400, gin.H{"error": "bucket, namespace, and name query parameters are required"})
 		return
 	}
-	namespaceParts, ok := s.parseNamespaceFromRequest(w, namespace)
+	namespaceParts, ok := s.parseNamespaceFromGin(c, namespace)
 	if !ok {
 		return
 	}
 	getReq := &s3tables.GetTablePolicyRequest{TableBucketARN: bucketArn, Namespace: namespaceParts, Name: name}
 	var resp s3tables.GetTablePolicyResponse
-	if err := s.executeS3TablesOperation(r.Context(), "GetTablePolicy", getReq, &resp); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "GetTablePolicy", getReq, &resp); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"policy": resp.ResourcePolicy})
+	c.JSON(200, gin.H{"policy": resp.ResourcePolicy})
 }
 
-func (s *AdminServer) DeleteS3TablesTablePolicy(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
-		return
-	}
-	bucketArn := r.URL.Query().Get("bucket")
-	namespace := r.URL.Query().Get("namespace")
-	name := r.URL.Query().Get("name")
+func (s *AdminServer) DeleteS3TablesTablePolicy(c *gin.Context) {
+	bucketArn := c.Query("bucket")
+	namespace := c.Query("namespace")
+	name := c.Query("name")
 	if bucketArn == "" || namespace == "" || name == "" {
-		writeJSONError(w, http.StatusBadRequest, "bucket, namespace, and name query parameters are required")
+		c.JSON(400, gin.H{"error": "bucket, namespace, and name query parameters are required"})
 		return
 	}
-	namespaceParts, ok := s.parseNamespaceFromRequest(w, namespace)
+	namespaceParts, ok := s.parseNamespaceFromGin(c, namespace)
 	if !ok {
 		return
 	}
 	deleteReq := &s3tables.DeleteTablePolicyRequest{TableBucketARN: bucketArn, Namespace: namespaceParts, Name: name}
-	if err := s.executeS3TablesOperation(r.Context(), "DeleteTablePolicy", deleteReq, nil); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "DeleteTablePolicy", deleteReq, nil); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "Policy deleted"})
+	c.JSON(200, gin.H{"message": "Policy deleted"})
 }
 
-func (s *AdminServer) TagS3TablesResource(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
-		return
-	}
+func (s *AdminServer) TagS3TablesResource(c *gin.Context) {
 	var req struct {
 		ResourceARN string            `json:"resource_arn"`
 		Tags        map[string]string `json:"tags"`
 	}
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(400, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 	if req.ResourceARN == "" || len(req.Tags) == 0 {
-		writeJSONError(w, http.StatusBadRequest, "resource_arn and tags are required")
+		c.JSON(400, gin.H{"error": "resource_arn and tags are required"})
 		return
 	}
 	if err := s3tables.ValidateTags(req.Tags); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid tags: "+err.Error())
+		c.JSON(400, gin.H{"error": "Invalid tags: " + err.Error()})
 		return
 	}
 	tagReq := &s3tables.TagResourceRequest{ResourceARN: req.ResourceARN, Tags: req.Tags}
-	if err := s.executeS3TablesOperation(r.Context(), "TagResource", tagReq, nil); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "TagResource", tagReq, nil); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "Tags updated"})
+	c.JSON(200, gin.H{"message": "Tags updated"})
 }
 
-func (s *AdminServer) ListS3TablesTags(w http.ResponseWriter, r *http.Request) {
-	resourceArn := r.URL.Query().Get("arn")
+func (s *AdminServer) ListS3TablesTags(c *gin.Context) {
+	resourceArn := c.Query("arn")
 	if resourceArn == "" {
-		writeJSONError(w, http.StatusBadRequest, "arn query parameter is required")
+		c.JSON(400, gin.H{"error": "arn query parameter is required"})
 		return
 	}
 	listReq := &s3tables.ListTagsForResourceRequest{ResourceARN: resourceArn}
 	var resp s3tables.ListTagsForResourceResponse
-	if err := s.executeS3TablesOperation(r.Context(), "ListTagsForResource", listReq, &resp); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "ListTagsForResource", listReq, &resp); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, resp)
+	c.JSON(200, resp)
 }
 
-func (s *AdminServer) UntagS3TablesResource(w http.ResponseWriter, r *http.Request) {
-	if !requireSessionCSRFToken(w, r) {
-		return
-	}
+func (s *AdminServer) UntagS3TablesResource(c *gin.Context) {
 	var req struct {
 		ResourceARN string   `json:"resource_arn"`
 		TagKeys     []string `json:"tag_keys"`
 	}
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(400, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 	if req.ResourceARN == "" || len(req.TagKeys) == 0 {
-		writeJSONError(w, http.StatusBadRequest, "resource_arn and tag_keys are required")
+		c.JSON(400, gin.H{"error": "resource_arn and tag_keys are required"})
 		return
 	}
 	untagReq := &s3tables.UntagResourceRequest{ResourceARN: req.ResourceARN, TagKeys: req.TagKeys}
-	if err := s.executeS3TablesOperation(r.Context(), "UntagResource", untagReq, nil); err != nil {
-		writeS3TablesError(w, err)
+	if err := s.executeS3TablesOperation(c.Request.Context(), "UntagResource", untagReq, nil); err != nil {
+		writeS3TablesError(c, err)
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "Tags removed"})
+	c.JSON(200, gin.H{"message": "Tags removed"})
 }
 
 func parseS3TablesErrorMessage(err error) string {
@@ -1047,8 +1018,8 @@ func parseS3TablesErrorMessage(err error) string {
 	return err.Error()
 }
 
-func writeS3TablesError(w http.ResponseWriter, err error) {
-	writeJSONError(w, s3TablesErrorStatus(err), parseS3TablesErrorMessage(err))
+func writeS3TablesError(c *gin.Context, err error) {
+	c.JSON(s3TablesErrorStatus(err), gin.H{"error": parseS3TablesErrorMessage(err)})
 }
 
 func s3TablesErrorStatus(err error) int {

weed/admin/dash/worker_grpc_server.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"io"
 	"net"
-	"strconv"
 	"sync"
 	"time"
 
 	"github.com/seaweedfs/seaweedfs/weed/admin/maintenance"
+	"github.com/seaweedfs/seaweedfs/weed/admin/plugin"
 	"github.com/seaweedfs/seaweedfs/weed/glog"
 	"github.com/seaweedfs/seaweedfs/weed/pb"
 	"github.com/seaweedfs/seaweedfs/weed/pb/plugin_pb"
@@ -95,9 +95,18 @@ func (s *WorkerGrpcServer) StartWithTLS(port int) error {
 	grpcServer := pb.NewGrpcServer(security.LoadServerTLS(util.GetViper(), "grpc.admin"))
 
 	worker_pb.RegisterWorkerServiceServer(grpcServer, s)
-	if plugin := s.adminServer.GetPlugin(); plugin != nil {
-		plugin_pb.RegisterPluginControlServiceServer(grpcServer, plugin)
-		glog.V(0).Infof("Plugin gRPC service registered on worker gRPC server")
+
+	// Register plugin service if plugin manager is available
+	if s.adminServer.GetPluginManager() != nil {
+		// Cast the interface{} to *plugin.Manager
+		if pm, ok := s.adminServer.GetPluginManager().(*plugin.Manager); ok {
+			if pluginGrpcServer := pm.GetGRPCServer(); pluginGrpcServer != nil {
+				plugin_pb.RegisterPluginServiceServer(grpcServer, pluginGrpcServer)
+				plugin_pb.RegisterAdminQueryServiceServer(grpcServer, pluginGrpcServer)
+				plugin_pb.RegisterAdminCommandServiceServer(grpcServer, pluginGrpcServer)
+				glog.Infof("Registered plugin services on worker gRPC server")
+			}
+		}
 	}
 
 	s.grpcServer = grpcServer
@@ -120,25 +129,6 @@ func (s *WorkerGrpcServer) StartWithTLS(port int) error {
 	return nil
 }
 
-// ListenPort returns the currently bound worker gRPC listen port.
-func (s *WorkerGrpcServer) ListenPort() int {
-	if s == nil || s.listener == nil {
-		return 0
-	}
-	if tcpAddr, ok := s.listener.Addr().(*net.TCPAddr); ok {
-		return tcpAddr.Port
-	}
-	_, portStr, err := net.SplitHostPort(s.listener.Addr().String())
-	if err != nil {
-		return 0
-	}
-	port, err := strconv.Atoi(portStr)
-	if err != nil {
-		return 0
-	}
-	return port
-}
-
 // Stop stops the gRPC server
 func (s *WorkerGrpcServer) Stop() error {
 	if !s.running {

weed/admin/handlers/admin_handlers_routes_test.go

@@ -1,93 +0,0 @@
-package handlers
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/gorilla/mux"
-	"github.com/gorilla/sessions"
-	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
-)
-
-func TestSetupRoutes_RegistersPluginSchedulerStatesAPI_NoAuth(t *testing.T) {
-	router := mux.NewRouter()
-
-	newRouteTestAdminHandlers().SetupRoutes(router, false, "", "", "", "", true)
-
-	if !hasRoute(router, http.MethodGet, "/api/plugin/scheduler-states") {
-		t.Fatalf("expected GET /api/plugin/scheduler-states to be registered in no-auth mode")
-	}
-	if !hasRoute(router, http.MethodGet, "/api/plugin/jobs/example/detail") {
-		t.Fatalf("expected GET /api/plugin/jobs/:jobId/detail to be registered in no-auth mode")
-	}
-}
-
-func TestSetupRoutes_RegistersPluginSchedulerStatesAPI_WithAuth(t *testing.T) {
-	router := mux.NewRouter()
-
-	newRouteTestAdminHandlers().SetupRoutes(router, true, "admin", "password", "", "", true)
-
-	if !hasRoute(router, http.MethodGet, "/api/plugin/scheduler-states") {
-		t.Fatalf("expected GET /api/plugin/scheduler-states to be registered in auth mode")
-	}
-	if !hasRoute(router, http.MethodGet, "/api/plugin/jobs/example/detail") {
-		t.Fatalf("expected GET /api/plugin/jobs/:jobId/detail to be registered in auth mode")
-	}
-}
-
-func TestSetupRoutes_RegistersPluginPages_NoAuth(t *testing.T) {
-	router := mux.NewRouter()
-
-	newRouteTestAdminHandlers().SetupRoutes(router, false, "", "", "", "", true)
-
-	assertHasRoute(t, router, http.MethodGet, "/plugin")
-	assertHasRoute(t, router, http.MethodGet, "/plugin/configuration")
-	assertHasRoute(t, router, http.MethodGet, "/plugin/queue")
-	assertHasRoute(t, router, http.MethodGet, "/plugin/detection")
-	assertHasRoute(t, router, http.MethodGet, "/plugin/execution")
-	assertHasRoute(t, router, http.MethodGet, "/plugin/monitoring")
-}
-
-func TestSetupRoutes_RegistersPluginPages_WithAuth(t *testing.T) {
-	router := mux.NewRouter()
-
-	newRouteTestAdminHandlers().SetupRoutes(router, true, "admin", "password", "", "", true)
-
-	assertHasRoute(t, router, http.MethodGet, "/plugin")
-	assertHasRoute(t, router, http.MethodGet, "/plugin/configuration")
-	assertHasRoute(t, router, http.MethodGet, "/plugin/queue")
-	assertHasRoute(t, router, http.MethodGet, "/plugin/detection")
-	assertHasRoute(t, router, http.MethodGet, "/plugin/execution")
-	assertHasRoute(t, router, http.MethodGet, "/plugin/monitoring")
-}
-
-func newRouteTestAdminHandlers() *AdminHandlers {
-	adminServer := &dash.AdminServer{}
-	store := sessions.NewCookieStore([]byte("test-session-key"))
-	return &AdminHandlers{
-		adminServer:            adminServer,
-		sessionStore:           store,
-		authHandlers:           &AuthHandlers{adminServer: adminServer, sessionStore: store},
-		clusterHandlers:        &ClusterHandlers{adminServer: adminServer},
-		fileBrowserHandlers:    &FileBrowserHandlers{adminServer: adminServer},
-		userHandlers:           &UserHandlers{adminServer: adminServer},
-		policyHandlers:         &PolicyHandlers{adminServer: adminServer},
-		pluginHandlers:         &PluginHandlers{adminServer: adminServer},
-		mqHandlers:             &MessageQueueHandlers{adminServer: adminServer},
-		serviceAccountHandlers: &ServiceAccountHandlers{adminServer: adminServer},
-	}
-}
-
-func hasRoute(router *mux.Router, method string, path string) bool {
-	req := httptest.NewRequest(method, path, nil)
-	var match mux.RouteMatch
-	return router.Match(req, &match)
-}
-
-func assertHasRoute(t *testing.T, router *mux.Router, method string, path string) {
-	t.Helper()
-	if !hasRoute(router, method, path) {
-		t.Fatalf("expected %s %s to be registered", method, path)
-	}
-}

weed/admin/handlers/auth_handlers.go

@@ -3,65 +3,52 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/gorilla/sessions"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/layout"
-	"github.com/seaweedfs/seaweedfs/weed/glog"
 )
 
 // AuthHandlers contains authentication-related HTTP handlers
 type AuthHandlers struct {
-	adminServer  *dash.AdminServer
-	sessionStore sessions.Store
+	adminServer *dash.AdminServer
 }
 
 // NewAuthHandlers creates a new instance of AuthHandlers
-func NewAuthHandlers(adminServer *dash.AdminServer, store sessions.Store) *AuthHandlers {
+func NewAuthHandlers(adminServer *dash.AdminServer) *AuthHandlers {
 	return &AuthHandlers{
-		adminServer:  adminServer,
-		sessionStore: store,
+		adminServer: adminServer,
 	}
 }
 
 // ShowLogin displays the login page
-func (a *AuthHandlers) ShowLogin(w http.ResponseWriter, r *http.Request) {
-	session, err := a.sessionStore.Get(r, dash.SessionName())
-	var csrfToken string
-	if err == nil {
-		if authenticated, _ := session.Values["authenticated"].(bool); authenticated {
-			http.Redirect(w, r, "/admin", http.StatusSeeOther)
-			return
-		}
-	} else {
-		glog.V(1).Infof("Failed to load session for login page: %v", err)
+func (a *AuthHandlers) ShowLogin(c *gin.Context) {
+	session := sessions.Default(c)
+
+	// If already authenticated, redirect to admin
+	if session.Get("authenticated") == true {
+		c.Redirect(http.StatusSeeOther, "/admin")
+		return
 	}
 
-	if session != nil {
-		token, tokenErr := dash.EnsureSessionCSRFToken(session, r, w)
-		if tokenErr != nil {
-			glog.V(1).Infof("Failed to ensure CSRF token for login page: %v", tokenErr)
-		} else {
-			csrfToken = token
-		}
-	}
-
-	errorMessage := r.URL.Query().Get("error")
+	errorMessage := c.Query("error")
 
 	// Render login template
-	w.Header().Set("Content-Type", "text/html")
-	loginComponent := layout.LoginForm("SeaweedFS Admin", errorMessage, csrfToken)
-	if err := loginComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render login template: "+err.Error())
+	c.Header("Content-Type", "text/html")
+	loginComponent := layout.LoginForm(c, "SeaweedFS Admin", errorMessage)
+	err := loginComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render login template: " + err.Error()})
 		return
 	}
 }
 
 // HandleLogin handles login form submission
-func (a *AuthHandlers) HandleLogin(adminUser, adminPassword, readOnlyUser, readOnlyPassword string) http.HandlerFunc {
-	return a.adminServer.HandleLogin(a.sessionStore, adminUser, adminPassword, readOnlyUser, readOnlyPassword)
+func (a *AuthHandlers) HandleLogin(adminUser, adminPassword, readOnlyUser, readOnlyPassword string) gin.HandlerFunc {
+	return a.adminServer.HandleLogin(adminUser, adminPassword, readOnlyUser, readOnlyPassword)
 }
 
 // HandleLogout handles user logout
-func (a *AuthHandlers) HandleLogout(w http.ResponseWriter, r *http.Request) {
-	a.adminServer.HandleLogout(a.sessionStore, w, r)
+func (a *AuthHandlers) HandleLogout(c *gin.Context) {
+	a.adminServer.HandleLogout(c)
 }

weed/admin/handlers/cluster_handlers.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/gorilla/mux"
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/app"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/layout"
@@ -24,387 +24,402 @@ func NewClusterHandlers(adminServer *dash.AdminServer) *ClusterHandlers {
 }
 
 // ShowClusterVolumeServers renders the cluster volume servers page
-func (h *ClusterHandlers) ShowClusterVolumeServers(w http.ResponseWriter, r *http.Request) {
+func (h *ClusterHandlers) ShowClusterVolumeServers(c *gin.Context) {
 	// Get cluster volume servers data
 	volumeServersData, err := h.adminServer.GetClusterVolumeServers()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get cluster volume servers: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get cluster volume servers: " + err.Error()})
 		return
 	}
 
-	username := usernameOrDefault(r)
+	// Set username
+	username := c.GetString("username")
+	if username == "" {
+		username = "admin"
+	}
 	volumeServersData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	volumeServersComponent := app.ClusterVolumeServers(*volumeServersData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, volumeServersComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+	layoutComponent := layout.Layout(c, volumeServersComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowClusterVolumes renders the cluster volumes page
-func (h *ClusterHandlers) ShowClusterVolumes(w http.ResponseWriter, r *http.Request) {
+func (h *ClusterHandlers) ShowClusterVolumes(c *gin.Context) {
 	// Get pagination and sorting parameters from query string
 	page := 1
-	if p := r.URL.Query().Get("page"); p != "" {
+	if p := c.Query("page"); p != "" {
 		if parsed, err := strconv.Atoi(p); err == nil && parsed > 0 {
 			page = parsed
 		}
 	}
 
 	pageSize := 100
-	if ps := r.URL.Query().Get("pageSize"); ps != "" {
+	if ps := c.Query("pageSize"); ps != "" {
 		if parsed, err := strconv.Atoi(ps); err == nil && parsed > 0 && parsed <= 1000 {
 			pageSize = parsed
 		}
 	}
 
-	sortBy := defaultQuery(r.URL.Query().Get("sortBy"), "id")
-	sortOrder := defaultQuery(r.URL.Query().Get("sortOrder"), "asc")
-	collection := r.URL.Query().Get("collection") // Optional collection filter
+	sortBy := c.DefaultQuery("sortBy", "id")
+	sortOrder := c.DefaultQuery("sortOrder", "asc")
+	collection := c.Query("collection") // Optional collection filter
 
 	// Get cluster volumes data
 	volumesData, err := h.adminServer.GetClusterVolumes(page, pageSize, sortBy, sortOrder, collection)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get cluster volumes: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get cluster volumes: " + err.Error()})
 		return
 	}
 
-	username := usernameOrDefault(r)
+	// Set username
+	username := c.GetString("username")
+	if username == "" {
+		username = "admin"
+	}
 	volumesData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	volumesComponent := app.ClusterVolumes(*volumesData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, volumesComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+	layoutComponent := layout.Layout(c, volumesComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowVolumeDetails renders the volume details page
-func (h *ClusterHandlers) ShowVolumeDetails(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	volumeIDStr := vars["id"]
-	server := vars["server"]
+func (h *ClusterHandlers) ShowVolumeDetails(c *gin.Context) {
+	volumeIDStr := c.Param("id")
+	server := c.Param("server")
 
 	if volumeIDStr == "" {
-		writeJSONError(w, http.StatusBadRequest, "Volume ID is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Volume ID is required"})
 		return
 	}
 
 	if server == "" {
-		writeJSONError(w, http.StatusBadRequest, "Server is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Server is required"})
 		return
 	}
 
 	volumeID, err := strconv.Atoi(volumeIDStr)
 	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid volume ID")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid volume ID"})
 		return
 	}
 
 	// Get volume details
 	volumeDetails, err := h.adminServer.GetVolumeDetails(volumeID, server)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get volume details: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get volume details: " + err.Error()})
 		return
 	}
 
-	username := usernameOrDefault(r)
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	volumeDetailsComponent := app.VolumeDetails(*volumeDetails)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, volumeDetailsComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+	layoutComponent := layout.Layout(c, volumeDetailsComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowClusterCollections renders the cluster collections page
-func (h *ClusterHandlers) ShowClusterCollections(w http.ResponseWriter, r *http.Request) {
+func (h *ClusterHandlers) ShowClusterCollections(c *gin.Context) {
 	// Get cluster collections data
 	collectionsData, err := h.adminServer.GetClusterCollections()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get cluster collections: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get cluster collections: " + err.Error()})
 		return
 	}
 
-	username := usernameOrDefault(r)
+	// Set username
+	username := c.GetString("username")
+	if username == "" {
+		username = "admin"
+	}
 	collectionsData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	collectionsComponent := app.ClusterCollections(*collectionsData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, collectionsComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+	layoutComponent := layout.Layout(c, collectionsComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowCollectionDetails renders the collection detail page
-func (h *ClusterHandlers) ShowCollectionDetails(w http.ResponseWriter, r *http.Request) {
-	collectionName := mux.Vars(r)["name"]
+func (h *ClusterHandlers) ShowCollectionDetails(c *gin.Context) {
+	collectionName := c.Param("name")
 	if collectionName == "" {
-		writeJSONError(w, http.StatusBadRequest, "Collection name is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Collection name is required"})
 		return
 	}
 
 	// Parse query parameters
-	query := r.URL.Query()
-	page, _ := strconv.Atoi(defaultQuery(query.Get("page"), "1"))
-	pageSize, _ := strconv.Atoi(defaultQuery(query.Get("page_size"), "25"))
-	sortBy := defaultQuery(query.Get("sort_by"), "volume_id")
-	sortOrder := defaultQuery(query.Get("sort_order"), "asc")
+	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
+	pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "25"))
+	sortBy := c.DefaultQuery("sort_by", "volume_id")
+	sortOrder := c.DefaultQuery("sort_order", "asc")
 
 	// Get collection details data (volumes and EC volumes)
 	collectionDetailsData, err := h.adminServer.GetCollectionDetails(collectionName, page, pageSize, sortBy, sortOrder)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get collection details: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get collection details: " + err.Error()})
 		return
 	}
 
-	username := usernameOrDefault(r)
+	// Set username
+	username := c.GetString("username")
+	if username == "" {
+		username = "admin"
+	}
 	collectionDetailsData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	collectionDetailsComponent := app.CollectionDetails(*collectionDetailsData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, collectionDetailsComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+	layoutComponent := layout.Layout(c, collectionDetailsComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowClusterEcShards handles the cluster EC shards page (individual shards view)
-func (h *ClusterHandlers) ShowClusterEcShards(w http.ResponseWriter, r *http.Request) {
+func (h *ClusterHandlers) ShowClusterEcShards(c *gin.Context) {
 	// Parse query parameters
-	query := r.URL.Query()
-	page, _ := strconv.Atoi(defaultQuery(query.Get("page"), "1"))
-	pageSize, _ := strconv.Atoi(defaultQuery(query.Get("page_size"), "100"))
-	sortBy := defaultQuery(query.Get("sort_by"), "volume_id")
-	sortOrder := defaultQuery(query.Get("sort_order"), "asc")
-	collection := defaultQuery(query.Get("collection"), "")
+	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
+	pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "100"))
+	sortBy := c.DefaultQuery("sort_by", "volume_id")
+	sortOrder := c.DefaultQuery("sort_order", "asc")
+	collection := c.DefaultQuery("collection", "")
 
 	// Get data from admin server
 	data, err := h.adminServer.GetClusterEcVolumes(page, pageSize, sortBy, sortOrder, collection)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	username := usernameOrDefault(r)
+	// Set username
+	username := c.GetString("username")
+	if username == "" {
+		username = "admin"
+	}
 	data.Username = username
 
 	// Render template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	ecVolumesComponent := app.ClusterEcVolumes(*data)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, ecVolumesComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
+	layoutComponent := layout.Layout(c, ecVolumesComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 }
 
 // ShowEcVolumeDetails renders the EC volume details page
-func (h *ClusterHandlers) ShowEcVolumeDetails(w http.ResponseWriter, r *http.Request) {
-	volumeIDStr := mux.Vars(r)["id"]
+func (h *ClusterHandlers) ShowEcVolumeDetails(c *gin.Context) {
+	volumeIDStr := c.Param("id")
 
 	if volumeIDStr == "" {
-		writeJSONError(w, http.StatusBadRequest, "Volume ID is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Volume ID is required"})
 		return
 	}
 
 	volumeID, err := strconv.Atoi(volumeIDStr)
 	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid volume ID")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid volume ID"})
 		return
 	}
 
 	// Check that volumeID is within uint32 range
 	if volumeID < 0 || uint64(volumeID) > math.MaxUint32 {
-		writeJSONError(w, http.StatusBadRequest, "Volume ID out of range")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Volume ID out of range"})
 		return
 	}
 
 	// Parse sorting parameters
-	query := r.URL.Query()
-	sortBy := defaultQuery(query.Get("sort_by"), "shard_id")
-	sortOrder := defaultQuery(query.Get("sort_order"), "asc")
+	sortBy := c.DefaultQuery("sort_by", "shard_id")
+	sortOrder := c.DefaultQuery("sort_order", "asc")
 
 	// Get EC volume details
 	ecVolumeDetails, err := h.adminServer.GetEcVolumeDetails(uint32(volumeID), sortBy, sortOrder)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get EC volume details: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get EC volume details: " + err.Error()})
 		return
 	}
 
-	username := usernameOrDefault(r)
+	// Set username
+	username := c.GetString("username")
+	if username == "" {
+		username = "admin"
+	}
 	ecVolumeDetails.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	ecVolumeDetailsComponent := app.EcVolumeDetails(*ecVolumeDetails)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, ecVolumeDetailsComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+	layoutComponent := layout.Layout(c, ecVolumeDetailsComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowClusterMasters renders the cluster masters page
-func (h *ClusterHandlers) ShowClusterMasters(w http.ResponseWriter, r *http.Request) {
+func (h *ClusterHandlers) ShowClusterMasters(c *gin.Context) {
 	// Get cluster masters data
 	mastersData, err := h.adminServer.GetClusterMasters()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get cluster masters: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get cluster masters: " + err.Error()})
 		return
 	}
 
-	username := usernameOrDefault(r)
+	// Set username
+	username := c.GetString("username")
+	if username == "" {
+		username = "admin"
+	}
 	mastersData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	mastersComponent := app.ClusterMasters(*mastersData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, mastersComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+	layoutComponent := layout.Layout(c, mastersComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowClusterFilers renders the cluster filers page
-func (h *ClusterHandlers) ShowClusterFilers(w http.ResponseWriter, r *http.Request) {
+func (h *ClusterHandlers) ShowClusterFilers(c *gin.Context) {
 	// Get cluster filers data
 	filersData, err := h.adminServer.GetClusterFilers()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get cluster filers: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get cluster filers: " + err.Error()})
 		return
 	}
 
-	username := usernameOrDefault(r)
+	// Set username
+	username := c.GetString("username")
+	if username == "" {
+		username = "admin"
+	}
 	filersData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	filersComponent := app.ClusterFilers(*filersData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, filersComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+	layoutComponent := layout.Layout(c, filersComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowClusterBrokers renders the cluster message brokers page
-func (h *ClusterHandlers) ShowClusterBrokers(w http.ResponseWriter, r *http.Request) {
+func (h *ClusterHandlers) ShowClusterBrokers(c *gin.Context) {
 	// Get cluster brokers data
 	brokersData, err := h.adminServer.GetClusterBrokers()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get cluster brokers: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get cluster brokers: " + err.Error()})
 		return
 	}
 
-	username := usernameOrDefault(r)
+	// Set username
+	username := c.GetString("username")
+	if username == "" {
+		username = "admin"
+	}
 	brokersData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	brokersComponent := app.ClusterBrokers(*brokersData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, brokersComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+	layoutComponent := layout.Layout(c, brokersComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // GetClusterTopology returns the cluster topology as JSON
-func (h *ClusterHandlers) GetClusterTopology(w http.ResponseWriter, r *http.Request) {
+func (h *ClusterHandlers) GetClusterTopology(c *gin.Context) {
 	topology, err := h.adminServer.GetClusterTopology()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
-	writeJSON(w, http.StatusOK, topology)
+	c.JSON(http.StatusOK, topology)
 }
 
 // GetMasters returns master node information
-func (h *ClusterHandlers) GetMasters(w http.ResponseWriter, r *http.Request) {
-	mastersData, err := h.adminServer.GetClusterMasters()
-	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get cluster masters: "+err.Error())
-		return
-	}
-	writeJSON(w, http.StatusOK, mastersData)
+func (h *ClusterHandlers) GetMasters(c *gin.Context) {
+	// Simple master info
+	c.JSON(http.StatusOK, gin.H{"masters": []gin.H{{"address": "localhost:9333"}}})
 }
 
 // GetVolumeServers returns volume server information
-func (h *ClusterHandlers) GetVolumeServers(w http.ResponseWriter, r *http.Request) {
+func (h *ClusterHandlers) GetVolumeServers(c *gin.Context) {
 	topology, err := h.adminServer.GetClusterTopology()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"volume_servers": topology.VolumeServers})
+	c.JSON(http.StatusOK, gin.H{"volume_servers": topology.VolumeServers})
 }
 
 // VacuumVolume handles volume vacuum requests via API
-func (h *ClusterHandlers) VacuumVolume(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	volumeIDStr := vars["id"]
-	server := vars["server"]
+func (h *ClusterHandlers) VacuumVolume(c *gin.Context) {
+	volumeIDStr := c.Param("id")
+	server := c.Param("server")
 
 	if volumeIDStr == "" {
-		writeJSONError(w, http.StatusBadRequest, "Volume ID is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Volume ID is required"})
 		return
 	}
 
 	volumeID, err := strconv.Atoi(volumeIDStr)
 	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid volume ID")
-		return
-	}
-
-	if server == "" {
-		writeJSONError(w, http.StatusBadRequest, "Server is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid volume ID"})
 		return
 	}
 
 	// Perform vacuum operation
 	err = h.adminServer.VacuumVolume(volumeID, server)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to vacuum volume: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{
+			"error": "Failed to vacuum volume: " + err.Error(),
+		})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message":   "Volume vacuum started successfully",
 		"volume_id": volumeID,
 		"server":    server,
 	})
 }
-
-func usernameOrDefault(r *http.Request) string {
-	username := dash.UsernameFromContext(r.Context())
-	if username == "" {
-		return "admin"
-	}
-	return username
-}

weed/admin/handlers/file_browser_handlers.go

@@ -16,6 +16,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/app"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/layout"
@@ -58,16 +59,16 @@ func (h *FileBrowserHandlers) newClientWithTimeout(timeout time.Duration) http.C
 }
 
 // ShowFileBrowser renders the file browser page
-func (h *FileBrowserHandlers) ShowFileBrowser(w http.ResponseWriter, r *http.Request) {
+func (h *FileBrowserHandlers) ShowFileBrowser(c *gin.Context) {
 	// Get path from query parameter, default to root
-	path := defaultQuery(r.URL.Query().Get("path"), "/")
+	path := c.DefaultQuery("path", "/")
 	// Normalize Windows-style paths for consistency
 	path = util.CleanWindowsPath(path)
 
 	// Get pagination parameters
-	lastFileName := r.URL.Query().Get("lastFileName")
+	lastFileName := c.DefaultQuery("lastFileName", "")
 
-	pageSize, err := strconv.Atoi(defaultQuery(r.URL.Query().Get("limit"), "20"))
+	pageSize, err := strconv.Atoi(c.DefaultQuery("limit", "20"))
 	if err != nil || pageSize < 1 {
 		pageSize = 20
 	}
@@ -78,42 +79,36 @@ func (h *FileBrowserHandlers) ShowFileBrowser(w http.ResponseWriter, r *http.Req
 	// Get file browser data with cursor-based pagination
 	browserData, err := h.adminServer.GetFileBrowser(path, lastFileName, pageSize)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get file browser data: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get file browser data: " + err.Error()})
 		return
 	}
 
 	// Set username
-	username := dash.UsernameFromContext(r.Context())
+	username := c.GetString("username")
 	if username == "" {
 		username = "admin"
 	}
 	browserData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	browserComponent := app.FileBrowser(*browserData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, browserComponent)
-	err = layoutComponent.Render(r.Context(), w)
+	layoutComponent := layout.Layout(c, browserComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // DeleteFile handles file deletion API requests
-func (h *FileBrowserHandlers) DeleteFile(w http.ResponseWriter, r *http.Request) {
+func (h *FileBrowserHandlers) DeleteFile(c *gin.Context) {
 	var request struct {
 		Path string `json:"path" binding:"required"`
 	}
 
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &request); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
-		return
-	}
-
-	if strings.TrimSpace(request.Path) == "" {
-		writeJSONError(w, http.StatusBadRequest, "path is required")
+	if err := c.ShouldBindJSON(&request); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
@@ -129,36 +124,29 @@ func (h *FileBrowserHandlers) DeleteFile(w http.ResponseWriter, r *http.Request)
 		return err
 	})
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to delete file: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete file: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "File deleted successfully"})
+	c.JSON(http.StatusOK, gin.H{"message": "File deleted successfully"})
 }
 
 // DeleteMultipleFiles handles multiple file deletion API requests
-func (h *FileBrowserHandlers) DeleteMultipleFiles(w http.ResponseWriter, r *http.Request) {
+func (h *FileBrowserHandlers) DeleteMultipleFiles(c *gin.Context) {
 	var request struct {
 		Paths []string `json:"paths" binding:"required"`
 	}
 
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &request); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&request); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	if len(request.Paths) == 0 {
-		writeJSONError(w, http.StatusBadRequest, "No paths provided")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "No paths provided"})
 		return
 	}
 
-	for _, path := range request.Paths {
-		if strings.TrimSpace(path) == "" {
-			writeJSONError(w, http.StatusBadRequest, "path is required")
-			return
-		}
-	}
-
 	var deletedCount int
 	var failedCount int
 	var errors []string
@@ -201,40 +189,37 @@ func (h *FileBrowserHandlers) DeleteMultipleFiles(w http.ResponseWriter, r *http
 		} else {
 			response["message"] = fmt.Sprintf("Deleted %d item(s), failed to delete %d item(s)", deletedCount, failedCount)
 		}
-		writeJSON(w, http.StatusOK, response)
+		c.JSON(http.StatusOK, response)
 	} else {
 		response["message"] = "Failed to delete all selected items"
-		writeJSON(w, http.StatusInternalServerError, response)
+		c.JSON(http.StatusInternalServerError, response)
 	}
 }
 
 // CreateFolder handles folder creation requests
-func (h *FileBrowserHandlers) CreateFolder(w http.ResponseWriter, r *http.Request) {
+func (h *FileBrowserHandlers) CreateFolder(c *gin.Context) {
 	var request struct {
 		Path       string `json:"path" binding:"required"`
 		FolderName string `json:"folder_name" binding:"required"`
 	}
 
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &request); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
-		return
-	}
-
-	if strings.TrimSpace(request.Path) == "" {
-		writeJSONError(w, http.StatusBadRequest, "path is required")
+	if err := c.ShouldBindJSON(&request); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	// Clean and validate folder name
 	folderName := strings.TrimSpace(request.FolderName)
 	if folderName == "" || strings.Contains(folderName, "/") || strings.Contains(folderName, "\\") {
-		writeJSONError(w, http.StatusBadRequest, "Invalid folder name")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid folder name"})
 		return
 	}
 
 	// Create full path for new folder
-	base := "/" + strings.TrimPrefix(request.Path, "/")
-	fullPath := path.Join(base, folderName)
+	fullPath := filepath.Join(request.Path, folderName)
+	if !strings.HasPrefix(fullPath, "/") {
+		fullPath = "/" + fullPath
+	}
 
 	// Create folder via filer
 	err := h.adminServer.WithFilerClient(func(client filer_pb.SeaweedFilerClient) error {
@@ -256,32 +241,32 @@ func (h *FileBrowserHandlers) CreateFolder(w http.ResponseWriter, r *http.Reques
 		return err
 	})
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to create folder: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create folder: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{"message": "Folder created successfully"})
+	c.JSON(http.StatusOK, gin.H{"message": "Folder created successfully"})
 }
 
 // UploadFile handles file upload requests
-func (h *FileBrowserHandlers) UploadFile(w http.ResponseWriter, r *http.Request) {
+func (h *FileBrowserHandlers) UploadFile(c *gin.Context) {
 	// Get the current path
-	currentPath := r.FormValue("path")
+	currentPath := c.PostForm("path")
 	if currentPath == "" {
 		currentPath = "/"
 	}
 
 	// Parse multipart form
-	err := r.ParseMultipartForm(1 << 30) // 1GB max memory for large file uploads
+	err := c.Request.ParseMultipartForm(1 << 30) // 1GB max memory for large file uploads
 	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Failed to parse multipart form: "+err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Failed to parse multipart form: " + err.Error()})
 		return
 	}
 
 	// Get uploaded files (supports multiple files)
-	files := r.MultipartForm.File["files"]
+	files := c.Request.MultipartForm.File["files"]
 	if len(files) == 0 {
-		writeJSONError(w, http.StatusBadRequest, "No files uploaded")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "No files uploaded"})
 		return
 	}
 
@@ -307,8 +292,16 @@ func (h *FileBrowserHandlers) UploadFile(w http.ResponseWriter, r *http.Request)
 			fullPath = "/" + fullPath
 		}
 
+		// Open the file
+		file, err := fileHeader.Open()
+		if err != nil {
+			failedUploads = append(failedUploads, fmt.Sprintf("%s: %v", fileName, err))
+			continue
+		}
+
 		// Upload file to filer
 		err = h.uploadFileToFiler(fullPath, fileHeader)
+		file.Close()
 
 		if err != nil {
 			failedUploads = append(failedUploads, fmt.Sprintf("%s: %v", fileName, err))
@@ -338,10 +331,10 @@ func (h *FileBrowserHandlers) UploadFile(w http.ResponseWriter, r *http.Request)
 		} else {
 			response["message"] = fmt.Sprintf("Uploaded %d file(s), %d failed", len(uploadResults), len(failedUploads))
 		}
-		writeJSON(w, http.StatusOK, response)
+		c.JSON(http.StatusOK, response)
 	} else {
 		response["message"] = "All file uploads failed"
-		writeJSON(w, http.StatusInternalServerError, response)
+		c.JSON(http.StatusInternalServerError, response)
 	}
 }
 
@@ -568,23 +561,23 @@ func (h *FileBrowserHandlers) fetchFileContent(filePath string, timeout time.Dur
 
 // DownloadFile handles file download requests by proxying through the Admin UI server
 // This ensures mTLS works correctly since the Admin UI server has the client certificates
-func (h *FileBrowserHandlers) DownloadFile(w http.ResponseWriter, r *http.Request) {
-	filePath := r.URL.Query().Get("path")
+func (h *FileBrowserHandlers) DownloadFile(c *gin.Context) {
+	filePath := c.Query("path")
 	if filePath == "" {
-		writeJSONError(w, http.StatusBadRequest, "File path is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "File path is required"})
 		return
 	}
 
 	// Get filer address
 	filerAddress := h.adminServer.GetFilerAddress()
 	if filerAddress == "" {
-		writeJSONError(w, http.StatusInternalServerError, "Filer address not configured")
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Filer address not configured"})
 		return
 	}
 
 	// Validate filer address to prevent SSRF
 	if err := h.validateFilerAddress(filerAddress); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Invalid filer address configuration")
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Invalid filer address configuration"})
 		return
 	}
 	filerHttpAddress := pb.ServerAddress(filerAddress).ToHttpAddress()
@@ -592,7 +585,7 @@ func (h *FileBrowserHandlers) DownloadFile(w http.ResponseWriter, r *http.Reques
 	// Validate and sanitize the file path
 	cleanFilePath, err := h.validateAndCleanFilePath(filePath)
 	if err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid file path: "+err.Error())
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid file path: " + err.Error()})
 		return
 	}
 
@@ -600,7 +593,7 @@ func (h *FileBrowserHandlers) DownloadFile(w http.ResponseWriter, r *http.Reques
 	downloadURL := fmt.Sprintf("%s%s", filerHttpAddress, cleanFilePath)
 	downloadURL, err = h.httpClient.NormalizeHttpScheme(downloadURL)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to construct download URL: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to construct download URL: " + err.Error()})
 		return
 	}
 
@@ -609,9 +602,9 @@ func (h *FileBrowserHandlers) DownloadFile(w http.ResponseWriter, r *http.Reques
 	// Safe: filerAddress validated by validateFilerAddress() to match configured filer
 	// Safe: cleanFilePath validated and cleaned by validateAndCleanFilePath() to prevent path traversal
 	// Use request context so download is cancelled when client disconnects
-	req, err := http.NewRequestWithContext(r.Context(), "GET", downloadURL, nil)
+	req, err := http.NewRequestWithContext(c.Request.Context(), "GET", downloadURL, nil)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to create request: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create request: " + err.Error()})
 		return
 	}
 	client := h.newClientWithTimeout(5 * time.Minute) // Longer timeout for large file downloads
@@ -620,7 +613,7 @@ func (h *FileBrowserHandlers) DownloadFile(w http.ResponseWriter, r *http.Reques
 
 	resp, err := client.Do(req)
 	if err != nil {
-		writeJSONError(w, http.StatusBadGateway, "Failed to fetch file from filer: "+err.Error())
+		c.JSON(http.StatusBadGateway, gin.H{"error": "Failed to fetch file from filer: " + err.Error()})
 		return
 	}
 	defer resp.Body.Close()
@@ -628,10 +621,10 @@ func (h *FileBrowserHandlers) DownloadFile(w http.ResponseWriter, r *http.Reques
 	if resp.StatusCode != http.StatusOK {
 		body, err := io.ReadAll(resp.Body)
 		if err != nil {
-			writeJSONError(w, resp.StatusCode, fmt.Sprintf("Filer returned status %d but failed to read response body: %v", resp.StatusCode, err))
+			c.JSON(resp.StatusCode, gin.H{"error": fmt.Sprintf("Filer returned status %d but failed to read response body: %v", resp.StatusCode, err)})
 			return
 		}
-		writeJSONError(w, resp.StatusCode, fmt.Sprintf("Filer returned status %d: %s", resp.StatusCode, string(body)))
+		c.JSON(resp.StatusCode, gin.H{"error": fmt.Sprintf("Filer returned status %d: %s", resp.StatusCode, string(body))})
 		return
 	}
 
@@ -639,33 +632,33 @@ func (h *FileBrowserHandlers) DownloadFile(w http.ResponseWriter, r *http.Reques
 	fileName := filepath.Base(cleanFilePath)
 	// Use mime.FormatMediaType for RFC 6266 compliant Content-Disposition,
 	// properly handling non-ASCII characters and special characters
-	w.Header().Set("Content-Disposition", mime.FormatMediaType("attachment", map[string]string{"filename": fileName}))
+	c.Header("Content-Disposition", mime.FormatMediaType("attachment", map[string]string{"filename": fileName}))
 
 	// Use content type from filer response, or default to octet-stream
 	contentType := resp.Header.Get("Content-Type")
 	if contentType == "" {
 		contentType = "application/octet-stream"
 	}
-	w.Header().Set("Content-Type", contentType)
+	c.Header("Content-Type", contentType)
 
 	// Set content length if available
 	if resp.ContentLength > 0 {
-		w.Header().Set("Content-Length", fmt.Sprintf("%d", resp.ContentLength))
+		c.Header("Content-Length", fmt.Sprintf("%d", resp.ContentLength))
 	}
 
 	// Stream the response body to the client
-	w.WriteHeader(http.StatusOK)
-	_, err = io.Copy(w, resp.Body)
+	c.Status(http.StatusOK)
+	_, err = io.Copy(c.Writer, resp.Body)
 	if err != nil {
 		glog.Errorf("Error streaming file download: %v", err)
 	}
 }
 
 // ViewFile handles file viewing requests (for text files, images, etc.)
-func (h *FileBrowserHandlers) ViewFile(w http.ResponseWriter, r *http.Request) {
-	filePath := r.URL.Query().Get("path")
+func (h *FileBrowserHandlers) ViewFile(c *gin.Context) {
+	filePath := c.Query("path")
 	if filePath == "" {
-		writeJSONError(w, http.StatusBadRequest, "File path is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "File path is required"})
 		return
 	}
 
@@ -711,7 +704,7 @@ func (h *FileBrowserHandlers) ViewFile(w http.ResponseWriter, r *http.Request) {
 		return nil
 	})
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get file metadata: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get file metadata: " + err.Error()})
 		return
 	}
 
@@ -759,7 +752,7 @@ func (h *FileBrowserHandlers) ViewFile(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"file":     fileEntry,
 		"content":  content,
 		"viewable": viewable,
@@ -768,10 +761,10 @@ func (h *FileBrowserHandlers) ViewFile(w http.ResponseWriter, r *http.Request) {
 }
 
 // GetFileProperties handles file properties requests
-func (h *FileBrowserHandlers) GetFileProperties(w http.ResponseWriter, r *http.Request) {
-	filePath := r.URL.Query().Get("path")
+func (h *FileBrowserHandlers) GetFileProperties(c *gin.Context) {
+	filePath := c.Query("path")
 	if filePath == "" {
-		writeJSONError(w, http.StatusBadRequest, "File path is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "File path is required"})
 		return
 	}
 
@@ -860,11 +853,11 @@ func (h *FileBrowserHandlers) GetFileProperties(w http.ResponseWriter, r *http.R
 		return nil
 	})
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get file properties: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get file properties: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, properties)
+	c.JSON(http.StatusOK, properties)
 }
 
 // Helper function to format bytes

weed/admin/handlers/http_helpers.go

@@ -1,28 +0,0 @@
-package handlers
-
-import (
-	"io"
-	"net/http"
-
-	"github.com/seaweedfs/seaweedfs/weed/admin/internal/httputil"
-)
-
-func writeJSON(w http.ResponseWriter, status int, payload interface{}) {
-	httputil.WriteJSON(w, status, payload)
-}
-
-func writeJSONError(w http.ResponseWriter, status int, message string) {
-	httputil.WriteJSONError(w, status, message)
-}
-
-func decodeJSONBody(r io.Reader, v interface{}) error {
-	return httputil.DecodeJSONBody(r, v)
-}
-
-func newJSONMaxReader(w http.ResponseWriter, r *http.Request) io.Reader {
-	return httputil.NewJSONMaxReader(w, r)
-}
-
-func defaultQuery(value, fallback string) string {
-	return httputil.DefaultQuery(value, fallback)
-}

weed/admin/handlers/maintenance_handlers.go

@@ -0,0 +1,550 @@
+package handlers
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/seaweedfs/seaweedfs/weed/admin/config"
+	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
+	"github.com/seaweedfs/seaweedfs/weed/admin/maintenance"
+	"github.com/seaweedfs/seaweedfs/weed/admin/view/app"
+	"github.com/seaweedfs/seaweedfs/weed/admin/view/layout"
+	"github.com/seaweedfs/seaweedfs/weed/glog"
+	"github.com/seaweedfs/seaweedfs/weed/worker/tasks"
+	"github.com/seaweedfs/seaweedfs/weed/worker/tasks/balance"
+	"github.com/seaweedfs/seaweedfs/weed/worker/tasks/erasure_coding"
+	"github.com/seaweedfs/seaweedfs/weed/worker/tasks/vacuum"
+	"github.com/seaweedfs/seaweedfs/weed/worker/types"
+)
+
+// MaintenanceHandlers handles maintenance-related HTTP requests
+type MaintenanceHandlers struct {
+	adminServer *dash.AdminServer
+}
+
+// NewMaintenanceHandlers creates a new instance of MaintenanceHandlers
+func NewMaintenanceHandlers(adminServer *dash.AdminServer) *MaintenanceHandlers {
+	return &MaintenanceHandlers{
+		adminServer: adminServer,
+	}
+}
+
+// ShowTaskDetail displays the task detail page
+func (h *MaintenanceHandlers) ShowTaskDetail(c *gin.Context) {
+	taskID := c.Param("id")
+
+	if h.adminServer == nil {
+		c.String(http.StatusInternalServerError, "Admin server not initialized")
+		return
+	}
+
+	taskDetail, err := h.adminServer.GetMaintenanceTaskDetail(taskID)
+	if err != nil {
+		glog.Errorf("DEBUG ShowTaskDetail: error getting task detail for %s: %v", taskID, err)
+		c.String(http.StatusNotFound, "Task not found: %s (Error: %v)", taskID, err)
+		return
+	}
+
+	c.Header("Content-Type", "text/html")
+	taskDetailComponent := app.TaskDetail(taskDetail)
+	layoutComponent := layout.Layout(c, taskDetailComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		glog.Errorf("DEBUG ShowTaskDetail: render error: %v", err)
+		c.String(http.StatusInternalServerError, "Failed to render template: %v", err)
+		return
+	}
+
+}
+
+// ShowMaintenanceQueue displays the maintenance queue page
+func (h *MaintenanceHandlers) ShowMaintenanceQueue(c *gin.Context) {
+	// Add timeout to prevent hanging
+	ctx, cancel := context.WithTimeout(c.Request.Context(), 30*time.Second)
+	defer cancel()
+
+	// Use a channel to handle timeout for data retrieval
+	type result struct {
+		data *maintenance.MaintenanceQueueData
+		err  error
+	}
+	resultChan := make(chan result, 1)
+
+	go func() {
+		data, err := h.getMaintenanceQueueData()
+		resultChan <- result{data: data, err: err}
+	}()
+
+	select {
+	case res := <-resultChan:
+		if res.err != nil {
+			glog.V(1).Infof("ShowMaintenanceQueue: error getting data: %v", res.err)
+			c.JSON(http.StatusInternalServerError, gin.H{"error": res.err.Error()})
+			return
+		}
+
+		glog.V(2).Infof("ShowMaintenanceQueue: got data with %d tasks", len(res.data.Tasks))
+
+		// Render HTML template
+		c.Header("Content-Type", "text/html")
+		maintenanceComponent := app.MaintenanceQueue(res.data)
+		layoutComponent := layout.Layout(c, maintenanceComponent)
+		err := layoutComponent.Render(ctx, c.Writer)
+		if err != nil {
+			glog.V(1).Infof("ShowMaintenanceQueue: render error: %v", err)
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
+			return
+		}
+
+		glog.V(3).Infof("ShowMaintenanceQueue: template rendered successfully")
+
+	case <-ctx.Done():
+		glog.Warningf("ShowMaintenanceQueue: timeout waiting for data")
+		c.JSON(http.StatusRequestTimeout, gin.H{
+			"error":      "Request timeout - maintenance data retrieval took too long. This may indicate a system issue.",
+			"suggestion": "Try refreshing the page or contact system administrator if the problem persists.",
+		})
+		return
+	}
+}
+
+// ShowMaintenanceWorkers displays the maintenance workers page
+func (h *MaintenanceHandlers) ShowMaintenanceWorkers(c *gin.Context) {
+	if h.adminServer == nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Admin server not initialized"})
+		return
+	}
+	workersData, err := h.adminServer.GetMaintenanceWorkersData()
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	// Render HTML template
+	c.Header("Content-Type", "text/html")
+	workersComponent := app.MaintenanceWorkers(workersData)
+	layoutComponent := layout.Layout(c, workersComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
+		return
+	}
+}
+
+// ShowMaintenanceConfig displays the maintenance configuration page
+func (h *MaintenanceHandlers) ShowMaintenanceConfig(c *gin.Context) {
+	config, err := h.getMaintenanceConfig()
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	// Get the schema for dynamic form rendering
+	schema := maintenance.GetMaintenanceConfigSchema()
+
+	// Render HTML template using schema-driven approach
+	c.Header("Content-Type", "text/html")
+	configComponent := app.MaintenanceConfigSchema(config, schema)
+	layoutComponent := layout.Layout(c, configComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
+		return
+	}
+}
+
+// ShowTaskConfig displays the configuration page for a specific task type
+func (h *MaintenanceHandlers) ShowTaskConfig(c *gin.Context) {
+	taskTypeName := c.Param("taskType")
+
+	// Get the schema for this task type
+	schema := tasks.GetTaskConfigSchema(taskTypeName)
+	if schema == nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "Task type not found or no schema available"})
+		return
+	}
+
+	// Get the UI provider for current configuration
+	uiRegistry := tasks.GetGlobalUIRegistry()
+	typesRegistry := tasks.GetGlobalTypesRegistry()
+
+	var provider types.TaskUIProvider
+	for workerTaskType := range typesRegistry.GetAllDetectors() {
+		if string(workerTaskType) == taskTypeName {
+			provider = uiRegistry.GetProvider(workerTaskType)
+			break
+		}
+	}
+
+	if provider == nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "UI provider not found for task type"})
+		return
+	}
+
+	// Get current configuration
+	currentConfig := provider.GetCurrentConfig()
+
+	// Note: Do NOT apply schema defaults to current config as it overrides saved values
+	// Only apply defaults when creating new configs, not when displaying existing ones
+
+	// Create task configuration data
+	configData := &maintenance.TaskConfigData{
+		TaskType:    maintenance.MaintenanceTaskType(taskTypeName),
+		TaskName:    schema.DisplayName,
+		TaskIcon:    schema.Icon,
+		Description: schema.Description,
+	}
+
+	// Render HTML template using schema-based approach
+	c.Header("Content-Type", "text/html")
+	taskConfigComponent := app.TaskConfigSchema(configData, schema, currentConfig)
+	layoutComponent := layout.Layout(c, taskConfigComponent)
+	err := layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
+		return
+	}
+}
+
+// UpdateTaskConfig updates task configuration from form
+func (h *MaintenanceHandlers) UpdateTaskConfig(c *gin.Context) {
+	taskTypeName := c.Param("taskType")
+	taskType := types.TaskType(taskTypeName)
+
+	// Parse form data
+	err := c.Request.ParseForm()
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Failed to parse form data: " + err.Error()})
+		return
+	}
+
+	// Debug logging - show received form data
+	glog.V(1).Infof("Received form data for task type %s:", taskTypeName)
+	for key, values := range c.Request.PostForm {
+		glog.V(1).Infof("  %s: %v", key, values)
+	}
+
+	// Get the task configuration schema
+	schema := tasks.GetTaskConfigSchema(taskTypeName)
+	if schema == nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "Schema not found for task type: " + taskTypeName})
+		return
+	}
+
+	// Create a new config instance based on task type and apply schema defaults
+	var config TaskConfig
+	switch taskType {
+	case types.TaskTypeVacuum:
+		config = &vacuum.Config{}
+	case types.TaskTypeBalance:
+		config = &balance.Config{}
+	case types.TaskTypeErasureCoding:
+		config = &erasure_coding.Config{}
+	default:
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Unsupported task type: " + taskTypeName})
+		return
+	}
+
+	// Apply schema defaults first using type-safe method
+	if err := schema.ApplyDefaultsToConfig(config); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to apply defaults: " + err.Error()})
+		return
+	}
+
+	// First, get the current configuration to preserve existing values
+	currentUIRegistry := tasks.GetGlobalUIRegistry()
+	currentTypesRegistry := tasks.GetGlobalTypesRegistry()
+
+	var currentProvider types.TaskUIProvider
+	for workerTaskType := range currentTypesRegistry.GetAllDetectors() {
+		if string(workerTaskType) == string(taskType) {
+			currentProvider = currentUIRegistry.GetProvider(workerTaskType)
+			break
+		}
+	}
+
+	if currentProvider != nil {
+		// Copy current config values to the new config
+		currentConfig := currentProvider.GetCurrentConfig()
+		if currentConfigProtobuf, ok := currentConfig.(TaskConfig); ok {
+			// Apply current values using protobuf directly - no map conversion needed!
+			currentPolicy := currentConfigProtobuf.ToTaskPolicy()
+			if err := config.FromTaskPolicy(currentPolicy); err != nil {
+				glog.Warningf("Failed to load current config for %s: %v", taskTypeName, err)
+			}
+		}
+	}
+
+	// Parse form data using schema-based approach (this will override with new values)
+	err = h.parseTaskConfigFromForm(c.Request.PostForm, schema, config)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Failed to parse configuration: " + err.Error()})
+		return
+	}
+
+	// Debug logging - show parsed config values
+	switch taskType {
+	case types.TaskTypeVacuum:
+		if vacuumConfig, ok := config.(*vacuum.Config); ok {
+			glog.V(1).Infof("Parsed vacuum config - GarbageThreshold: %f, MinVolumeAgeSeconds: %d, MinIntervalSeconds: %d",
+				vacuumConfig.GarbageThreshold, vacuumConfig.MinVolumeAgeSeconds, vacuumConfig.MinIntervalSeconds)
+		}
+	case types.TaskTypeErasureCoding:
+		if ecConfig, ok := config.(*erasure_coding.Config); ok {
+			glog.V(1).Infof("Parsed EC config - FullnessRatio: %f, QuietForSeconds: %d, MinSizeMB: %d, CollectionFilter: '%s'",
+				ecConfig.FullnessRatio, ecConfig.QuietForSeconds, ecConfig.MinSizeMB, ecConfig.CollectionFilter)
+		}
+	case types.TaskTypeBalance:
+		if balanceConfig, ok := config.(*balance.Config); ok {
+			glog.V(1).Infof("Parsed balance config - Enabled: %v, MaxConcurrent: %d, ScanIntervalSeconds: %d, ImbalanceThreshold: %f, MinServerCount: %d",
+				balanceConfig.Enabled, balanceConfig.MaxConcurrent, balanceConfig.ScanIntervalSeconds, balanceConfig.ImbalanceThreshold, balanceConfig.MinServerCount)
+		}
+	}
+
+	// Validate the configuration
+	if validationErrors := schema.ValidateConfig(config); len(validationErrors) > 0 {
+		errorMessages := make([]string, len(validationErrors))
+		for i, err := range validationErrors {
+			errorMessages[i] = err.Error()
+		}
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Configuration validation failed", "details": errorMessages})
+		return
+	}
+
+	// Apply configuration using UIProvider
+	uiRegistry := tasks.GetGlobalUIRegistry()
+	typesRegistry := tasks.GetGlobalTypesRegistry()
+
+	var provider types.TaskUIProvider
+	for workerTaskType := range typesRegistry.GetAllDetectors() {
+		if string(workerTaskType) == string(taskType) {
+			provider = uiRegistry.GetProvider(workerTaskType)
+			break
+		}
+	}
+
+	if provider == nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "UI provider not found for task type"})
+		return
+	}
+
+	// Apply configuration using provider
+	err = provider.ApplyTaskConfig(config)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to apply configuration: " + err.Error()})
+		return
+	}
+
+	// Save task configuration to protobuf file using ConfigPersistence
+	if h.adminServer != nil && h.adminServer.GetConfigPersistence() != nil {
+		err = h.saveTaskConfigToProtobuf(taskType, config)
+		if err != nil {
+			glog.Warningf("Failed to save task config to protobuf file: %v", err)
+			// Don't fail the request, just log the warning
+		}
+	} else if h.adminServer == nil {
+		glog.Warningf("Failed to save task config: admin server not initialized")
+	}
+
+	// Trigger a configuration reload in the maintenance manager
+	if h.adminServer != nil {
+		if manager := h.adminServer.GetMaintenanceManager(); manager != nil {
+			err = manager.ReloadTaskConfigurations()
+			if err != nil {
+				glog.Warningf("Failed to reload task configurations: %v", err)
+			} else {
+				glog.V(1).Infof("Successfully reloaded task configurations after updating %s", taskTypeName)
+			}
+		}
+	}
+
+	// Redirect back to task configuration page
+	c.Redirect(http.StatusSeeOther, "/maintenance/config/"+taskTypeName)
+}
+
+// parseTaskConfigFromForm parses form data using schema definitions
+func (h *MaintenanceHandlers) parseTaskConfigFromForm(formData map[string][]string, schema *tasks.TaskConfigSchema, config interface{}) error {
+	configValue := reflect.ValueOf(config)
+	if configValue.Kind() == reflect.Ptr {
+		configValue = configValue.Elem()
+	}
+
+	if configValue.Kind() != reflect.Struct {
+		return fmt.Errorf("config must be a struct or pointer to struct")
+	}
+
+	configType := configValue.Type()
+
+	for i := 0; i < configValue.NumField(); i++ {
+		field := configValue.Field(i)
+		fieldType := configType.Field(i)
+
+		// Handle embedded structs recursively
+		if fieldType.Anonymous && field.Kind() == reflect.Struct {
+			err := h.parseTaskConfigFromForm(formData, schema, field.Addr().Interface())
+			if err != nil {
+				return fmt.Errorf("error parsing embedded struct %s: %w", fieldType.Name, err)
+			}
+			continue
+		}
+
+		// Get JSON tag name
+		jsonTag := fieldType.Tag.Get("json")
+		if jsonTag == "" {
+			continue
+		}
+
+		// Remove options like ",omitempty"
+		if commaIdx := strings.Index(jsonTag, ","); commaIdx > 0 {
+			jsonTag = jsonTag[:commaIdx]
+		}
+
+		// Find corresponding schema field
+		schemaField := schema.GetFieldByName(jsonTag)
+		if schemaField == nil {
+			continue
+		}
+
+		// Parse value based on field type
+		if err := h.parseFieldFromForm(formData, schemaField, field); err != nil {
+			return fmt.Errorf("error parsing field %s: %w", schemaField.DisplayName, err)
+		}
+	}
+
+	return nil
+}
+
+// parseFieldFromForm parses a single field value from form data
+func (h *MaintenanceHandlers) parseFieldFromForm(formData map[string][]string, schemaField *config.Field, fieldValue reflect.Value) error {
+	if !fieldValue.CanSet() {
+		return nil
+	}
+
+	switch schemaField.Type {
+	case config.FieldTypeBool:
+		// Checkbox fields - present means true, absent means false
+		_, exists := formData[schemaField.JSONName]
+		fieldValue.SetBool(exists)
+
+	case config.FieldTypeInt:
+		if values, ok := formData[schemaField.JSONName]; ok && len(values) > 0 {
+			if intVal, err := strconv.Atoi(values[0]); err != nil {
+				return fmt.Errorf("invalid integer value: %s", values[0])
+			} else {
+				fieldValue.SetInt(int64(intVal))
+			}
+		}
+
+	case config.FieldTypeFloat:
+		if values, ok := formData[schemaField.JSONName]; ok && len(values) > 0 {
+			if floatVal, err := strconv.ParseFloat(values[0], 64); err != nil {
+				return fmt.Errorf("invalid float value: %s", values[0])
+			} else {
+				fieldValue.SetFloat(floatVal)
+			}
+		}
+
+	case config.FieldTypeString:
+		if values, ok := formData[schemaField.JSONName]; ok && len(values) > 0 {
+			fieldValue.SetString(values[0])
+		}
+
+	case config.FieldTypeInterval:
+		// Parse interval fields with value + unit
+		valueKey := schemaField.JSONName + "_value"
+		unitKey := schemaField.JSONName + "_unit"
+
+		if valueStrs, ok := formData[valueKey]; ok && len(valueStrs) > 0 {
+			value, err := strconv.Atoi(valueStrs[0])
+			if err != nil {
+				return fmt.Errorf("invalid interval value: %s", valueStrs[0])
+			}
+
+			unit := "minutes" // default
+			if unitStrs, ok := formData[unitKey]; ok && len(unitStrs) > 0 {
+				unit = unitStrs[0]
+			}
+
+			// Convert to seconds
+			seconds := config.IntervalValueUnitToSeconds(value, unit)
+			fieldValue.SetInt(int64(seconds))
+		}
+
+	default:
+		return fmt.Errorf("unsupported field type: %s", schemaField.Type)
+	}
+
+	return nil
+}
+
+// UpdateMaintenanceConfig updates maintenance configuration from form
+func (h *MaintenanceHandlers) UpdateMaintenanceConfig(c *gin.Context) {
+	var config maintenance.MaintenanceConfig
+	if err := c.ShouldBind(&config); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	err := h.updateMaintenanceConfig(&config)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+
+	c.Redirect(http.StatusSeeOther, "/maintenance/config")
+}
+
+// Helper methods that delegate to AdminServer
+
+func (h *MaintenanceHandlers) getMaintenanceQueueData() (*maintenance.MaintenanceQueueData, error) {
+	if h.adminServer == nil {
+		return nil, fmt.Errorf("admin server not initialized")
+	}
+	// Use the exported method from AdminServer used by the JSON API
+	return h.adminServer.GetMaintenanceQueueData()
+}
+
+func (h *MaintenanceHandlers) getMaintenanceConfig() (*maintenance.MaintenanceConfigData, error) {
+	if h.adminServer == nil {
+		return nil, fmt.Errorf("admin server not initialized")
+	}
+	// Delegate to AdminServer's real persistence method
+	return h.adminServer.GetMaintenanceConfigData()
+}
+
+func (h *MaintenanceHandlers) updateMaintenanceConfig(config *maintenance.MaintenanceConfig) error {
+	if h.adminServer == nil {
+		return fmt.Errorf("admin server not initialized")
+	}
+	// Delegate to AdminServer's real persistence method
+	return h.adminServer.UpdateMaintenanceConfigData(config)
+}
+
+// saveTaskConfigToProtobuf saves task configuration to protobuf file
+func (h *MaintenanceHandlers) saveTaskConfigToProtobuf(taskType types.TaskType, config TaskConfig) error {
+	configPersistence := h.adminServer.GetConfigPersistence()
+	if configPersistence == nil {
+		return fmt.Errorf("config persistence not available")
+	}
+
+	// Use the new ToTaskPolicy method - much simpler and more maintainable!
+	taskPolicy := config.ToTaskPolicy()
+
+	// Save using task-specific methods
+	switch taskType {
+	case types.TaskTypeVacuum:
+		return configPersistence.SaveVacuumTaskPolicy(taskPolicy)
+	case types.TaskTypeErasureCoding:
+		return configPersistence.SaveErasureCodingTaskPolicy(taskPolicy)
+	case types.TaskTypeBalance:
+		return configPersistence.SaveBalanceTaskPolicy(taskPolicy)
+	default:
+		return fmt.Errorf("unsupported task type for protobuf persistence: %s", taskType)
+	}
+}

weed/admin/handlers/maintenance_handlers_test.go

@@ -0,0 +1,389 @@
+package handlers
+
+import (
+	"net/url"
+	"testing"
+
+	"github.com/seaweedfs/seaweedfs/weed/admin/config"
+	"github.com/seaweedfs/seaweedfs/weed/worker/tasks"
+	"github.com/seaweedfs/seaweedfs/weed/worker/tasks/balance"
+	"github.com/seaweedfs/seaweedfs/weed/worker/tasks/base"
+	"github.com/seaweedfs/seaweedfs/weed/worker/tasks/erasure_coding"
+	"github.com/seaweedfs/seaweedfs/weed/worker/tasks/vacuum"
+)
+
+func TestParseTaskConfigFromForm_WithEmbeddedStruct(t *testing.T) {
+	// Create a maintenance handlers instance for testing
+	h := &MaintenanceHandlers{}
+
+	// Test with balance config
+	t.Run("Balance Config", func(t *testing.T) {
+		// Simulate form data
+		formData := url.Values{
+			"enabled":                     {"on"},      // checkbox field
+			"scan_interval_seconds_value": {"30"},      // interval field
+			"scan_interval_seconds_unit":  {"minutes"}, // interval unit
+			"max_concurrent":              {"2"},       // number field
+			"imbalance_threshold":         {"0.15"},    // float field
+			"min_server_count":            {"3"},       // number field
+		}
+
+		// Get schema
+		schema := tasks.GetTaskConfigSchema("balance")
+		if schema == nil {
+			t.Fatal("Failed to get balance schema")
+		}
+
+		// Create config instance
+		config := &balance.Config{}
+
+		// Parse form data
+		err := h.parseTaskConfigFromForm(formData, schema, config)
+		if err != nil {
+			t.Fatalf("Failed to parse form data: %v", err)
+		}
+
+		// Verify embedded struct fields were set correctly
+		if !config.Enabled {
+			t.Errorf("Expected Enabled=true, got %v", config.Enabled)
+		}
+
+		if config.ScanIntervalSeconds != 1800 { // 30 minutes * 60
+			t.Errorf("Expected ScanIntervalSeconds=1800, got %v", config.ScanIntervalSeconds)
+		}
+
+		if config.MaxConcurrent != 2 {
+			t.Errorf("Expected MaxConcurrent=2, got %v", config.MaxConcurrent)
+		}
+
+		// Verify balance-specific fields were set correctly
+		if config.ImbalanceThreshold != 0.15 {
+			t.Errorf("Expected ImbalanceThreshold=0.15, got %v", config.ImbalanceThreshold)
+		}
+
+		if config.MinServerCount != 3 {
+			t.Errorf("Expected MinServerCount=3, got %v", config.MinServerCount)
+		}
+	})
+
+	// Test with vacuum config
+	t.Run("Vacuum Config", func(t *testing.T) {
+		// Simulate form data
+		formData := url.Values{
+			// "enabled" field omitted to simulate unchecked checkbox
+			"scan_interval_seconds_value":  {"4"},     // interval field
+			"scan_interval_seconds_unit":   {"hours"}, // interval unit
+			"max_concurrent":               {"3"},     // number field
+			"garbage_threshold":            {"0.4"},   // float field
+			"min_volume_age_seconds_value": {"2"},     // interval field
+			"min_volume_age_seconds_unit":  {"days"},  // interval unit
+			"min_interval_seconds_value":   {"1"},     // interval field
+			"min_interval_seconds_unit":    {"days"},  // interval unit
+		}
+
+		// Get schema
+		schema := tasks.GetTaskConfigSchema("vacuum")
+		if schema == nil {
+			t.Fatal("Failed to get vacuum schema")
+		}
+
+		// Create config instance
+		config := &vacuum.Config{}
+
+		// Parse form data
+		err := h.parseTaskConfigFromForm(formData, schema, config)
+		if err != nil {
+			t.Fatalf("Failed to parse form data: %v", err)
+		}
+
+		// Verify embedded struct fields were set correctly
+		if config.Enabled {
+			t.Errorf("Expected Enabled=false, got %v", config.Enabled)
+		}
+
+		if config.ScanIntervalSeconds != 14400 { // 4 hours * 3600
+			t.Errorf("Expected ScanIntervalSeconds=14400, got %v", config.ScanIntervalSeconds)
+		}
+
+		if config.MaxConcurrent != 3 {
+			t.Errorf("Expected MaxConcurrent=3, got %v", config.MaxConcurrent)
+		}
+
+		// Verify vacuum-specific fields were set correctly
+		if config.GarbageThreshold != 0.4 {
+			t.Errorf("Expected GarbageThreshold=0.4, got %v", config.GarbageThreshold)
+		}
+
+		if config.MinVolumeAgeSeconds != 172800 { // 2 days * 86400
+			t.Errorf("Expected MinVolumeAgeSeconds=172800, got %v", config.MinVolumeAgeSeconds)
+		}
+
+		if config.MinIntervalSeconds != 86400 { // 1 day * 86400
+			t.Errorf("Expected MinIntervalSeconds=86400, got %v", config.MinIntervalSeconds)
+		}
+	})
+
+	// Test with erasure coding config
+	t.Run("Erasure Coding Config", func(t *testing.T) {
+		// Simulate form data
+		formData := url.Values{
+			"enabled":                     {"on"},              // checkbox field
+			"scan_interval_seconds_value": {"2"},               // interval field
+			"scan_interval_seconds_unit":  {"hours"},           // interval unit
+			"max_concurrent":              {"1"},               // number field
+			"quiet_for_seconds_value":     {"10"},              // interval field
+			"quiet_for_seconds_unit":      {"minutes"},         // interval unit
+			"fullness_ratio":              {"0.85"},            // float field
+			"collection_filter":           {"test_collection"}, // string field
+			"min_size_mb":                 {"50"},              // number field
+		}
+
+		// Get schema
+		schema := tasks.GetTaskConfigSchema("erasure_coding")
+		if schema == nil {
+			t.Fatal("Failed to get erasure_coding schema")
+		}
+
+		// Create config instance
+		config := &erasure_coding.Config{}
+
+		// Parse form data
+		err := h.parseTaskConfigFromForm(formData, schema, config)
+		if err != nil {
+			t.Fatalf("Failed to parse form data: %v", err)
+		}
+
+		// Verify embedded struct fields were set correctly
+		if !config.Enabled {
+			t.Errorf("Expected Enabled=true, got %v", config.Enabled)
+		}
+
+		if config.ScanIntervalSeconds != 7200 { // 2 hours * 3600
+			t.Errorf("Expected ScanIntervalSeconds=7200, got %v", config.ScanIntervalSeconds)
+		}
+
+		if config.MaxConcurrent != 1 {
+			t.Errorf("Expected MaxConcurrent=1, got %v", config.MaxConcurrent)
+		}
+
+		// Verify erasure coding-specific fields were set correctly
+		if config.QuietForSeconds != 600 { // 10 minutes * 60
+			t.Errorf("Expected QuietForSeconds=600, got %v", config.QuietForSeconds)
+		}
+
+		if config.FullnessRatio != 0.85 {
+			t.Errorf("Expected FullnessRatio=0.85, got %v", config.FullnessRatio)
+		}
+
+		if config.CollectionFilter != "test_collection" {
+			t.Errorf("Expected CollectionFilter='test_collection', got %v", config.CollectionFilter)
+		}
+
+		if config.MinSizeMB != 50 {
+			t.Errorf("Expected MinSizeMB=50, got %v", config.MinSizeMB)
+		}
+	})
+}
+
+func TestConfigurationValidation(t *testing.T) {
+	// Test that config structs can be validated and converted to protobuf format
+	taskTypes := []struct {
+		name   string
+		config interface{}
+	}{
+		{
+			"balance",
+			&balance.Config{
+				BaseConfig: base.BaseConfig{
+					Enabled:             true,
+					ScanIntervalSeconds: 2400,
+					MaxConcurrent:       3,
+				},
+				ImbalanceThreshold: 0.18,
+				MinServerCount:     4,
+			},
+		},
+		{
+			"vacuum",
+			&vacuum.Config{
+				BaseConfig: base.BaseConfig{
+					Enabled:             false,
+					ScanIntervalSeconds: 7200,
+					MaxConcurrent:       2,
+				},
+				GarbageThreshold:    0.35,
+				MinVolumeAgeSeconds: 86400,
+				MinIntervalSeconds:  604800,
+			},
+		},
+		{
+			"erasure_coding",
+			&erasure_coding.Config{
+				BaseConfig: base.BaseConfig{
+					Enabled:             true,
+					ScanIntervalSeconds: 3600,
+					MaxConcurrent:       1,
+				},
+				QuietForSeconds:  900,
+				FullnessRatio:    0.9,
+				CollectionFilter: "important",
+				MinSizeMB:        100,
+			},
+		},
+	}
+
+	for _, test := range taskTypes {
+		t.Run(test.name, func(t *testing.T) {
+			// Test that configs can be converted to protobuf TaskPolicy
+			switch cfg := test.config.(type) {
+			case *balance.Config:
+				policy := cfg.ToTaskPolicy()
+				if policy == nil {
+					t.Fatal("ToTaskPolicy returned nil")
+				}
+				if policy.Enabled != cfg.Enabled {
+					t.Errorf("Expected Enabled=%v, got %v", cfg.Enabled, policy.Enabled)
+				}
+				if policy.MaxConcurrent != int32(cfg.MaxConcurrent) {
+					t.Errorf("Expected MaxConcurrent=%v, got %v", cfg.MaxConcurrent, policy.MaxConcurrent)
+				}
+			case *vacuum.Config:
+				policy := cfg.ToTaskPolicy()
+				if policy == nil {
+					t.Fatal("ToTaskPolicy returned nil")
+				}
+				if policy.Enabled != cfg.Enabled {
+					t.Errorf("Expected Enabled=%v, got %v", cfg.Enabled, policy.Enabled)
+				}
+				if policy.MaxConcurrent != int32(cfg.MaxConcurrent) {
+					t.Errorf("Expected MaxConcurrent=%v, got %v", cfg.MaxConcurrent, policy.MaxConcurrent)
+				}
+			case *erasure_coding.Config:
+				policy := cfg.ToTaskPolicy()
+				if policy == nil {
+					t.Fatal("ToTaskPolicy returned nil")
+				}
+				if policy.Enabled != cfg.Enabled {
+					t.Errorf("Expected Enabled=%v, got %v", cfg.Enabled, policy.Enabled)
+				}
+				if policy.MaxConcurrent != int32(cfg.MaxConcurrent) {
+					t.Errorf("Expected MaxConcurrent=%v, got %v", cfg.MaxConcurrent, policy.MaxConcurrent)
+				}
+			default:
+				t.Fatalf("Unknown config type: %T", test.config)
+			}
+
+			// Test that configs can be validated
+			switch cfg := test.config.(type) {
+			case *balance.Config:
+				if err := cfg.Validate(); err != nil {
+					t.Errorf("Validation failed: %v", err)
+				}
+			case *vacuum.Config:
+				if err := cfg.Validate(); err != nil {
+					t.Errorf("Validation failed: %v", err)
+				}
+			case *erasure_coding.Config:
+				if err := cfg.Validate(); err != nil {
+					t.Errorf("Validation failed: %v", err)
+				}
+			}
+		})
+	}
+}
+
+func TestParseFieldFromForm_EdgeCases(t *testing.T) {
+	h := &MaintenanceHandlers{}
+
+	// Test checkbox parsing (boolean fields)
+	t.Run("Checkbox Fields", func(t *testing.T) {
+		tests := []struct {
+			name          string
+			formData      url.Values
+			expectedValue bool
+		}{
+			{"Checked checkbox", url.Values{"test_field": {"on"}}, true},
+			{"Unchecked checkbox", url.Values{}, false},
+			{"Empty value checkbox", url.Values{"test_field": {""}}, true}, // Present but empty means checked
+		}
+
+		for _, test := range tests {
+			t.Run(test.name, func(t *testing.T) {
+				schema := &tasks.TaskConfigSchema{
+					Schema: config.Schema{
+						Fields: []*config.Field{
+							{
+								JSONName:  "test_field",
+								Type:      config.FieldTypeBool,
+								InputType: "checkbox",
+							},
+						},
+					},
+				}
+
+				type TestConfig struct {
+					TestField bool `json:"test_field"`
+				}
+
+				config := &TestConfig{}
+				err := h.parseTaskConfigFromForm(test.formData, schema, config)
+				if err != nil {
+					t.Fatalf("parseTaskConfigFromForm failed: %v", err)
+				}
+
+				if config.TestField != test.expectedValue {
+					t.Errorf("Expected %v, got %v", test.expectedValue, config.TestField)
+				}
+			})
+		}
+	})
+
+	// Test interval parsing
+	t.Run("Interval Fields", func(t *testing.T) {
+		tests := []struct {
+			name         string
+			value        string
+			unit         string
+			expectedSecs int
+		}{
+			{"Minutes", "30", "minutes", 1800},
+			{"Hours", "2", "hours", 7200},
+			{"Days", "1", "days", 86400},
+		}
+
+		for _, test := range tests {
+			t.Run(test.name, func(t *testing.T) {
+				formData := url.Values{
+					"test_field_value": {test.value},
+					"test_field_unit":  {test.unit},
+				}
+
+				schema := &tasks.TaskConfigSchema{
+					Schema: config.Schema{
+						Fields: []*config.Field{
+							{
+								JSONName:  "test_field",
+								Type:      config.FieldTypeInterval,
+								InputType: "interval",
+							},
+						},
+					},
+				}
+
+				type TestConfig struct {
+					TestField int `json:"test_field"`
+				}
+
+				config := &TestConfig{}
+				err := h.parseTaskConfigFromForm(formData, schema, config)
+				if err != nil {
+					t.Fatalf("parseTaskConfigFromForm failed: %v", err)
+				}
+
+				if config.TestField != test.expectedSecs {
+					t.Errorf("Expected %d seconds, got %d", test.expectedSecs, config.TestField)
+				}
+			})
+		}
+	})
+}

weed/admin/handlers/mq_handlers.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/gorilla/mux"
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/app"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/layout"
@@ -23,152 +23,146 @@ func NewMessageQueueHandlers(adminServer *dash.AdminServer) *MessageQueueHandler
 }
 
 // ShowBrokers renders the message queue brokers page
-func (h *MessageQueueHandlers) ShowBrokers(w http.ResponseWriter, r *http.Request) {
+func (h *MessageQueueHandlers) ShowBrokers(c *gin.Context) {
 	// Get cluster brokers data
 	brokersData, err := h.adminServer.GetClusterBrokers()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get cluster brokers: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get cluster brokers: " + err.Error()})
 		return
 	}
 
 	// Set username
-	username := dash.UsernameFromContext(r.Context())
+	username := c.GetString("username")
 	if username == "" {
 		username = "admin"
 	}
 	brokersData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	brokersComponent := app.ClusterBrokers(*brokersData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, brokersComponent)
-	err = layoutComponent.Render(r.Context(), w)
+	layoutComponent := layout.Layout(c, brokersComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowTopics renders the message queue topics page
-func (h *MessageQueueHandlers) ShowTopics(w http.ResponseWriter, r *http.Request) {
+func (h *MessageQueueHandlers) ShowTopics(c *gin.Context) {
 	// Get topics data
 	topicsData, err := h.adminServer.GetTopics()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get topics: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get topics: " + err.Error()})
 		return
 	}
 
 	// Set username
-	username := dash.UsernameFromContext(r.Context())
+	username := c.GetString("username")
 	if username == "" {
 		username = "admin"
 	}
 	topicsData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	topicsComponent := app.Topics(*topicsData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, topicsComponent)
-	err = layoutComponent.Render(r.Context(), w)
+	layoutComponent := layout.Layout(c, topicsComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowSubscribers renders the message queue subscribers page
-func (h *MessageQueueHandlers) ShowSubscribers(w http.ResponseWriter, r *http.Request) {
+func (h *MessageQueueHandlers) ShowSubscribers(c *gin.Context) {
 	// Get subscribers data
 	subscribersData, err := h.adminServer.GetSubscribers()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get subscribers: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get subscribers: " + err.Error()})
 		return
 	}
 
 	// Set username
-	username := dash.UsernameFromContext(r.Context())
+	username := c.GetString("username")
 	if username == "" {
 		username = "admin"
 	}
 	subscribersData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	subscribersComponent := app.Subscribers(*subscribersData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, subscribersComponent)
-	err = layoutComponent.Render(r.Context(), w)
+	layoutComponent := layout.Layout(c, subscribersComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // ShowTopicDetails renders the topic details page
-func (h *MessageQueueHandlers) ShowTopicDetails(w http.ResponseWriter, r *http.Request) {
+func (h *MessageQueueHandlers) ShowTopicDetails(c *gin.Context) {
 	// Get topic parameters from URL
-	vars := mux.Vars(r)
-	namespace := vars["namespace"]
-	topicName := vars["topic"]
+	namespace := c.Param("namespace")
+	topicName := c.Param("topic")
 
 	if namespace == "" || topicName == "" {
-		writeJSONError(w, http.StatusBadRequest, "Missing namespace or topic name")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Missing namespace or topic name"})
 		return
 	}
 
 	// Get topic details data
 	topicDetailsData, err := h.adminServer.GetTopicDetails(namespace, topicName)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get topic details: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get topic details: " + err.Error()})
 		return
 	}
 
 	// Set username
-	username := dash.UsernameFromContext(r.Context())
+	username := c.GetString("username")
 	if username == "" {
 		username = "admin"
 	}
 	topicDetailsData.Username = username
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	topicDetailsComponent := app.TopicDetails(*topicDetailsData)
-	viewCtx := layout.NewViewContext(r, username, dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, topicDetailsComponent)
-	err = layoutComponent.Render(r.Context(), w)
+	layoutComponent := layout.Layout(c, topicDetailsComponent)
+	err = layoutComponent.Render(c.Request.Context(), c.Writer)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // GetTopicDetailsAPI returns topic details as JSON for AJAX calls
-func (h *MessageQueueHandlers) GetTopicDetailsAPI(w http.ResponseWriter, r *http.Request) {
+func (h *MessageQueueHandlers) GetTopicDetailsAPI(c *gin.Context) {
 	// Get topic parameters from URL
-	vars := mux.Vars(r)
-	namespace := vars["namespace"]
-	topicName := vars["topic"]
+	namespace := c.Param("namespace")
+	topicName := c.Param("topic")
 
 	if namespace == "" || topicName == "" {
-		writeJSONError(w, http.StatusBadRequest, "Missing namespace or topic name")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Missing namespace or topic name"})
 		return
 	}
 
 	// Get topic details data
 	topicDetailsData, err := h.adminServer.GetTopicDetails(namespace, topicName)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get topic details: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get topic details: " + err.Error()})
 		return
 	}
 
 	// Return JSON data
-	writeJSON(w, http.StatusOK, topicDetailsData)
+	c.JSON(http.StatusOK, topicDetailsData)
 }
 
 // CreateTopicAPI creates a new topic with retention configuration
-func (h *MessageQueueHandlers) CreateTopicAPI(w http.ResponseWriter, r *http.Request) {
+func (h *MessageQueueHandlers) CreateTopicAPI(c *gin.Context) {
 	var req struct {
 		Namespace      string `json:"namespace" binding:"required"`
 		Name           string `json:"name" binding:"required"`
@@ -179,30 +173,30 @@ func (h *MessageQueueHandlers) CreateTopicAPI(w http.ResponseWriter, r *http.Req
 		} `json:"retention"`
 	}
 
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	// Validate inputs
 	if req.PartitionCount < 1 || req.PartitionCount > 100 {
-		writeJSONError(w, http.StatusBadRequest, "Partition count must be between 1 and 100")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Partition count must be between 1 and 100"})
 		return
 	}
 
 	if req.Retention.Enabled && req.Retention.RetentionSeconds <= 0 {
-		writeJSONError(w, http.StatusBadRequest, "Retention seconds must be positive when retention is enabled")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Retention seconds must be positive when retention is enabled"})
 		return
 	}
 
 	// Create the topic via admin server
 	err := h.adminServer.CreateTopicWithRetention(req.Namespace, req.Name, req.PartitionCount, req.Retention.Enabled, req.Retention.RetentionSeconds)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to create topic: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create topic: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message": "Topic created successfully",
 		"topic":   fmt.Sprintf("%s.%s", req.Namespace, req.Name),
 	})
@@ -217,27 +211,27 @@ type UpdateTopicRetentionRequest struct {
 	} `json:"retention"`
 }
 
-func (h *MessageQueueHandlers) UpdateTopicRetentionAPI(w http.ResponseWriter, r *http.Request) {
+func (h *MessageQueueHandlers) UpdateTopicRetentionAPI(c *gin.Context) {
 	var request UpdateTopicRetentionRequest
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &request); err != nil {
-		writeJSONError(w, http.StatusBadRequest, err.Error())
+	if err := c.ShouldBindJSON(&request); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
 
 	// Validate required fields
 	if request.Namespace == "" || request.Name == "" {
-		writeJSONError(w, http.StatusBadRequest, "namespace and name are required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "namespace and name are required"})
 		return
 	}
 
 	// Update the topic retention
 	err := h.adminServer.UpdateTopicRetention(request.Namespace, request.Name, request.Retention.Enabled, request.Retention.RetentionSeconds)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message": "Topic retention updated successfully",
 		"topic":   request.Namespace + "." + request.Name,
 	})

weed/admin/handlers/plugin_handlers.go

@@ -1,69 +1,95 @@
 package handlers
 
 import (
-	"bytes"
-	"net/http"
+"net/http"
 
-	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
-	"github.com/seaweedfs/seaweedfs/weed/admin/view/app"
-	"github.com/seaweedfs/seaweedfs/weed/admin/view/layout"
+"github.com/gin-gonic/gin"
 )
 
-// PluginHandlers handles plugin UI pages.
 type PluginHandlers struct {
-	adminServer *dash.AdminServer
+adminServer interface{}
+pluginMgr   interface{}
 }
 
-// NewPluginHandlers creates a new instance of PluginHandlers.
-func NewPluginHandlers(adminServer *dash.AdminServer) *PluginHandlers {
-	return &PluginHandlers{
-		adminServer: adminServer,
-	}
+func NewPluginHandlers(adminServer interface{}, pluginMgr interface{}) *PluginHandlers {
+return &PluginHandlers{
+adminServer: adminServer,
+pluginMgr:   pluginMgr,
+}
 }
 
-// ShowPlugin displays plugin overview page.
-func (h *PluginHandlers) ShowPlugin(w http.ResponseWriter, r *http.Request) {
-	h.renderPluginPage(w, r, "overview")
+// ListPluginsAPI returns list of connected plugins
+func (h *PluginHandlers) ListPluginsAPI(c *gin.Context) {
+result := []map[string]interface{}{}
+c.JSON(http.StatusOK, result)
 }
 
-// ShowPluginConfiguration displays plugin configuration page.
-func (h *PluginHandlers) ShowPluginConfiguration(w http.ResponseWriter, r *http.Request) {
-	h.renderPluginPage(w, r, "configuration")
+// ListJobsAPI returns jobs for a specific type
+func (h *PluginHandlers) ListJobsAPI(c *gin.Context) {
+jobType := c.Param("type")
+result := map[string]interface{}{
+"job_type": jobType,
+"jobs":     []interface{}{},
+}
+c.JSON(http.StatusOK, result)
 }
 
-// ShowPluginDetection displays plugin detection jobs page.
-func (h *PluginHandlers) ShowPluginDetection(w http.ResponseWriter, r *http.Request) {
-	h.renderPluginPage(w, r, "detection")
+// GetConfigAPI returns configuration for a job type
+func (h *PluginHandlers) GetConfigAPI(c *gin.Context) {
+jobType := c.Param("type")
+result := map[string]interface{}{
+"type": jobType,
+}
+c.JSON(http.StatusOK, result)
 }
 
-// ShowPluginQueue displays plugin job queue page.
-func (h *PluginHandlers) ShowPluginQueue(w http.ResponseWriter, r *http.Request) {
-	h.renderPluginPage(w, r, "queue")
+// SaveConfigAPI saves configuration for a job type
+func (h *PluginHandlers) SaveConfigAPI(c *gin.Context) {
+jobType := c.Param("type")
+result := map[string]string{
+"status": "saved",
+"type":   jobType,
+}
+c.JSON(http.StatusOK, result)
 }
 
-// ShowPluginExecution displays plugin execution jobs page.
-func (h *PluginHandlers) ShowPluginExecution(w http.ResponseWriter, r *http.Request) {
-	h.renderPluginPage(w, r, "execution")
+// GetDetectionHistoryAPI returns detection history for a job type
+func (h *PluginHandlers) GetDetectionHistoryAPI(c *gin.Context) {
+jobType := c.Param("type")
+result := map[string]interface{}{
+"job_type": jobType,
+"records":  []interface{}{},
+}
+c.JSON(http.StatusOK, result)
 }
 
-// ShowPluginMonitoring displays plugin monitoring page.
-func (h *PluginHandlers) ShowPluginMonitoring(w http.ResponseWriter, r *http.Request) {
-	// Backward-compatible alias for the old monitoring URL.
-	h.renderPluginPage(w, r, "detection")
+// GetExecutionHistoryAPI returns execution history for a job type
+func (h *PluginHandlers) GetExecutionHistoryAPI(c *gin.Context) {
+jobType := c.Param("type")
+result := map[string]interface{}{
+"job_type": jobType,
+"records":  []interface{}{},
+}
+c.JSON(http.StatusOK, result)
 }
 
-func (h *PluginHandlers) renderPluginPage(w http.ResponseWriter, r *http.Request, page string) {
-	component := app.Plugin(page)
-	viewCtx := layout.NewViewContext(r, dash.UsernameFromContext(r.Context()), dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, component)
+// TriggerDetectionAPI manually triggers detection
+func (h *PluginHandlers) TriggerDetectionAPI(c *gin.Context) {
+jobType := c.Param("type")
+result := map[string]interface{}{
+"status":   "triggered",
+"job_type": jobType,
+"job_ids":  []string{},
+}
+c.JSON(http.StatusOK, result)
+}
 
-	var buf bytes.Buffer
-	if err := layoutComponent.Render(r.Context(), &buf); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
-		return
-	}
-
-	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	w.WriteHeader(http.StatusOK)
-	_, _ = w.Write(buf.Bytes())
+// CancelJobAPI cancels a job
+func (h *PluginHandlers) CancelJobAPI(c *gin.Context) {
+jobID := c.Param("id")
+result := map[string]string{
+"status": "cancelled",
+"job_id": jobID,
+}
+c.JSON(http.StatusOK, result)
 }

weed/admin/handlers/policy_handlers.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/gorilla/mux"
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/app"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/layout"
@@ -26,53 +26,53 @@ func NewPolicyHandlers(adminServer *dash.AdminServer) *PolicyHandlers {
 }
 
 // ShowPolicies renders the policies management page
-func (h *PolicyHandlers) ShowPolicies(w http.ResponseWriter, r *http.Request) {
+func (h *PolicyHandlers) ShowPolicies(c *gin.Context) {
 	// Get policies data from the server
-	policiesData := h.getPoliciesData(r)
+	policiesData := h.getPoliciesData(c)
 
 	// Render HTML template
-	w.Header().Set("Content-Type", "text/html")
+	c.Header("Content-Type", "text/html")
 	policiesComponent := app.Policies(policiesData)
-	viewCtx := layout.NewViewContext(r, dash.UsernameFromContext(r.Context()), dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, policiesComponent)
-	if err := layoutComponent.Render(r.Context(), w); err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+	layoutComponent := layout.Layout(c, policiesComponent)
+	err := layoutComponent.Render(c.Request.Context(), c.Writer)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // GetPolicies returns the list of policies as JSON
-func (h *PolicyHandlers) GetPolicies(w http.ResponseWriter, r *http.Request) {
+func (h *PolicyHandlers) GetPolicies(c *gin.Context) {
 	policies, err := h.adminServer.GetPolicies()
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get policies: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get policies: " + err.Error()})
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"policies": policies})
+	c.JSON(http.StatusOK, gin.H{"policies": policies})
 }
 
 // CreatePolicy handles policy creation
-func (h *PolicyHandlers) CreatePolicy(w http.ResponseWriter, r *http.Request) {
+func (h *PolicyHandlers) CreatePolicy(c *gin.Context) {
 	var req dash.CreatePolicyRequest
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	// Validate policy name
 	if req.Name == "" {
-		writeJSONError(w, http.StatusBadRequest, "Policy name is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Policy name is required"})
 		return
 	}
 
 	// Check if policy already exists
 	existingPolicy, err := h.adminServer.GetPolicy(req.Name)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to check existing policy: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to check existing policy: " + err.Error()})
 		return
 	}
 	if existingPolicy != nil {
-		writeJSONError(w, http.StatusConflict, "Policy with this name already exists")
+		c.JSON(http.StatusConflict, gin.H{"error": "Policy with this name already exists"})
 		return
 	}
 
@@ -80,11 +80,11 @@ func (h *PolicyHandlers) CreatePolicy(w http.ResponseWriter, r *http.Request) {
 	err = h.adminServer.CreatePolicy(req.Name, req.Document)
 	if err != nil {
 		glog.Errorf("Failed to create policy %s: %v", req.Name, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to create policy: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create policy: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusCreated, map[string]interface{}{
+	c.JSON(http.StatusCreated, gin.H{
 		"success": true,
 		"message": "Policy created successfully",
 		"policy":  req.Name,
@@ -92,49 +92,49 @@ func (h *PolicyHandlers) CreatePolicy(w http.ResponseWriter, r *http.Request) {
 }
 
 // GetPolicy returns a specific policy
-func (h *PolicyHandlers) GetPolicy(w http.ResponseWriter, r *http.Request) {
-	policyName := mux.Vars(r)["name"]
+func (h *PolicyHandlers) GetPolicy(c *gin.Context) {
+	policyName := c.Param("name")
 	if policyName == "" {
-		writeJSONError(w, http.StatusBadRequest, "Policy name is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Policy name is required"})
 		return
 	}
 
 	policy, err := h.adminServer.GetPolicy(policyName)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get policy: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get policy: " + err.Error()})
 		return
 	}
 
 	if policy == nil {
-		writeJSONError(w, http.StatusNotFound, "Policy not found")
+		c.JSON(http.StatusNotFound, gin.H{"error": "Policy not found"})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, policy)
+	c.JSON(http.StatusOK, policy)
 }
 
 // UpdatePolicy handles policy updates
-func (h *PolicyHandlers) UpdatePolicy(w http.ResponseWriter, r *http.Request) {
-	policyName := mux.Vars(r)["name"]
+func (h *PolicyHandlers) UpdatePolicy(c *gin.Context) {
+	policyName := c.Param("name")
 	if policyName == "" {
-		writeJSONError(w, http.StatusBadRequest, "Policy name is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Policy name is required"})
 		return
 	}
 
 	var req dash.UpdatePolicyRequest
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	// Check if policy exists
 	existingPolicy, err := h.adminServer.GetPolicy(policyName)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to check existing policy: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to check existing policy: " + err.Error()})
 		return
 	}
 	if existingPolicy == nil {
-		writeJSONError(w, http.StatusNotFound, "Policy not found")
+		c.JSON(http.StatusNotFound, gin.H{"error": "Policy not found"})
 		return
 	}
 
@@ -142,11 +142,11 @@ func (h *PolicyHandlers) UpdatePolicy(w http.ResponseWriter, r *http.Request) {
 	err = h.adminServer.UpdatePolicy(policyName, req.Document)
 	if err != nil {
 		glog.Errorf("Failed to update policy %s: %v", policyName, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to update policy: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update policy: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"success": true,
 		"message": "Policy updated successfully",
 		"policy":  policyName,
@@ -154,21 +154,21 @@ func (h *PolicyHandlers) UpdatePolicy(w http.ResponseWriter, r *http.Request) {
 }
 
 // DeletePolicy handles policy deletion
-func (h *PolicyHandlers) DeletePolicy(w http.ResponseWriter, r *http.Request) {
-	policyName := mux.Vars(r)["name"]
+func (h *PolicyHandlers) DeletePolicy(c *gin.Context) {
+	policyName := c.Param("name")
 	if policyName == "" {
-		writeJSONError(w, http.StatusBadRequest, "Policy name is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Policy name is required"})
 		return
 	}
 
 	// Check if policy exists
 	existingPolicy, err := h.adminServer.GetPolicy(policyName)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to check existing policy: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to check existing policy: " + err.Error()})
 		return
 	}
 	if existingPolicy == nil {
-		writeJSONError(w, http.StatusNotFound, "Policy not found")
+		c.JSON(http.StatusNotFound, gin.H{"error": "Policy not found"})
 		return
 	}
 
@@ -176,11 +176,11 @@ func (h *PolicyHandlers) DeletePolicy(w http.ResponseWriter, r *http.Request) {
 	err = h.adminServer.DeletePolicy(policyName)
 	if err != nil {
 		glog.Errorf("Failed to delete policy %s: %v", policyName, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to delete policy: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete policy: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"success": true,
 		"message": "Policy deleted successfully",
 		"policy":  policyName,
@@ -188,54 +188,60 @@ func (h *PolicyHandlers) DeletePolicy(w http.ResponseWriter, r *http.Request) {
 }
 
 // ValidatePolicy validates a policy document without saving it
-func (h *PolicyHandlers) ValidatePolicy(w http.ResponseWriter, r *http.Request) {
+func (h *PolicyHandlers) ValidatePolicy(c *gin.Context) {
 	var req struct {
-		Document policy_engine.PolicyDocument `json:"document"`
+		Document policy_engine.PolicyDocument `json:"document" binding:"required"`
 	}
 
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	// Basic validation
 	if req.Document.Version == "" {
-		writeJSONError(w, http.StatusBadRequest, "Policy version is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Policy version is required"})
 		return
 	}
 
 	if len(req.Document.Statement) == 0 {
-		writeJSONError(w, http.StatusBadRequest, "Policy must have at least one statement")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Policy must have at least one statement"})
 		return
 	}
 
 	// Validate each statement
 	for i, statement := range req.Document.Statement {
 		if statement.Effect != "Allow" && statement.Effect != "Deny" {
-			writeJSONError(w, http.StatusBadRequest, fmt.Sprintf("Statement %d: Effect must be 'Allow' or 'Deny'", i+1))
+			c.JSON(http.StatusBadRequest, gin.H{
+				"error": fmt.Sprintf("Statement %d: Effect must be 'Allow' or 'Deny'", i+1),
+			})
 			return
 		}
 
 		if len(statement.Action.Strings()) == 0 {
-			writeJSONError(w, http.StatusBadRequest, fmt.Sprintf("Statement %d: Action is required", i+1))
+			c.JSON(http.StatusBadRequest, gin.H{
+				"error": fmt.Sprintf("Statement %d: Action is required", i+1),
+			})
 			return
 		}
 
 		if len(statement.Resource.Strings()) == 0 {
-			writeJSONError(w, http.StatusBadRequest, fmt.Sprintf("Statement %d: Resource is required", i+1))
+			c.JSON(http.StatusBadRequest, gin.H{
+				"error": fmt.Sprintf("Statement %d: Resource is required", i+1),
+			})
 			return
 		}
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"valid":   true,
 		"message": "Policy document is valid",
 	})
 }
 
 // getPoliciesData retrieves policies data from the server
-func (h *PolicyHandlers) getPoliciesData(r *http.Request) dash.PoliciesData {
-	username := dash.UsernameFromContext(r.Context())
+func (h *PolicyHandlers) getPoliciesData(c *gin.Context) dash.PoliciesData {
+	username := c.GetString("username")
 	if username == "" {
 		username = "admin"
 	}

weed/admin/handlers/service_account_handlers.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/gorilla/mux"
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/app"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/layout"
@@ -26,154 +26,153 @@ func NewServiceAccountHandlers(adminServer *dash.AdminServer) *ServiceAccountHan
 }
 
 // ShowServiceAccounts renders the service accounts management page
-func (h *ServiceAccountHandlers) ShowServiceAccounts(w http.ResponseWriter, r *http.Request) {
-	data := h.getServiceAccountsData(r)
+func (h *ServiceAccountHandlers) ShowServiceAccounts(c *gin.Context) {
+	data := h.getServiceAccountsData(c)
 
 	// Render to buffer first to avoid partial writes on error
 	var buf bytes.Buffer
 	component := app.ServiceAccounts(data)
-	viewCtx := layout.NewViewContext(r, dash.UsernameFromContext(r.Context()), dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, component)
-	err := layoutComponent.Render(r.Context(), &buf)
+	layoutComponent := layout.Layout(c, component)
+	err := layoutComponent.Render(c.Request.Context(), &buf)
 	if err != nil {
 		glog.Errorf("Failed to render service accounts template: %v", err)
-		w.WriteHeader(http.StatusInternalServerError)
+		c.AbortWithStatus(http.StatusInternalServerError)
 		return
 	}
 
 	// Only write to response if render succeeded
-	w.Header().Set("Content-Type", "text/html")
-	_, _ = w.Write(buf.Bytes())
+	c.Header("Content-Type", "text/html")
+	c.Writer.Write(buf.Bytes())
 }
 
 // GetServiceAccounts returns the list of service accounts as JSON
-func (h *ServiceAccountHandlers) GetServiceAccounts(w http.ResponseWriter, r *http.Request) {
-	parentUser := r.URL.Query().Get("parent_user")
+func (h *ServiceAccountHandlers) GetServiceAccounts(c *gin.Context) {
+	parentUser := c.Query("parent_user")
 
-	accounts, err := h.adminServer.GetServiceAccounts(r.Context(), parentUser)
+	accounts, err := h.adminServer.GetServiceAccounts(c.Request.Context(), parentUser)
 	if err != nil {
 		glog.Errorf("Failed to get service accounts: %v", err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get service accounts")
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get service accounts"})
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"service_accounts": accounts})
+	c.JSON(http.StatusOK, gin.H{"service_accounts": accounts})
 }
 
 // CreateServiceAccount handles service account creation
-func (h *ServiceAccountHandlers) CreateServiceAccount(w http.ResponseWriter, r *http.Request) {
+func (h *ServiceAccountHandlers) CreateServiceAccount(c *gin.Context) {
 	var req dash.CreateServiceAccountRequest
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	if req.ParentUser == "" {
-		writeJSONError(w, http.StatusBadRequest, "ParentUser is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "ParentUser is required"})
 		return
 	}
 
-	sa, err := h.adminServer.CreateServiceAccount(r.Context(), req)
+	sa, err := h.adminServer.CreateServiceAccount(c.Request.Context(), req)
 	if err != nil {
 		glog.Errorf("Failed to create service account for user %s: %v", req.ParentUser, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to create service account")
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create service account"})
 		return
 	}
 
-	writeJSON(w, http.StatusCreated, map[string]interface{}{
+	c.JSON(http.StatusCreated, gin.H{
 		"message":         "Service account created successfully",
 		"service_account": sa,
 	})
 }
 
 // GetServiceAccountDetails returns detailed information about a service account
-func (h *ServiceAccountHandlers) GetServiceAccountDetails(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
+func (h *ServiceAccountHandlers) GetServiceAccountDetails(c *gin.Context) {
+	id := c.Param("id")
 	if id == "" {
-		writeJSONError(w, http.StatusBadRequest, "Service account ID is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Service account ID is required"})
 		return
 	}
 
-	sa, err := h.adminServer.GetServiceAccountDetails(r.Context(), id)
+	sa, err := h.adminServer.GetServiceAccountDetails(c.Request.Context(), id)
 	if err != nil {
 		// Distinguish not-found errors from internal errors
 		if errors.Is(err, dash.ErrServiceAccountNotFound) {
-			writeJSONError(w, http.StatusNotFound, "Service account not found: "+err.Error())
+			c.JSON(http.StatusNotFound, gin.H{"error": "Service account not found: " + err.Error()})
 		} else {
 			glog.Errorf("Failed to get service account details for %s: %v", id, err)
-			writeJSONError(w, http.StatusInternalServerError, "Failed to get service account details")
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get service account details"})
 		}
 		return
 	}
 
-	writeJSON(w, http.StatusOK, sa)
+	c.JSON(http.StatusOK, sa)
 }
 
 // UpdateServiceAccount handles service account updates
-func (h *ServiceAccountHandlers) UpdateServiceAccount(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
+func (h *ServiceAccountHandlers) UpdateServiceAccount(c *gin.Context) {
+	id := c.Param("id")
 	if id == "" {
-		writeJSONError(w, http.StatusBadRequest, "Service account ID is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Service account ID is required"})
 		return
 	}
 
 	var req dash.UpdateServiceAccountRequest
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
-	sa, err := h.adminServer.UpdateServiceAccount(r.Context(), id, req)
+	sa, err := h.adminServer.UpdateServiceAccount(c.Request.Context(), id, req)
 	if err != nil {
 		// Distinguish not-found errors from internal errors
 		if errors.Is(err, dash.ErrServiceAccountNotFound) {
-			writeJSONError(w, http.StatusNotFound, "Service account not found")
+			c.JSON(http.StatusNotFound, gin.H{"error": "Service account not found"})
 		} else {
 			glog.Errorf("Failed to update service account %s: %v", id, err)
-			writeJSONError(w, http.StatusInternalServerError, "Failed to update service account")
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update service account"})
 		}
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message":         "Service account updated successfully",
 		"service_account": sa,
 	})
 }
 
 // DeleteServiceAccount handles service account deletion
-func (h *ServiceAccountHandlers) DeleteServiceAccount(w http.ResponseWriter, r *http.Request) {
-	id := mux.Vars(r)["id"]
+func (h *ServiceAccountHandlers) DeleteServiceAccount(c *gin.Context) {
+	id := c.Param("id")
 	if id == "" {
-		writeJSONError(w, http.StatusBadRequest, "Service account ID is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Service account ID is required"})
 		return
 	}
 
-	err := h.adminServer.DeleteServiceAccount(r.Context(), id)
+	err := h.adminServer.DeleteServiceAccount(c.Request.Context(), id)
 	if err != nil {
 		// Distinguish not-found errors from internal errors
 		if errors.Is(err, dash.ErrServiceAccountNotFound) {
-			writeJSONError(w, http.StatusNotFound, "Service account not found")
+			c.JSON(http.StatusNotFound, gin.H{"error": "Service account not found"})
 		} else {
 			glog.Errorf("Failed to delete service account %s: %v", id, err)
-			writeJSONError(w, http.StatusInternalServerError, "Failed to delete service account")
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete service account"})
 		}
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message": "Service account deleted successfully",
 	})
 }
 
 // getServiceAccountsData retrieves service accounts data for the template
-func (h *ServiceAccountHandlers) getServiceAccountsData(r *http.Request) dash.ServiceAccountsData {
-	username := dash.UsernameFromContext(r.Context())
+func (h *ServiceAccountHandlers) getServiceAccountsData(c *gin.Context) dash.ServiceAccountsData {
+	username := c.GetString("username")
 	if username == "" {
 		username = "admin"
 	}
 
 	// Get all service accounts
-	accounts, err := h.adminServer.GetServiceAccounts(r.Context(), "")
+	accounts, err := h.adminServer.GetServiceAccounts(c.Request.Context(), "")
 	if err != nil {
 		glog.Errorf("Failed to get service accounts: %v", err)
 		return dash.ServiceAccountsData{
@@ -194,7 +193,7 @@ func (h *ServiceAccountHandlers) getServiceAccountsData(r *http.Request) dash.Se
 
 	// Get available users for dropdown
 	var availableUsers []string
-	users, err := h.adminServer.GetObjectStoreUsers(r.Context())
+	users, err := h.adminServer.GetObjectStoreUsers(c.Request.Context())
 	if err != nil {
 		glog.Errorf("Failed to get users for dropdown: %v", err)
 	} else {

weed/admin/handlers/user_handlers.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/gorilla/mux"
+	"github.com/gin-gonic/gin"
 	"github.com/seaweedfs/seaweedfs/weed/admin/dash"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/app"
 	"github.com/seaweedfs/seaweedfs/weed/admin/view/layout"
@@ -25,259 +25,256 @@ func NewUserHandlers(adminServer *dash.AdminServer) *UserHandlers {
 }
 
 // ShowObjectStoreUsers renders the object store users management page
-func (h *UserHandlers) ShowObjectStoreUsers(w http.ResponseWriter, r *http.Request) {
+func (h *UserHandlers) ShowObjectStoreUsers(c *gin.Context) {
 	// Get object store users data from the server
-	usersData := h.getObjectStoreUsersData(r)
+	usersData := h.getObjectStoreUsersData(c)
 
 	// Render HTML template
 	// Add cache-control headers to prevent browser caching of inline JavaScript
-	w.Header().Set("Content-Type", "text/html")
-	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
-	w.Header().Set("Pragma", "no-cache")
-	w.Header().Set("Expires", "0")
-	w.Header().Set("ETag", fmt.Sprintf("\"%d\"", time.Now().Unix()))
+	c.Header("Content-Type", "text/html")
+	c.Header("Cache-Control", "no-cache, no-store, must-revalidate")
+	c.Header("Pragma", "no-cache")
+	c.Header("Expires", "0")
+	c.Header("ETag", fmt.Sprintf("\"%d\"", time.Now().Unix()))
 	usersComponent := app.ObjectStoreUsers(usersData)
-	viewCtx := layout.NewViewContext(r, dash.UsernameFromContext(r.Context()), dash.CSRFTokenFromContext(r.Context()))
-	layoutComponent := layout.Layout(viewCtx, usersComponent)
-	err := layoutComponent.Render(r.Context(), w)
+	layoutComponent := layout.Layout(c, usersComponent)
+	err := layoutComponent.Render(c.Request.Context(), c.Writer)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to render template: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to render template: " + err.Error()})
 		return
 	}
 }
 
 // GetUsers returns the list of users as JSON
-func (h *UserHandlers) GetUsers(w http.ResponseWriter, r *http.Request) {
-	users, err := h.adminServer.GetObjectStoreUsers(r.Context())
+func (h *UserHandlers) GetUsers(c *gin.Context) {
+	users, err := h.adminServer.GetObjectStoreUsers(c.Request.Context())
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get users: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get users: " + err.Error()})
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]interface{}{"users": users})
+	c.JSON(http.StatusOK, gin.H{"users": users})
 }
 
 // CreateUser handles user creation
-func (h *UserHandlers) CreateUser(w http.ResponseWriter, r *http.Request) {
+func (h *UserHandlers) CreateUser(c *gin.Context) {
 	var req dash.CreateUserRequest
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	// Validate required fields
 	if req.Username == "" {
-		writeJSONError(w, http.StatusBadRequest, "Username is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Username is required"})
 		return
 	}
 
 	user, err := h.adminServer.CreateObjectStoreUser(req)
 	if err != nil {
 		glog.Errorf("Failed to create user %s: %v", req.Username, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to create user: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create user: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusCreated, map[string]interface{}{
+	c.JSON(http.StatusCreated, gin.H{
 		"message": "User created successfully",
 		"user":    user,
 	})
 }
 
 // UpdateUser handles user updates
-func (h *UserHandlers) UpdateUser(w http.ResponseWriter, r *http.Request) {
-	username := mux.Vars(r)["username"]
+func (h *UserHandlers) UpdateUser(c *gin.Context) {
+	username := c.Param("username")
 	if username == "" {
-		writeJSONError(w, http.StatusBadRequest, "Username is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Username is required"})
 		return
 	}
 
 	var req dash.UpdateUserRequest
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	user, err := h.adminServer.UpdateObjectStoreUser(username, req)
 	if err != nil {
 		glog.Errorf("Failed to update user %s: %v", username, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to update user: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update user: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message": "User updated successfully",
 		"user":    user,
 	})
 }
 
 // DeleteUser handles user deletion
-func (h *UserHandlers) DeleteUser(w http.ResponseWriter, r *http.Request) {
-	username := mux.Vars(r)["username"]
+func (h *UserHandlers) DeleteUser(c *gin.Context) {
+	username := c.Param("username")
 	if username == "" {
-		writeJSONError(w, http.StatusBadRequest, "Username is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Username is required"})
 		return
 	}
 
 	err := h.adminServer.DeleteObjectStoreUser(username)
 	if err != nil {
 		glog.Errorf("Failed to delete user %s: %v", username, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to delete user: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete user: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message": "User deleted successfully",
 	})
 }
 
 // GetUserDetails returns detailed information about a specific user
-func (h *UserHandlers) GetUserDetails(w http.ResponseWriter, r *http.Request) {
-	username := mux.Vars(r)["username"]
+func (h *UserHandlers) GetUserDetails(c *gin.Context) {
+	username := c.Param("username")
 	if username == "" {
-		writeJSONError(w, http.StatusBadRequest, "Username is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Username is required"})
 		return
 	}
 
 	user, err := h.adminServer.GetObjectStoreUserDetails(username)
 	if err != nil {
-		writeJSONError(w, http.StatusNotFound, "User not found: "+err.Error())
+		c.JSON(http.StatusNotFound, gin.H{"error": "User not found: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, user)
+	c.JSON(http.StatusOK, user)
 }
 
 // CreateAccessKey creates a new access key for a user
-func (h *UserHandlers) CreateAccessKey(w http.ResponseWriter, r *http.Request) {
-	username := mux.Vars(r)["username"]
+func (h *UserHandlers) CreateAccessKey(c *gin.Context) {
+	username := c.Param("username")
 	if username == "" {
-		writeJSONError(w, http.StatusBadRequest, "Username is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Username is required"})
 		return
 	}
 
 	accessKey, err := h.adminServer.CreateAccessKey(username)
 	if err != nil {
 		glog.Errorf("Failed to create access key for user %s: %v", username, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to create access key: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create access key: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusCreated, map[string]interface{}{
+	c.JSON(http.StatusCreated, gin.H{
 		"message":    "Access key created successfully",
 		"access_key": accessKey,
 	})
 }
 
 // DeleteAccessKey deletes an access key for a user
-func (h *UserHandlers) DeleteAccessKey(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	username := vars["username"]
-	accessKeyId := vars["accessKeyId"]
+func (h *UserHandlers) DeleteAccessKey(c *gin.Context) {
+	username := c.Param("username")
+	accessKeyId := c.Param("accessKeyId")
 
 	if username == "" || accessKeyId == "" {
-		writeJSONError(w, http.StatusBadRequest, "Username and access key ID are required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Username and access key ID are required"})
 		return
 	}
 
 	err := h.adminServer.DeleteAccessKey(username, accessKeyId)
 	if err != nil {
 		glog.Errorf("Failed to delete access key %s for user %s: %v", accessKeyId, username, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to delete access key: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete access key: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message": "Access key deleted successfully",
 	})
 }
 
 // UpdateAccessKeyStatus updates the status of an access key for a user
-func (h *UserHandlers) UpdateAccessKeyStatus(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	username := vars["username"]
-	accessKeyId := vars["accessKeyId"]
+func (h *UserHandlers) UpdateAccessKeyStatus(c *gin.Context) {
+	username := c.Param("username")
+	accessKeyId := c.Param("accessKeyId")
 
 	if username == "" || accessKeyId == "" {
-		writeJSONError(w, http.StatusBadRequest, "Username and access key ID are required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Username and access key ID are required"})
 		return
 	}
 
 	var req dash.UpdateAccessKeyStatusRequest
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	// Validate status
 	if req.Status != dash.AccessKeyStatusActive && req.Status != dash.AccessKeyStatusInactive {
-		writeJSONError(w, http.StatusBadRequest, fmt.Sprintf("Status must be '%s' or '%s'", dash.AccessKeyStatusActive, dash.AccessKeyStatusInactive))
+		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("Status must be '%s' or '%s'", dash.AccessKeyStatusActive, dash.AccessKeyStatusInactive)})
 		return
 	}
 
 	err := h.adminServer.UpdateAccessKeyStatus(username, accessKeyId, req.Status)
 	if err != nil {
 		glog.Errorf("Failed to update access key status %s for user %s: %v", accessKeyId, username, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to update access key status: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update access key status: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message": "Access key updated successfully",
 	})
 }
 
 // GetUserPolicies returns the policies for a user
-func (h *UserHandlers) GetUserPolicies(w http.ResponseWriter, r *http.Request) {
-	username := mux.Vars(r)["username"]
+func (h *UserHandlers) GetUserPolicies(c *gin.Context) {
+	username := c.Param("username")
 	if username == "" {
-		writeJSONError(w, http.StatusBadRequest, "Username is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Username is required"})
 		return
 	}
 
 	policies, err := h.adminServer.GetUserPolicies(username)
 	if err != nil {
-		writeJSONError(w, http.StatusInternalServerError, "Failed to get user policies: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to get user policies: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{"policies": policies})
+	c.JSON(http.StatusOK, gin.H{"policies": policies})
 }
 
 // UpdateUserPolicies updates the policies for a user
-func (h *UserHandlers) UpdateUserPolicies(w http.ResponseWriter, r *http.Request) {
-	username := mux.Vars(r)["username"]
+func (h *UserHandlers) UpdateUserPolicies(c *gin.Context) {
+	username := c.Param("username")
 	if username == "" {
-		writeJSONError(w, http.StatusBadRequest, "Username is required")
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Username is required"})
 		return
 	}
 
 	var req dash.UpdateUserPoliciesRequest
-	if err := decodeJSONBody(newJSONMaxReader(w, r), &req); err != nil {
-		writeJSONError(w, http.StatusBadRequest, "Invalid request: "+err.Error())
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request: " + err.Error()})
 		return
 	}
 
 	err := h.adminServer.UpdateUserPolicies(username, req.Actions)
 	if err != nil {
 		glog.Errorf("Failed to update policies for user %s: %v", username, err)
-		writeJSONError(w, http.StatusInternalServerError, "Failed to update user policies: "+err.Error())
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to update user policies: " + err.Error()})
 		return
 	}
 
-	writeJSON(w, http.StatusOK, map[string]interface{}{
+	c.JSON(http.StatusOK, gin.H{
 		"message": "User policies updated successfully",
 	})
 }
 
 // getObjectStoreUsersData retrieves object store users data from the server
-func (h *UserHandlers) getObjectStoreUsersData(r *http.Request) dash.ObjectStoreUsersData {
-	username := dash.UsernameFromContext(r.Context())
+func (h *UserHandlers) getObjectStoreUsersData(c *gin.Context) dash.ObjectStoreUsersData {
+	username := c.GetString("username")
 	if username == "" {
 		username = "admin"
 	}
 
 	// Get object store users
-	users, err := h.adminServer.GetObjectStoreUsers(r.Context())
+	users, err := h.adminServer.GetObjectStoreUsers(c.Request.Context())
 	if err != nil {
 		glog.Errorf("Failed to get object store users: %v", err)
 		// Return empty data on error

weed/admin/internal/httputil/httputil.go

@@ -1,42 +0,0 @@
-package httputil
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-
-	"github.com/seaweedfs/seaweedfs/weed/glog"
-)
-
-const MaxJSONBodyBytes = 1 << 20
-
-func NewJSONMaxReader(w http.ResponseWriter, r *http.Request) io.Reader {
-	return http.MaxBytesReader(w, r.Body, MaxJSONBodyBytes)
-}
-
-func DecodeJSONBody(r io.Reader, v interface{}) error {
-	decoder := json.NewDecoder(r)
-	return decoder.Decode(v)
-}
-
-func WriteJSON(w http.ResponseWriter, status int, payload interface{}) {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(status)
-	if payload == nil {
-		return
-	}
-	if err := json.NewEncoder(w).Encode(payload); err != nil {
-		glog.Errorf("failed to encode JSON response (status=%d, payload=%T): %v", status, payload, err)
-	}
-}
-
-func WriteJSONError(w http.ResponseWriter, status int, message string) {
-	WriteJSON(w, status, map[string]string{"error": message})
-}
-
-func DefaultQuery(value, fallback string) string {
-	if value == "" {
-		return fallback
-	}
-	return value
-}

weed/admin/maintenance/maintenance_queue.go

@@ -130,10 +130,10 @@ func (mq *MaintenanceQueue) cleanupCompletedTasks() {
 // AddTask adds a new maintenance task to the queue with deduplication
 func (mq *MaintenanceQueue) AddTask(task *MaintenanceTask) {
 	mq.mutex.Lock()
+	defer mq.mutex.Unlock()
 
 	// Check for duplicate tasks (same type + volume + not completed)
 	if mq.hasDuplicateTask(task) {
-		mq.mutex.Unlock()
 		glog.V(1).Infof("Task skipped (duplicate): %s for volume %d on %s (already queued or running)",
 			task.Type, task.VolumeID, task.Server)
 		return
@@ -169,23 +169,16 @@ func (mq *MaintenanceQueue) AddTask(task *MaintenanceTask) {
 		return mq.pendingTasks[i].ScheduledAt.Before(mq.pendingTasks[j].ScheduledAt)
 	})
 
+	// Save task state to persistence
+	mq.saveTaskState(task)
+
 	scheduleInfo := ""
 	if !task.ScheduledAt.IsZero() && time.Until(task.ScheduledAt) > time.Minute {
 		scheduleInfo = fmt.Sprintf(", scheduled for %v", task.ScheduledAt.Format("15:04:05"))
 	}
 
-	// Snapshot task state while lock is still held to avoid data race;
-	// also capture log fields from the snapshot so the live task pointer
-	// is not accessed after mq.mutex is released.
-	taskSnapshot := snapshotTask(task)
-	mq.mutex.Unlock()
-
-	// Save task state to persistence outside the lock to avoid blocking
-	// RegisterWorker and HTTP handlers (GetTasks) during disk I/O
-	mq.saveTaskState(taskSnapshot)
-
 	glog.Infof("Task queued: %s (%s) volume %d on %s, priority %d%s, reason: %s",
-		taskSnapshot.ID, taskSnapshot.Type, taskSnapshot.VolumeID, taskSnapshot.Server, taskSnapshot.Priority, scheduleInfo, taskSnapshot.Reason)
+		task.ID, task.Type, task.VolumeID, task.Server, task.Priority, scheduleInfo, task.Reason)
 }
 
 // hasDuplicateTask checks if a similar task already exists (same type, volume, and not completed)
@@ -293,14 +286,11 @@ func (mq *MaintenanceQueue) GetNextTask(workerID string, capabilities []Maintena
 
 	// Now acquire write lock to actually assign the task
 	mq.mutex.Lock()
-
-	// Capture ID before the re-check so it is available for logging after unlock.
-	selectedTaskID := selectedTask.ID
+	defer mq.mutex.Unlock()
 
 	// Re-check that the task is still available (it might have been assigned to another worker)
-	if selectedIndex >= len(mq.pendingTasks) || mq.pendingTasks[selectedIndex].ID != selectedTaskID {
-		mq.mutex.Unlock()
-		glog.V(2).Infof("Task %s no longer available for worker %s: assigned to another worker", selectedTaskID, workerID)
+	if selectedIndex >= len(mq.pendingTasks) || mq.pendingTasks[selectedIndex].ID != selectedTask.ID {
+		glog.V(2).Infof("Task %s no longer available for worker %s: assigned to another worker", selectedTask.ID, workerID)
 		return nil
 	}
 
@@ -341,7 +331,6 @@ func (mq *MaintenanceQueue) GetNextTask(workerID string, capabilities []Maintena
 				if len(selectedTask.AssignmentHistory) > 0 {
 					selectedTask.AssignmentHistory = selectedTask.AssignmentHistory[:len(selectedTask.AssignmentHistory)-1]
 				}
-				mq.mutex.Unlock()
 				// Return nil so the task is not removed from pendingTasks and not returned to the worker
 				return nil
 			}
@@ -359,15 +348,11 @@ func (mq *MaintenanceQueue) GetNextTask(workerID string, capabilities []Maintena
 	// Track pending operation
 	mq.trackPendingOperation(selectedTask)
 
-	// Snapshot task state while lock is still held to avoid data race
-	selectedSnapshot := snapshotTask(selectedTask)
-	mq.mutex.Unlock()
-
-	// Save task state to persistence outside the lock
-	mq.saveTaskState(selectedSnapshot)
+	// Save task state after assignment
+	mq.saveTaskState(selectedTask)
 
 	glog.Infof("Task assigned: %s (%s) → worker %s (volume %d, server %s)",
-		selectedSnapshot.ID, selectedSnapshot.Type, workerID, selectedSnapshot.VolumeID, selectedSnapshot.Server)
+		selectedTask.ID, selectedTask.Type, workerID, selectedTask.VolumeID, selectedTask.Server)
 
 	return selectedTask
 }
@@ -375,10 +360,10 @@ func (mq *MaintenanceQueue) GetNextTask(workerID string, capabilities []Maintena
 // CompleteTask marks a task as completed
 func (mq *MaintenanceQueue) CompleteTask(taskID string, error string) {
 	mq.mutex.Lock()
+	defer mq.mutex.Unlock()
 
 	task, exists := mq.tasks[taskID]
 	if !exists {
-		mq.mutex.Unlock()
 		glog.Warningf("Attempted to complete non-existent task: %s", taskID)
 		return
 	}
@@ -403,12 +388,6 @@ func (mq *MaintenanceQueue) CompleteTask(taskID string, error string) {
 		duration = completedTime.Sub(*task.StartedAt)
 	}
 
-	// Capture workerID before it may be cleared during retry
-	originalWorkerID := task.WorkerID
-
-	var taskToSave *MaintenanceTask
-	var logFn func()
-
 	if error != "" {
 		task.Status = TaskStatusFailed
 		task.Error = error
@@ -441,12 +420,10 @@ func (mq *MaintenanceQueue) CompleteTask(taskID string, error string) {
 				mq.integration.SyncTask(task)
 			}
 
-			taskToSave = task
-			retryCount, maxRetries := task.RetryCount, task.MaxRetries
-			logFn = func() {
-				glog.Warningf("Task failed, scheduling retry: %s (%s) attempt %d/%d, worker %s, duration %v, error: %s",
-					taskID, task.Type, retryCount, maxRetries, originalWorkerID, duration, error)
-			}
+			// Save task state after retry setup
+			mq.saveTaskState(task)
+			glog.Warningf("Task failed, scheduling retry: %s (%s) attempt %d/%d, worker %s, duration %v, error: %s",
+				taskID, task.Type, task.RetryCount, task.MaxRetries, task.WorkerID, duration, error)
 		} else {
 			// Record unassignment due to permanent failure
 			if task.WorkerID != "" && len(task.AssignmentHistory) > 0 {
@@ -458,27 +435,23 @@ func (mq *MaintenanceQueue) CompleteTask(taskID string, error string) {
 				}
 			}
 
-			taskToSave = task
-			maxRetries := task.MaxRetries
-			logFn = func() {
-				glog.Errorf("Task failed permanently: %s (%s) worker %s, duration %v, after %d retries: %s",
-					taskID, task.Type, originalWorkerID, duration, maxRetries, error)
-			}
+			// Save task state after permanent failure
+			mq.saveTaskState(task)
+			glog.Errorf("Task failed permanently: %s (%s) worker %s, duration %v, after %d retries: %s",
+				taskID, task.Type, task.WorkerID, duration, task.MaxRetries, error)
 		}
 	} else {
 		task.Status = TaskStatusCompleted
 		task.Progress = 100
-		taskToSave = task
-		volumeID := task.VolumeID
-		logFn = func() {
-			glog.Infof("Task completed: %s (%s) worker %s, duration %v, volume %d",
-				taskID, task.Type, originalWorkerID, duration, volumeID)
-		}
+		// Save task state after successful completion
+		mq.saveTaskState(task)
+		glog.Infof("Task completed: %s (%s) worker %s, duration %v, volume %d",
+			taskID, task.Type, task.WorkerID, duration, task.VolumeID)
 	}
 
-	// Update worker load and capture state before releasing lock
-	if originalWorkerID != "" {
-		if worker, exists := mq.workers[originalWorkerID]; exists {
+	// Update worker
+	if task.WorkerID != "" {
+		if worker, exists := mq.workers[task.WorkerID]; exists {
 			worker.CurrentTask = nil
 			worker.CurrentLoad--
 			if worker.CurrentLoad == 0 {
@@ -486,32 +459,16 @@ func (mq *MaintenanceQueue) CompleteTask(taskID string, error string) {
 			}
 		}
 	}
-	taskStatus := task.Status
-	taskCount := len(mq.tasks)
-	// Snapshot task state while lock is still held to avoid data race
-	var taskToSaveSnapshot *MaintenanceTask
-	if taskToSave != nil {
-		taskToSaveSnapshot = snapshotTask(taskToSave)
-	}
-	mq.mutex.Unlock()
-
-	// Save task state to persistence outside the lock
-	if taskToSaveSnapshot != nil {
-		mq.saveTaskState(taskToSaveSnapshot)
-	}
-
-	if logFn != nil {
-		logFn()
-	}
 
 	// Remove pending operation (unless it's being retried)
-	if taskStatus != TaskStatusPending {
+	if task.Status != TaskStatusPending {
 		mq.removePendingOperation(taskID)
 	}
 
-	// Periodically cleanup old completed tasks (when total task count is a multiple of 10)
-	if taskStatus == TaskStatusCompleted {
-		if taskCount%10 == 0 {
+	// Periodically cleanup old completed tasks (every 10th completion)
+	if task.Status == TaskStatusCompleted {
+		// Simple counter-based trigger for cleanup
+		if len(mq.tasks)%10 == 0 {
 			go mq.cleanupCompletedTasks()
 		}
 	}
@@ -519,46 +476,35 @@ func (mq *MaintenanceQueue) CompleteTask(taskID string, error string) {
 
 // UpdateTaskProgress updates the progress of a running task
 func (mq *MaintenanceQueue) UpdateTaskProgress(taskID string, progress float64) {
-	mq.mutex.Lock()
+	mq.mutex.RLock()
+	defer mq.mutex.RUnlock()
 
-	task, exists := mq.tasks[taskID]
-	if !exists {
-		mq.mutex.Unlock()
+	if task, exists := mq.tasks[taskID]; exists {
+		oldProgress := task.Progress
+		task.Progress = progress
+		task.Status = TaskStatusInProgress
+
+		// Update pending operation status
+		mq.updatePendingOperationStatus(taskID, "in_progress")
+
+		// Log progress at significant milestones or changes
+		if progress == 0 {
+			glog.V(1).Infof("Task started: %s (%s) worker %s, volume %d",
+				taskID, task.Type, task.WorkerID, task.VolumeID)
+		} else if progress >= 100 {
+			glog.V(1).Infof("Task progress: %s (%s) worker %s, %.1f%% complete",
+				taskID, task.Type, task.WorkerID, progress)
+		} else if progress-oldProgress >= 25 { // Log every 25% increment
+			glog.V(1).Infof("Task progress: %s (%s) worker %s, %.1f%% complete",
+				taskID, task.Type, task.WorkerID, progress)
+		}
+
+		// Save task state after progress update
+		if progress == 0 || progress >= 100 || progress-oldProgress >= 10 {
+			mq.saveTaskState(task)
+		}
+	} else {
 		glog.V(2).Infof("Progress update for unknown task: %s (%.1f%%)", taskID, progress)
-		return
-	}
-
-	oldProgress := task.Progress
-	task.Progress = progress
-	task.Status = TaskStatusInProgress
-
-	// Update pending operation status while lock is held
-	mq.updatePendingOperationStatus(taskID, "in_progress")
-
-	// Determine whether to persist and capture log fields before unlocking
-	shouldSave := progress == 0 || progress >= 100 || progress-oldProgress >= 10
-	var taskSnapshot *MaintenanceTask
-	if shouldSave {
-		taskSnapshot = snapshotTask(task)
-	}
-	taskType, workerID, volumeID := task.Type, task.WorkerID, task.VolumeID
-	mq.mutex.Unlock()
-
-	// Log progress at significant milestones or changes
-	if progress == 0 {
-		glog.V(1).Infof("Task started: %s (%s) worker %s, volume %d",
-			taskID, taskType, workerID, volumeID)
-	} else if progress >= 100 {
-		glog.V(1).Infof("Task progress: %s (%s) worker %s, %.1f%% complete",
-			taskID, taskType, workerID, progress)
-	} else if progress-oldProgress >= 25 { // Log every 25% increment
-		glog.V(1).Infof("Task progress: %s (%s) worker %s, %.1f%% complete",
-			taskID, taskType, workerID, progress)
-	}
-
-	// Save task state outside the lock to avoid blocking readers
-	if taskSnapshot != nil {
-		mq.saveTaskState(taskSnapshot)
 	}
 }
 
@@ -1058,41 +1004,3 @@ func (mq *MaintenanceQueue) updatePendingOperationStatus(taskID string, status s
 
 	pendingOps.UpdateOperationStatus(taskID, status)
 }
-
-// snapshotTask returns a shallow copy of t with slice and map fields deep-copied
-// so that the snapshot can be safely passed to saveTaskState after mq.mutex is
-// released without racing against concurrent mutations of the live task struct.
-// Must be called with mq.mutex held.
-func snapshotTask(t *MaintenanceTask) *MaintenanceTask {
-	cp := *t // copy all scalar / pointer-sized fields
-
-	// Deep-copy AssignmentHistory: the slice header and each record pointer.
-	// Records themselves are never mutated after being appended, so copying
-	// the pointers is sufficient.
-	if t.AssignmentHistory != nil {
-		cp.AssignmentHistory = make([]*TaskAssignmentRecord, len(t.AssignmentHistory))
-		copy(cp.AssignmentHistory, t.AssignmentHistory)
-	}
-
-	// Deep-copy Tags map to avoid concurrent map read/write.
-	if t.Tags != nil {
-		cp.Tags = make(map[string]string, len(t.Tags))
-		for k, v := range t.Tags {
-			cp.Tags[k] = v
-		}
-	}
-
-	// Copy optional time pointers so a concurrent nil-assignment (e.g. retry
-	// path clearing StartedAt) does not race with maintenanceTaskToProtobuf
-	// reading the pointed-to value.
-	if t.StartedAt != nil {
-		ts := *t.StartedAt
-		cp.StartedAt = &ts
-	}
-	if t.CompletedAt != nil {
-		tc := *t.CompletedAt
-		cp.CompletedAt = &tc
-	}
-
-	return &cp
-}

weed/admin/plugin/DESIGN.md

@@ -1,205 +0,0 @@
-# Admin Worker Plugin System (Design)
-
-This document describes the plugin system for admin-managed workers, implemented in parallel with the current maintenance/worker mechanism.
-
-## Scope
-
-- Add a new plugin protocol and runtime model for multi-language workers.
-- Keep all current admin + worker code paths untouched.
-- Use gRPC for all admin-worker communication.
-- Let workers describe job configuration UI declaratively via protobuf.
-- Persist all job type configuration under admin server data directory.
-- Support detector workers and executor workers per job type.
-- Add end-to-end workflow observability (activities, active jobs, progress).
-
-## New Contract
-
-- Proto file: `weed/pb/plugin.proto`
-- gRPC service: `PluginControlService.WorkerStream`
-- Connection model: worker-initiated long-lived bidirectional stream.
-
-Why this model:
-
-- Works for workers in any language with gRPC support.
-- Avoids admin dialing constraints in NAT/private networks.
-- Allows command/response, progress streaming, and heartbeat over one channel.
-
-## Core Runtime Components (Admin Side)
-
-1. `PluginRegistry`
-- Tracks connected workers and their per-job-type capabilities.
-- Maintains liveness via heartbeat timeout.
-
-2. `SchemaCoordinator`
-- For each job type, asks one capable worker for `JobTypeDescriptor`.
-- Caches descriptor version and refresh timestamp.
-
-3. `ConfigStore`
-- Persists descriptor + saved config values in `dataDir`.
-- Stores both:
-  - Admin-owned runtime config (detection interval, dispatch concurrency, retry).
-  - Worker-owned config values (plugin-specific detection/execution knobs).
-
-4. `DetectorScheduler`
-- Per job type, chooses one detector worker (`can_detect=true`).
-- Sends `RunDetectionRequest` with saved configs + cluster context.
-- Accepts `DetectionProposals`, dedupes by `dedupe_key`, inserts jobs.
-
-5. `JobDispatcher`
-- Chooses executor worker (`can_execute=true`) for each pending job.
-- Sends `ExecuteJobRequest`.
-- Consumes `JobProgressUpdate` and `JobCompleted`.
-
-6. `WorkflowMonitor`
-- Builds live counters and timeline from events:
-  - activities per job type,
-  - active jobs,
-  - per-job progress/state,
-  - worker health/load.
-
-## Worker Responsibilities
-
-1. Register capabilities on connect (`WorkerHello`).
-2. Expose job type descriptor (`ConfigSchemaResponse`) including UI schemas:
-- admin config form,
-- worker config form,
-- defaults.
-3. Run detection on demand (`RunDetectionRequest`) and return proposals.
-4. Execute assigned jobs (`ExecuteJobRequest`) and stream progress.
-5. Heartbeat regularly with slot usage and running work.
-6. Handle cancellation requests (`CancelRequest`) for in-flight detection/execution.
-
-## Declarative UI Model
-
-UI is fully derived from protobuf schema:
-
-- `ConfigForm`
-- `ConfigSection`
-- `ConfigField`
-- `ConfigOption`
-- `ValidationRule`
-- `ConfigValue` (typed scalar/list/map/object value container)
-
-Result:
-
-- Admin can render forms without hardcoded task structs.
-- New job types can ship UI schema from worker binary alone.
-- Worker language is irrelevant as long as it can emit protobuf messages.
-
-## Detection and Dispatch Flow
-
-1. Worker connects and registers capabilities.
-2. Admin requests descriptor per job type.
-3. Admin persists descriptor and editable config values.
-4. On detection interval (admin-owned setting):
-- Admin chooses one detector worker for that job type.
-- Sends `RunDetectionRequest` with:
-  - `AdminRuntimeConfig`,
-  - `admin_config_values`,
-  - `worker_config_values`,
-  - `ClusterContext` (master/filer/volume grpc locations, metadata).
-5. Detector emits `DetectionProposals` and `DetectionComplete`.
-6. Admin dedupes and enqueues jobs.
-7. Dispatcher assigns jobs to any eligible executor worker.
-8. Executor emits `JobProgressUpdate` and `JobCompleted`.
-9. Monitor updates workflow UI in near-real-time.
-
-## Persistence Layout (Admin Data Dir)
-
-Current layout under `<admin-data-dir>/plugin/`:
-
-- `job_types/<job_type>/descriptor.pb`
-- `job_types/<job_type>/descriptor.json`
-- `job_types/<job_type>/config.pb`
-- `job_types/<job_type>/config.json`
-- `job_types/<job_type>/runs.json`
-- `jobs/tracked_jobs.json`
-- `activities/activities.json`
-
-`config.pb` should use `PersistedJobTypeConfig` from `plugin.proto`.
-
-## Admin UI
-
-- Route: `/plugin`
-- Includes:
-  - runtime status,
-  - workers/capabilities,
-  - declarative descriptor-driven config forms,
-  - run history (last 10 success + last 10 errors),
-  - tracked jobs and activity stream,
-  - manual actions for schema refresh, detection, and detect+execute workflow.
-
-## Scheduling Policy (Initial)
-
-Detector selection per job type:
-- only workers with `can_detect=true`.
-- prefer healthy worker with highest free detection slots.
-- lease ends when heartbeat timeout or stream drop.
-
-Execution dispatch:
-- only workers with `can_execute=true`.
-- select by available execution slots and least active jobs.
-- retry on failure using admin runtime retry config.
-
-## Safety and Reliability
-
-- Idempotency: dedupe proposals by (`job_type`, `dedupe_key`).
-- Backpressure: enforce max jobs per detection run.
-- Timeouts: detection and execution timeout from admin runtime config.
-- Replay-safe persistence: write job state changes before emitting UI events.
-- Heartbeat-based failover for detector/executor reassignment.
-
-## Backward Compatibility
-
-- Legacy `worker.proto` runtime remains internally available where still referenced.
-- External CLI worker path is moved to plugin runtime behavior.
-- Runtime is enabled by default on admin worker gRPC server.
-
-## Incremental Rollout Plan
-
-Phase 1
-- Introduce protocol and storage models only.
-
-Phase 2
-- Build admin registry/scheduler/dispatcher behind feature flag.
-
-Phase 3
-- Add dedicated plugin UI pages and metrics.
-
-Phase 4
-- Port one existing job type (e.g. vacuum) as external worker plugin.
-
-Phase 4 status (starter)
-- Added `weed worker` command as an external `plugin.proto` worker process.
-- Initial handler implements `vacuum` job type with:
-  - declarative descriptor/config form response (`ConfigSchemaResponse`),
-  - detection via master topology scan (`RunDetectionRequest`),
-  - execution via existing vacuum task logic (`ExecuteJobRequest`),
-  - heartbeat/load reporting for monitor UI.
-- Legacy maintenance-worker-specific CLI path is removed.
-
-Run example:
-- Start admin: `weed admin -master=localhost:9333`
-- Start worker: `weed worker -admin=localhost:23646`
-- Optional explicit job type: `weed worker -admin=localhost:23646 -jobType=vacuum`
-- Optional stable worker ID persistence: `weed worker -admin=localhost:23646 -workingDir=/var/lib/seaweedfs-plugin`
-
-Phase 5
-- Migrate remaining job types and deprecate old mechanism.
-
-## Agreed Defaults
-
-1. Detector multiplicity
-- Exactly one detector worker per job type at a time. Admin selects one worker and runs detection there.
-
-2. Secret handling
-- No encryption at rest required for plugin config in this phase.
-
-3. Schema compatibility
-- No migration policy required yet; this is a new system.
-
-4. Execution ownership
-- Same worker is allowed to do both detection and execution.
-
-5. Retention
-- Keep last 10 successful runs and last 10 error runs per job type.