From 7e3a4ddb3ad4585ffda2840f8de25b3e9c1ece57 Mon Sep 17 00:00:00 2001
From: Maksim Pischulenok <pischule@outlook.com>
Date: Sat, 26 Jul 2025 13:55:28 +0300
Subject: [PATCH] Move S3 connection details from hardcoded values to
 application properties.

This allows for greater flexibility in configuring the S3 storage provider for different environments without requiring code changes.

- Add `endpoint` and `region` to `S3Props`
- Update `S3Config` to use the new properties
- Add new S3 properties to `application-local.properties.dist`
---
 .../kotlin/com/pischule/memevizor/upload/S3Config.kt     | 4 ++--
 src/main/kotlin/com/pischule/memevizor/upload/S3Props.kt | 8 +++++++-
 src/main/resources/application-local.properties.dist     | 9 +++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/com/pischule/memevizor/upload/S3Config.kt b/src/main/kotlin/com/pischule/memevizor/upload/S3Config.kt
index 6feb746..0b80729 100644
--- a/src/main/kotlin/com/pischule/memevizor/upload/S3Config.kt
+++ b/src/main/kotlin/com/pischule/memevizor/upload/S3Config.kt
@@ -11,8 +11,8 @@ class S3Config {
     @Bean
     fun s3Client(s3Props: S3Props): MinioClient =
         MinioClient.builder()
-            .endpoint("https://storage.yandexcloud.net")
-            .region("ru-central1")
+            .endpoint(s3Props.endpoint)
+            .region(s3Props.region)
             .credentials(s3Props.accessKeyId, s3Props.secretAccessKey)
             .build()
 }
diff --git a/src/main/kotlin/com/pischule/memevizor/upload/S3Props.kt b/src/main/kotlin/com/pischule/memevizor/upload/S3Props.kt
index 56c1851..e6e63ed 100644
--- a/src/main/kotlin/com/pischule/memevizor/upload/S3Props.kt
+++ b/src/main/kotlin/com/pischule/memevizor/upload/S3Props.kt
@@ -3,4 +3,10 @@ package com.pischule.memevizor.upload
 import org.springframework.boot.context.properties.ConfigurationProperties
 
 @ConfigurationProperties("s3")
-data class S3Props(val accessKeyId: String, val secretAccessKey: String, val bucket: String)
+data class S3Props(
+    val endpoint: String,
+    val region: String,
+    val accessKeyId: String,
+    val secretAccessKey: String,
+    val bucket: String,
+)
diff --git a/src/main/resources/application-local.properties.dist b/src/main/resources/application-local.properties.dist
index f015cf3..b138915 100644
--- a/src/main/resources/application-local.properties.dist
+++ b/src/main/resources/application-local.properties.dist
@@ -1,3 +1,8 @@
 bot.forward-chat-id=<?>
-bot.approver<?>
-bot.token=<bot token>
+bot.approver-user-ids[0]=<?>
+bot.token=
+s3.endpoint=https://storage.yandexcloud.net
+s3.region=ru-central1
+s3.bucket=memevizor-test
+s3.access-key-id=<?>
+s3.secret-access-key=<?>