From cf02c6158804df78fd0c5da095c8e71a0088ba41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=8E=E9=96=93?= <noma.a@tyo-nds.co.jp>
Date: Mon, 10 Jul 2023 13:52:14 +0900
Subject: [PATCH] =?UTF-8?q?=E4=BB=AE=E5=AE=8C=E6=88=90=EF=BC=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecs/jskult-dbdump/.env.example                 |  1 -
 .../backup_rds_src05_20230710091352.gz         |  0
 ecs/jskult-dbdump/src/jobctrl_dbdump.py        | 18 +++++++++++++++++-
 .../src/system_var/environment.py              |  1 -
 4 files changed, 17 insertions(+), 3 deletions(-)
 delete mode 100644 ecs/jskult-dbdump/backup_rds_src05_20230710091352.gz

diff --git a/ecs/jskult-dbdump/.env.example b/ecs/jskult-dbdump/.env.example
index b331b25e..6db2d461 100644
--- a/ecs/jskult-dbdump/.env.example
+++ b/ecs/jskult-dbdump/.env.example
@@ -5,7 +5,6 @@ DB_PASSWORD=************
 DB_SCHEMA=src05
 
 JSKULT_BACKUP_BUCKET=mbj-newdwh2021-staging-backup-jskult
-JSKULT_CONFIG_BUCKET=mbj-newdwh2021-staging-config
 
 DUMP_BACKUP_FOLDER=dump
 
diff --git a/ecs/jskult-dbdump/backup_rds_src05_20230710091352.gz b/ecs/jskult-dbdump/backup_rds_src05_20230710091352.gz
deleted file mode 100644
index e69de29b..00000000
diff --git a/ecs/jskult-dbdump/src/jobctrl_dbdump.py b/ecs/jskult-dbdump/src/jobctrl_dbdump.py
index 3ae7bdb6..42be4e51 100644
--- a/ecs/jskult-dbdump/src/jobctrl_dbdump.py
+++ b/ecs/jskult-dbdump/src/jobctrl_dbdump.py
@@ -57,6 +57,23 @@ def exec():
         with open(my_cnf_path, 'w') as f:
             f.write(textwrap.dedent(my_cnf_file_content)[1:-1])
 
+        #***************************************************************
+        # # MySQLコマンドを実行する
+        # command = ['mysqldump', f'--defaults-file={my_cnf_path}', '-P', f"'{environment.DB_PORT}'", environment.DB_SCHEMA]
+        # mysqldump_process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        # # gzipコマンドを実行して圧縮する
+        # gzip_process = subprocess.Popen(['gzip'], stdin=mysqldump_process.stdout, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        # # aws s3 cpコマンドを実行してアップロードする
+        # s3_cp_process = subprocess.Popen(['aws', 's3', 'cp', '-', s3_file_name], stdin=gzip_process.stdout ,stderr=subprocess.PIPE)
+        # # 出力を取得する
+        # mysqldump_process.stdout.close()
+        # _, error = s3_cp_process.communicate()
+
+        # if s3_cp_process.returncode != 0:
+        #     print("Error: ", error.decode("utf-8"))
+        #     raise Exception('Error')
+        #***************************************************************
+
         dt_now = datetime.datetime.now()
         converted_value = dt_now.strftime('%Y%m%d%H%M%S')
         file_name = f'backup_rds_src05_{converted_value}.gz'
@@ -70,7 +87,6 @@ def exec():
         '--port={db_port}'.format(db_port=environment.DB_PORT),
         '{db_name}'.format(db_name=environment.DB_SCHEMA)
         ]
-
         # mysqldumpコマンドを実行してデータを標準出力に出力
         mysqldump_output = subprocess.check_output(mysqldump_cmd)
 
diff --git a/ecs/jskult-dbdump/src/system_var/environment.py b/ecs/jskult-dbdump/src/system_var/environment.py
index 123935a2..46f08c5d 100644
--- a/ecs/jskult-dbdump/src/system_var/environment.py
+++ b/ecs/jskult-dbdump/src/system_var/environment.py
@@ -9,7 +9,6 @@ DB_SCHEMA = os.environ['DB_SCHEMA']
 
 # AWS
 JSKULT_BACKUP_BUCKET = os.environ['JSKULT_BACKUP_BUCKET']
-JSKULT_CONFIG_BUCKET = os.environ['JSKULT_CONFIG_BUCKET']
 
 # 初期値がある環境変数
 LOG_LEVEL = os.environ.get('LOG_LEVEL', 'INFO')