支持OSS托管加密

2026-08-16 22:38:31 +08:00
parent 7b7d23c743
commit eb06ec3c5f
6 changed files with 20 additions and 19 deletions
@@ -22,7 +22,6 @@ require_archive_config() {
  backup_require_env BACKUP_DIR >/dev/null
  backup_require_env BACKUP_OSS_URI >/dev/null
  backup_require_env BACKUP_PASSPHRASE >/dev/null
-  backup_require_env BACKUP_KMS_KEY_ID >/dev/null
 }

 closed_binlogs() {
@@ -91,10 +90,10 @@ archive_one() {
    printf 'created_at=%s\n' "$(date -Iseconds)"
  } > "${work_dir}/${object_id}.complete.env"

-  backup_oss_upload_kms "${cipher_file}" "${remote_dir}/binlog.enc"
-  backup_oss_upload_kms "${work_dir}/${object_id}.enc.sha256" "${remote_dir}/binlog.enc.sha256"
+  backup_oss_upload "${cipher_file}" "${remote_dir}/binlog.enc"
+  backup_oss_upload "${work_dir}/${object_id}.enc.sha256" "${remote_dir}/binlog.enc.sha256"
  # complete.env 最后上传，恢复程序只使用有该文件的 binlog。
-  backup_oss_upload_kms "${work_dir}/${object_id}.complete.env" "${remote_dir}/complete.env"
+  backup_oss_upload "${work_dir}/${object_id}.complete.env" "${remote_dir}/complete.env"
  write_state "${state_dir}" "${filename}" "${binlog_index}" "${raw_sha}" "${cipher_sha}" "${remote_dir}"
  rm -f -- "${raw_file}" "${cipher_file}" "${work_dir}/${object_id}.enc.sha256" "${work_dir}/${object_id}.complete.env"
 }