Fix rake tasks

Author: dorner

lib/tasks/backup_db_rds.rake

@@ -11,7 +11,7 @@ task :backup_db_rds => :environment do
   backup_filename = "#{Rails.env}-#{current_time}.rds.dump"
   system("PGPASSWORD='#{ENV["DIAPER_DB_PASSWORD"]}' pg_dump -Fc -v --host=#{ENV["DIAPER_DB_HOST"]} --username=#{ENV["DIAPER_DB_USERNAME"]} --dbname=#{ENV["DIAPER_DB_DATABASE"]} -f #{backup_filename}")
 
-  client = Aws::S3::Client.new
+  client = Aws::S3::Client.new(region: 'us-east-2')
 
   logger.info("Uploading #{backup_filename}")
   client.put_object(bucket: "human-essentials-backups", key: "backups/#{backup_filename}", body: File.read(backup_filename))

lib/tasks/fetch_latest_db.rake

@@ -15,7 +15,7 @@ task :fetch_latest_db do
   system("bin/rails db:environment:set RAILS_ENV=development")
   system("bin/rails db:drop db:create")
 
-  puts "Restoring the database with #{backup.name}"
+  puts "Restoring the database with #{backup.key}"
   backup_filepath = fetch_file_path(backup)
   db_username = ENV["PG_USERNAME"].presence || ENV["USER"].presence || "postgres"
   db_host = ENV["PG_HOST"].presence || "localhost"
@@ -58,16 +58,16 @@ def fetch_latest_backups
   #
   # Retrieve the most up to date version of the DB dump
   #
-  backup = backups.select { |b| b.name.match?(".rds.dump") }.sort do |a,b|
+  backup = backups.contents.select { |b| b.key.match?(".rds.dump") }.sort do |a,b|
     Time.parse(a.last_modified) <=> Time.parse(b.last_modified)
   end.reverse.first
 
   #
   # Download each of the backups onto the local disk in tmp
   #
   filepath = fetch_file_path(backup)
-  puts "\nDownloading blob #{backup.name} to #{filepath}"
-  blob_client.get_object(bucket: BUCKET_NAME, key: backup.name, response_target: filepath)
+  puts "\nDownloading blob #{backup.key} to #{filepath}"
+  blob_client.get_object(bucket: BUCKET_NAME, key: backup.key, response_target: filepath)
 
   #
   # At this point, the dumps should be stored on the local
@@ -77,11 +77,11 @@ def fetch_latest_backups
 end
 
 def blob_client
-  Aws::S3::Client.new
+  Aws::S3::Client.new(region: 'us-east-2')
 end
 
 def fetch_file_path(backup)
-  File.join(Rails.root, 'tmp', backup.name)
+  File.join(Rails.root, 'tmp', File.basename(backup.key))
 end
 
 def replace_user_passwords