From 3961320cbf0d9d1126a598f57baccc6d565f3f47 Mon Sep 17 00:00:00 2001
From: Alexander Tarasov <alex.tarasov@sentry.io>
Date: Tue, 6 Oct 2026 23:32:24 +0200
Subject: [PATCH] ref(profiles): Drop the sentry-vroom volume migration

The copy from the sentry-vroom volume into the profiles bucket shipped in
25.11.1, so every supported upgrade has run it at the 26.5.0 hard stop,
and fresh installs have nothing to migrate. It also needs a shell in the
vroom container, which a distroless vroom image won't have.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 _unit-test/bootstrap-s3-profiles-test.sh | 18 +++---------------
 install/bootstrap-s3-profiles.sh         | 23 +++--------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/_unit-test/bootstrap-s3-profiles-test.sh b/_unit-test/bootstrap-s3-profiles-test.sh
index 17c2bb1dd2e..6cd0b229a87 100755
--- a/_unit-test/bootstrap-s3-profiles-test.sh
+++ b/_unit-test/bootstrap-s3-profiles-test.sh
@@ -5,17 +5,6 @@ source install/dc-detect-version.sh
 source install/create-docker-volumes.sh
 source install/ensure-files-from-examples.sh
 export COMPOSE_PROFILES="feature-complete"
-# `docker compose pull vroom` can be skipped when pull_policy is set to `never`.
-$CONTAINER_ENGINE pull "${VROOM_IMAGE}"
-source install/ensure-correct-permissions-profiles-dir.sh
-
-# Generate some random files on `sentry-vroom` volume for testing
-$dc run --rm --no-deps -v sentry-vroom:/var/vroom/sentry-profiles --entrypoint /bin/bash vroom -c '
-  for i in $(seq 1 1000); do
-    echo This is test file $i > /var/vroom/sentry-profiles/test_file_$i.txt
-  done
-'
-
 # Set the flag to apply automatic updates
 export APPLY_AUTOMATIC_CONFIG_UPDATES=1
 
@@ -25,10 +14,9 @@ for i in $(seq 1 5); do
   source install/bootstrap-s3-profiles.sh
 done
 
-# Ensure that the files have been migrated to SeaweedFS
-migrated_files_count=$($dc exec seaweedfs s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=seaweedfs:8333 --host-bucket="seaweedfs:8333/%(bucket)" ls s3://profiles/ | wc -l)
-if [[ "$migrated_files_count" -ne 1000 ]]; then
-  echo "Error: Expected 1000 migrated files, but found $migrated_files_count"
+# Ensure that the bucket has been created
+if ! $dc exec seaweedfs s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=seaweedfs:8333 --host-bucket="seaweedfs:8333/%(bucket)" ls | grep -q "s3://profiles"; then
+  echo "Error: Expected the 'profiles' bucket to exist"
   exit 1
 fi
 
diff --git a/install/bootstrap-s3-profiles.sh b/install/bootstrap-s3-profiles.sh
index 447570a9d22..dd684f4f433 100644
--- a/install/bootstrap-s3-profiles.sh
+++ b/install/bootstrap-s3-profiles.sh
@@ -4,10 +4,9 @@
 # but at the time of this writing, it's not possible because the `sentry-vroom` volume has ownership set to `vroom:vroom`.
 # This prevents the `sentry`-based containers from performing read/write operations on that volume.
 #
-# Therefore, this script should do the following:
-# 1. Check if there are any files inside the `sentry-vroom` volume.
-# 2. If (1) finds files, copy those files into a "profiles" bucket on SeaweedFS.
-# 3. Point `filestore-profiles` and vroom to the SeaweedFS "profiles" bucket.
+# Therefore, this script creates a "profiles" bucket on SeaweedFS and points `filestore-profiles`
+# and vroom to it. Copying files over from the `sentry-vroom` volume happened up to the 26.5.0
+# hard stop, so every supported upgrade has already done it.
 
 # Should only run when `$COMPOSE_PROFILES` is set to `feature-complete`
 if [[ "$COMPOSE_PROFILES" == "feature-complete" ]]; then
@@ -71,22 +70,6 @@ if [[ "$COMPOSE_PROFILES" == "feature-complete" ]]; then
     fi
 
     $s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' mb s3://profiles
-
-    # Check if there are files in the sentry-vroom volume
-    start_service_and_wait_ready vroom
-    vroom_files_count=$($dc exec vroom sh -c "find /var/vroom/sentry-profiles -type f | wc -l")
-    if [[ "$vroom_files_count" -gt 0 ]]; then
-      echo "Migrating $vroom_files_count files from 'sentry-vroom' volume to 'profiles' bucket on SeaweedFS..."
-
-      # Use a temporary container to copy files from the volume to SeaweedFS
-
-      $dcx -u root vroom sh -c 'mkdir -p /var/lib/apt/lists/partial && apt-get update && apt-get install -y --no-install-recommends s3cmd'
-      $dc exec vroom sh -c 's3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=seaweedfs:8333 --host-bucket="seaweedfs:8333/%(bucket)" sync /var/vroom/sentry-profiles/ s3://profiles/'
-
-      echo "Migration completed."
-    else
-      echo "No files found in 'sentry-vroom' volume. Skipping files migration."
-    fi
   else
     echo "'profiles' bucket already exists on SeaweedFS. Skipping creation."
   fi