scalingo_backups_manager 0.5.0 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ddc26bcd894cfe092ba3fbbcfa954c68661bf64639a88f224e99d8848de16e2
-  data.tar.gz: 8742e9f0f1b4d3d2655a96f218eda3a753f13f4873440bb1e1e3c84ab7ba573c
+  metadata.gz: 056e83371931b63ddaca8c2b498627937c162fe11bab3f10c2455823c1029bee
+  data.tar.gz: 74109af520ec387a17c413590e7f92b6b670cb8d71caa467c57eb52c4343dc14
 SHA512:
-  metadata.gz: 75f37abc3dc0c5fd0eb259d55d857cf79bdd402f2d653dae315822830a06f4dce895cdb686f74e845f806c3847a0606afa088ca0d279408002129c500186d276
-  data.tar.gz: 58f6b07bbf870eff376e88c284e8dafa50eb5a0d95d28e685e2127de7544550ea2d81179214d0f031ad9002396237995db78afaa40162ffdace39ae42c3264e0
+  metadata.gz: 937f12a1baac04e58dbd1572e8176774d874a3ef67743cdd8da6c51054dfe78179f9bce64cf6a0af8e419803bfae88e9fb08df4641825017c10d5ba698351d5d
+  data.tar.gz: 164beb5eb694f5ad2f802d7eaf28cc66e6e04a190a9f08c0df75cbc7800409b5072706c3cd9a21e05051c3ca534bcd019b644d3a7679f981adb4a3ddd059f21d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scalingo_backups_manager (0.4.0)
+    scalingo_backups_manager (0.6.0)
       httparty (~> 0.18)
       net-sftp (~> 3.0.0)
       scalingo (~> 3.0)

data/lib/scalingo_backups_manager/cli.rb

@@ -128,38 +128,41 @@ module ScalingoBackupsManager
     def upload_to_ftp
       invoke :download, [], application: options[:application], addon: options[:addon]
       configuration = Configuration.new
+      opts = {
+        webhooks: configuration.config[:webhooks]
+      }
       configuration.for_each_addons do |application, addon|
         step = 1
-        config = addon.sftp_config
+        sftp_config = addon.sftp_config
         path = ("#{addon.config[:path]}" || "backups/#{addon.addon_provider[:id]}") + "/#{Time.now.strftime("%Y%m%d")}.tar.gz"
         next unless File.exists?(path)
         puts "** Upload backup for #{application.name} **"
 
-        sftp = ScalingoBackupsManager::SftpTools.new(config[:auth])
+        sftp = ScalingoBackupsManager::SftpTools.new(sftp_config[:auth])
 
         folders = [
-          config.dig(:auth, :dir),
-          config.dig(:dir) || application.name,
+          sftp_config.dig(:auth, :dir),
+          sftp_config.dig(:dir) || application.name,
           addon.addon_provider[:id]
         ]
 
-        if config[:retention].blank?
+        if sftp_config[:retention].blank?
           remote_path = "/" + [folders].delete_if(&:blank?).join("/")
           sftp.mkdir!(remote_path)
-          sftp.upload_file(path, remote_path)
+          sftp.upload_file(path, remote_path, options: opts)
           next
         end
 
-        config[:retention].each do |k, retention_config|
+        sftp_config[:retention].each do |k, retention_config|
           retention_folders = folders.dup
-          retention_folders << config.dig(:retention, k, :dir)
+          retention_folders << sftp_config.dig(:retention, k, :dir)
           remote_path = "/" + retention_folders.delete_if(&:blank?).join("/")
           puts "#{step} - Creating remote directory at #{remote_path}"
           step += 1
           sftp.mkdir!(remote_path)
           case k
           when "daily"
-            sftp.upload_file(path, remote_path)
+            sftp.upload_file(path, remote_path, options: opts)
             files = sftp.list_files(remote_path)
             puts "#{step} - Checking daily backups"
             step += 1
@@ -173,13 +176,14 @@ module ScalingoBackupsManager
             end
           when "monthly"
             next unless Date.today.day == 1
-            sftp.upload_file(path, remote_path)
+            sftp.upload_file(path, remote_path, options: opts)
             puts "#{step} - Checking monthly backups"
             step += 1
           end
         end
 
       end
+      FileUtils.rm_r 'backups/'
     end
 
   end

data/lib/scalingo_backups_manager/notification.rb

