scalingo_backups_manager 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eecdc10b8f73d2a91d42fc47b3c53656f6089d0b3272fc6c40bb05b4239ed42
-  data.tar.gz: 97a79403c485891560862c3e3f9181a5e9df0c30f7fa6eb190303ee21137f466
+  metadata.gz: de3bae8aee21115bc798c52df63e0ddc785e11ab10b2420a762848d1896d50ef
+  data.tar.gz: a1284ed86a12de0029d40d6cc540fd5e2a2e69e64fc598f8ab6bafd64a3d1fc8
 SHA512:
-  metadata.gz: 0b476dc2a1651226d6ef0c11961ce4815d5250c76657167c4081e5bc25091282f176be3406c9c7c7fdf237ba3483fe4f73430a47e9323020697e43a7c8625fc8
-  data.tar.gz: 339c818aecf115a985df7ae57bce015880abe5b4527a80f17ff8dbedb4cef2f7650720cf48423bf2c1fbdd0cfc8a31a25fe28a7928684d9426f898485a29b88b
+  metadata.gz: c58e1ed24cd527487d858bd341ed14e5480431b95245bd062e8adc38beb7130fc9d726fa6a818ae2e879cac83212d2470778b072ce11d3f71edf76b697f922a4
+  data.tar.gz: 00775f8db0dea7792cf701aea40727852f6d6b0e5fe3ec6cfbfea3976eb9f7ade0fe305b0fae6619ba4fb1c86cf99ff4f59a41e73200428397d2e388c9c6bf88

data/.gitignore

@@ -11,4 +11,5 @@
 .rspec_status
 scalingo-backups-config.yml
 /backups/
-.idea
+.idea
+.rbenv-vars

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scalingo_backups_manager (0.6.6)
+    scalingo_backups_manager (0.7.0)
       httparty (~> 0.18)
       net-sftp (~> 3.0.0)
       scalingo (~> 3.0)
@@ -10,13 +10,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.6)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.4.4)
     faraday (1.10.0)
       faraday-em_http (~> 1.0)
@@ -54,7 +53,7 @@ GEM
     minitest (5.15.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.0)
     net-sftp (3.0.0)
       net-ssh (>= 5.0.0, < 7.0.0)
     net-ssh (6.1.0)
@@ -81,7 +80,6 @@ GEM
     thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -92,4 +90,4 @@ DEPENDENCIES
   scalingo_backups_manager!
 
 BUNDLED WITH
-   2.2.28
+   2.3.13

data/lib/scalingo_backups_manager/cli.rb

@@ -79,20 +79,24 @@ module ScalingoBackupsManager
       end
 
       configuration.for_each_addons(searched_application, searched_addon) do |application, addon|
-        backups = addon.backups
-        next unless backups.size > 0
-        backup = backups.first
-        download_link = backup.download_link
-        if download_link
+        begin
           puts "Downloading #{application.name} last backup"
-          path = ("#{addon.config[:path]}" || "backups/#{addon.addon_provider[:id]}") + "/#{Time.now.strftime("%Y%m%d")}.tar.gz"
-          if File.exist?(path)
-            puts "Backup already download, skipping..."
+          backups = addon.backups
+          next unless backups.size > 0
+          backup = backups.first
+          download_link = backup.download_link
+          if download_link
+            path = ("#{addon.config[:path]}" || "backups/#{addon.addon_provider[:id]}") + "/#{Time.now.strftime("%Y%m%d")}.tar.gz"
+            if File.exist?(path)
+              puts "Backup already download, skipping..."
+            else
+              system "curl #{download_link} -o #{path} --create-dirs -k"
+            end
           else
-            system "curl #{download_link} -o #{path} --create-dirs -k"
+            puts "No download link found for #{addon.addon_provider[:id]}, Skipping..."
           end
-        else
-          puts "No download link found for #{addon.addon_provider[:id]}, Skipping..."
+        rescue
+          puts "Issue with configuration of #{application.name}"
         end
       end
     end

data/lib/scalingo_backups_manager/notification.rb

@@ -3,6 +3,13 @@ module ScalingoBackupsManager
 
   class Notification
 
+    def self.send_healthchecks_notification(hook_url, message)
+      HTTParty.get(
+        hook_url,
+        headers: { 'Content-Type' => 'application/json' }
+      )
+    end
+
     def self.send_slack_notification(hook_url, message)
       HTTParty.post(
         hook_url,

data/lib/scalingo_backups_manager/restore/postgres.rb

@@ -17,7 +17,6 @@ module ScalingoBackupsManager
         destination_path = filename.split("/")
         backup_name = destination_path.pop.gsub(".tar.gz", "")
         destination_path = destination_path.join("/") + backup_name + "/"
-        p destination_path
         if Dir.exist?(destination_path)
           puts "Unzipped backup is already present, skipping..."
         else
@@ -26,12 +25,13 @@ module ScalingoBackupsManager
           system untar_cmd
         end
 
-        rails_db_config = YAML.load(ERB.new(File.read("config/#{opts[:database_config_file]}")).result)[opts[:env]]
+        rails_db_config = YAML.load(ERB.new(File.read("config/#{opts[:database_config_file]}")).result)[opts[:env].to_s]
         config = {
           host: rails_db_config["host"],
           database: rails_db_config["database"],
           password: rails_db_config["password"],
           user: rails_db_config["user"],
+          port: rails_db_config["port"]
         }
         restore_cmd = ""
         if config[:password].present?
@@ -61,6 +61,7 @@ module ScalingoBackupsManager
         restore_cmd << " -d #{config[:database]} --no-owner"
 
         puts "*** Restoring backup to Postgres database ***"
+        puts restore_cmd
         system(restore_cmd)
         FileUtils.rm_r destination_path unless opts[:skip_rm]
       end

data/lib/scalingo_backups_manager/sftp_tools.rb

@@ -60,6 +60,9 @@ module ScalingoBackupsManager
         begin
           sftp.upload!(filepath, "#{remote_dir}/#{filename}")
         rescue
+          if options.dig(:webhooks, :healthchecks_webhook_url)
+            ScalingoBackupsManager::Notification.send_healthchecks_notification(options.dig(:webhooks, :healthchecks_webhook_url), "An error has occured while uploading backup, see the logs for more information")
+          end
           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

data/lib/scalingo_backups_manager/version.rb

@@ -1,3 +1,3 @@
 module ScalingoBackupsManager
-  VERSION = "0.7.0"
-end
+  VERSION = "0.9.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scalingo_backups_manager
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Kevin Clercin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-description: 
+description:
 email:
 - kevin@9troisquarts.com
 executables:
@@ -74,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -106,7 +107,7 @@ metadata:
   homepage_uri: https://github.com/9troisquarts/scalingo_backups_manager
   source_code_uri: https://github.com/9troisquarts/scalingo_backups_manager
   changelog_uri: https://github.com/9troisquarts/scalingo_backups_manager/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,8 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Gem allowing to download backups from scalingo
 test_files: []