From 5e16ed89b6695eab7b486164c2e13b5cdf750de8 Mon Sep 17 00:00:00 2001
From: Lev Vereshchagin <mail@vrslev.com>
Date: Sun, 19 Dec 2021 14:39:20 +0300
Subject: [PATCH] Change variables MINIO_ACCESS_KEY and MINIO_SECRET_KEY to
 S3_ACCESS_KEY, S3_SECRET_KEY in tests

---
 tests/_check_backup_files.py |  4 ++--
 tests/_create_bucket.py      |  4 ++--
 tests/main.py                | 20 ++++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/_check_backup_files.py b/tests/_check_backup_files.py
index c137b8b6..ab26f2b5 100644
--- a/tests/_check_backup_files.py
+++ b/tests/_check_backup_files.py
@@ -8,8 +8,8 @@ def main() -> int:
         service_name="s3",
         endpoint_url="http://minio:9000",
         region_name="us-east-1",
-        aws_access_key_id=os.getenv("MINIO_ACCESS_KEY"),
-        aws_secret_access_key=os.getenv("MINIO_SECRET_KEY"),
+        aws_access_key_id=os.getenv("S3_ACCESS_KEY"),
+        aws_secret_access_key=os.getenv("S3_SECRET_KEY"),
     )
     bucket = resource.Bucket("frappe")
     db = False
diff --git a/tests/_create_bucket.py b/tests/_create_bucket.py
index a8c959fd..e0b55cbf 100644
--- a/tests/_create_bucket.py
+++ b/tests/_create_bucket.py
@@ -8,8 +8,8 @@ def main() -> int:
         service_name="s3",
         endpoint_url="http://minio:9000",
         region_name="us-east-1",
-        aws_access_key_id=os.getenv("MINIO_ACCESS_KEY"),
-        aws_secret_access_key=os.getenv("MINIO_SECRET_KEY"),
+        aws_access_key_id=os.getenv("S3_ACCESS_KEY"),
+        aws_secret_access_key=os.getenv("S3_SECRET_KEY"),
     )
     resource.create_bucket(Bucket="frappe")
     return 0
diff --git a/tests/main.py b/tests/main.py
index fb94be2d..5bf1cf33 100644
--- a/tests/main.py
+++ b/tests/main.py
@@ -18,8 +18,8 @@ BACKEND_SERVICES = (
     "queue-long",
     "scheduler",
 )
-MINIO_ACCESS_KEY = "AKIAIOSFODNN7EXAMPLE"
-MINIO_SECRET_KEY = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
+S3_ACCESS_KEY = "AKIAIOSFODNN7EXAMPLE"
+S3_SECRET_KEY = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
 
 
 def patch_print():
@@ -242,9 +242,9 @@ def prepare_s3_server():
         "minio",
         "-d",
         "-e",
-        f"MINIO_ACCESS_KEY={MINIO_ACCESS_KEY}",
+        f"S3_ACCESS_KEY={S3_ACCESS_KEY}",
         "-e",
-        f"MINIO_SECRET_KEY={MINIO_SECRET_KEY}",
+        f"S3_SECRET_KEY={S3_SECRET_KEY}",
         "--network",
         "test_default",
         "minio/minio",
@@ -255,9 +255,9 @@ def prepare_s3_server():
     docker_compose(
         "exec",
         "-e",
-        f"MINIO_ACCESS_KEY={MINIO_ACCESS_KEY}",
+        f"S3_ACCESS_KEY={S3_ACCESS_KEY}",
         "-e",
-        f"MINIO_SECRET_KEY={MINIO_SECRET_KEY}",
+        f"S3_SECRET_KEY={S3_SECRET_KEY}",
         "backend",
         "/home/frappe/frappe-bench/env/bin/python",
         "/tmp/_create_bucket.py",
@@ -282,9 +282,9 @@ def push_backup_to_s3():
         "--endpoint-url",
         "http://minio:9000",
         "--aws-access-key-id",
-        MINIO_ACCESS_KEY,
+        S3_ACCESS_KEY,
         "--aws-secret-access-key",
-        MINIO_SECRET_KEY,
+        S3_SECRET_KEY,
     )
 
 
@@ -294,9 +294,9 @@ def check_backup_in_s3():
     docker_compose(
         "exec",
         "-e",
-        f"MINIO_ACCESS_KEY={MINIO_ACCESS_KEY}",
+        f"S3_ACCESS_KEY={S3_ACCESS_KEY}",
         "-e",
-        f"MINIO_SECRET_KEY={MINIO_SECRET_KEY}",
+        f"S3_SECRET_KEY={S3_SECRET_KEY}",
         "backend",
         "/home/frappe/frappe-bench/env/bin/python",
         "/tmp/_check_backup_files.py",