feat: add S3 region support for MinIO and update related tests

Author: grishy

integration/bundle.go

@@ -32,6 +32,7 @@ type BundleConfig struct {
 	RedisURI    string
 	S3Bucket    string
 	S3Endpoint  string
+	S3Region    string
 	S3AccessKey string
 	S3SecretKey string
 }
@@ -81,6 +82,9 @@ func StartBundle(ctx context.Context, cfg BundleConfig) (*BundleProcess, error)
 			"--initial-s3-endpoint", cfg.S3Endpoint,
 			"--initial-s3-force-path-style",
 		)
+		if cfg.S3Region != "" {
+			args = append(args, "--initial-s3-region", cfg.S3Region)
+		}
 	}
 
 	cmd := exec.CommandContext(ctx, binaryPath, args...)

integration/containers.go

@@ -84,12 +84,19 @@ type MinIOContainer struct {
 	Endpoint  string
 	AccessKey string
 	SecretKey string
+	Region    string
 	network   *testcontainers.DockerNetwork
 }
 
-// StartMinIO starts MinIO for S3 testing.
+// StartMinIO starts MinIO for S3 testing with default region (us-east-1).
 // Uses HTTP health endpoint for readiness check.
 func StartMinIO(ctx context.Context) (*MinIOContainer, error) {
+	return StartMinIOWithRegion(ctx, "")
+}
+
+// StartMinIOWithRegion starts MinIO with a custom region for S3 testing.
+// If region is empty, MinIO uses its default (us-east-1).
+func StartMinIOWithRegion(ctx context.Context, region string) (*MinIOContainer, error) {
 	accessKey := "minioadmin"
 	secretKey := "minioadmin"
 
@@ -100,17 +107,22 @@ func StartMinIO(ctx context.Context) (*MinIOContainer, error) {
 	}
 	networkName := dockerNet.Name
 
+	env := map[string]string{
+		"MINIO_ROOT_USER":     accessKey,
+		"MINIO_ROOT_PASSWORD": secretKey,
+	}
+	if region != "" {
+		env["MINIO_REGION"] = region
+	}
+
 	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
 			Image:        minioImage,
 			ExposedPorts: []string{"9000/tcp"},
-			Env: map[string]string{
-				"MINIO_ROOT_USER":     accessKey,
-				"MINIO_ROOT_PASSWORD": secretKey,
-			},
-			Cmd:        []string{"server", "/data"},
-			WaitingFor: wait.ForHTTP("/minio/health/live").WithPort("9000/tcp"),
-			Networks:   []string{networkName},
+			Env:          env,
+			Cmd:          []string{"server", "/data"},
+			WaitingFor:   wait.ForHTTP("/minio/health/live").WithPort("9000/tcp"),
+			Networks:     []string{networkName},
 			NetworkAliases: map[string][]string{
 				networkName: {"minio"},
 			},
@@ -158,6 +170,7 @@ func StartMinIO(ctx context.Context) (*MinIOContainer, error) {
 		Endpoint:  externalEndpoint,
 		AccessKey: accessKey,
 		SecretKey: secretKey,
+		Region:    region,
 		network:   dockerNet,
 	}, nil
 }

integration/integration_test.go

@@ -106,3 +106,64 @@ func TestBundleWithS3Storage(t *testing.T) {
 	require.NoError(t, err, "Bundle should shutdown cleanly")
 	t.Log("Bundle shutdown complete")
 }
+
+// TestBundleWithS3CustomRegion verifies that the bundle works with MinIO
+// configured with a custom region. This tests the fix for GitHub issue #47.
+func TestBundleWithS3CustomRegion(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	defer cancel()
+
+	customRegion := "custom-test-region"
+
+	// Start MongoDB
+	mongo, err := StartMongo(ctx)
+	require.NoError(t, err, "Failed to start MongoDB")
+	defer mongo.Terminate(ctx)
+	t.Logf("MongoDB URI: %s", mongo.URI)
+
+	// Start Redis
+	redis, err := StartRedis(ctx)
+	require.NoError(t, err, "Failed to start Redis")
+	defer redis.Terminate(ctx)
+	t.Logf("Redis URI: %s", redis.URI)
+
+	// Start MinIO with custom region
+	minio, err := StartMinIOWithRegion(ctx, customRegion)
+	require.NoError(t, err, "Failed to start MinIO with custom region")
+	defer minio.Terminate(ctx)
+	t.Logf("MinIO Endpoint: %s, Region: %s", minio.Endpoint, minio.Region)
+
+	// Start bundle with S3 and matching region
+	bundle, err := StartBundle(ctx, BundleConfig{
+		MongoURI:    mongo.URI,
+		RedisURI:    redis.URI,
+		S3Bucket:    "anytype-data",
+		S3Endpoint:  minio.Endpoint,
+		S3Region:    customRegion,
+		S3AccessKey: minio.AccessKey,
+		S3SecretKey: minio.SecretKey,
+	})
+	require.NoError(t, err, "Failed to start bundle")
+	defer bundle.Cleanup()
+	defer bundle.Stop()
+
+	// Wait for ready
+	err = bundle.WaitReady(90 * time.Second)
+	require.NoError(t, err, "Bundle should become ready with custom S3 region")
+	t.Log("Bundle is ready")
+
+	// Verify S3 backend selected
+	err = bundle.WaitForS3Backend(5 * time.Second)
+	require.NoError(t, err, "S3 storage backend should be selected")
+	t.Log("S3 storage backend confirmed")
+
+	// Verify TCP port
+	err = bundle.VerifyPort("33010")
+	require.NoError(t, err, "Port 33010 should be listening")
+	t.Log("Port 33010 is listening")
+
+	// Graceful shutdown
+	err = bundle.Stop()
+	require.NoError(t, err, "Bundle should shutdown cleanly")
+	t.Log("Bundle shutdown complete")
+}