@@ -0,0 +1,30 @@
+require 'httparty'
+module ScalingoBackupsManager
+
+  class Notification
+
+    def self.send_slack_notification(hook_url, message)
+      HTTParty.post(
+        hook_url,
+        body: {
+          message: message
+        }.to_json,
+        headers: { 'Content-Type' => 'application/json' }
+      )
+    end
+
+    def self.send_discord_notification(hook_url, message)
+      payload = {
+        user: 'Scalingo backups manager',
+        content: message
+      }.to_json
+      HTTParty.post(
+        hook_url,
+        body: payload,
+        headers: { 'Content-Type': 'application/json' }
+      )
+    end
+
+  end
+
+end

data/lib/scalingo_backups_manager/restore/mysql.rb

@@ -63,7 +63,7 @@ module ScalingoBackupsManager
         puts "*** Restoring backup to mysql database ***"
         puts "Command: #{restore_cmd}"
         system(restore_cmd)
-        #FileUtils.rm_r destination_path unless opts[:skip_rm]
+        FileUtils.rm_r destination_path unless opts[:skip_rm]
       end
 
     end

data/lib/scalingo_backups_manager/restore/postgres.rb

@@ -33,22 +33,32 @@ module ScalingoBackupsManager
           password: rails_db_config["password"],
           user: rails_db_config["user"],
         }
+        restore_cmd = ""
+        if config[:password].present?
+          restore_cmd = "PGPASSWORD=#{config[:password]} "
+        end
+        restore_cmd << "/usr/bin/env"
+        restore_cmd << " pg_restore"
 
-        restore_cmd = "/usr/bin/env psql #{config[:database]} -h #{opts[:host] || config[:host]}"
+        file_path = Dir["#{destination_path}*.pgsql"]
+        if file_path.empty?
+          puts "*** No SQL file found in tar ***"
+          return
+        end
+        restore_cmd << " #{file_path.first}"
 
+        if config[:host].present?
+          restore_cmd << " -h #{opts[:host] || config[:host] || 'localhost'}"
+        end
         if config[:user].present?
-          restore_cmd << " --u #{config[:user]}"
-          if config[:password].present?
-            restore_cmd << " --password"
-            restore_cmd << " #{config[:password]}"
-          end
+          restore_cmd << " -U #{config[:user]}"
         end
 
-        if config[:port].present?
+        if opts[:port].present? || config[:port].present?
           restore_cmd << " -p #{opts[:port] || config[:port] || 5432}"
         end
 
-        restore_cmd << " < #{destination_path}"
+        restore_cmd << " -d #{config[:database]} --no-owner"
 
         puts "*** Restoring backup to Postgres database ***"
         system(restore_cmd)

data/lib/scalingo_backups_manager/sftp_tools.rb

@@ -1,3 +1,4 @@
+require 'scalingo_backups_manager/notification'
 require 'net/sftp'
 
 module ScalingoBackupsManager
@@ -45,10 +46,19 @@ module ScalingoBackupsManager
       end
     end
 
-    def upload_file(filepath, remote_dir)
+    def upload_file(filepath, remote_dir, options: {})
       filename = filepath.split('/').last
       start do |sftp|
-        sftp.upload!(filepath, "#{remote_dir}/#{filename}")
+        begin
+          sftp.upload!(filepath, "#{remote_dir}/#{filename}")
+        rescue
+          if options.dig(:webhooks, :slack_webhook_url)
+            ScalingoBackupsManager::Notification.send_slack_notification(options.dig(:webhooks, :slack_webhook_url), "An error has occured while uploading backup, see the logs for more information")
+          end
+          if options.dig(:webhooks, :discord_webhook_url)
+            ScalingoBackupsManager::Notification.send_discord_notification(options.dig(:webhooks, :discord_webhook_url), "An error has occured while uploading backup, see the logs for more information")
+          end
+        end
       end
     end
   end

data/lib/scalingo_backups_manager/version.rb

@@ -1,3 +1,3 @@
 module ScalingoBackupsManager
-  VERSION = "0.5.0"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scalingo_backups_manager
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.4
 platform: ruby
 authors:
 - Kevin Clercin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -92,6 +92,7 @@ files:
 - lib/scalingo_backups_manager/backup.rb
 - lib/scalingo_backups_manager/cli.rb
 - lib/scalingo_backups_manager/configuration.rb
+- lib/scalingo_backups_manager/notification.rb
 - lib/scalingo_backups_manager/restore/mongodb.rb
 - lib/scalingo_backups_manager/restore/mysql.rb
 - lib/scalingo_backups_manager/restore/postgres.rb