scalingo_backups_manager 0.8.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22aae190ac267f91679c59c01c34a385d7d31b8859c05c106e280bd8c449bc32
-  data.tar.gz: 4db5340d871f30d632067a274178837561716c289fe57fa72b1cc7a7af6a38cc
+  metadata.gz: 0db4f23f57c4f65c48b84afd49649ffca17d4e191c9958d717d61ea47daef770
+  data.tar.gz: fd07f83715c99a5c8686dcc9046ed1ac596865302fcd7b1511a574761e085319
 SHA512:
-  metadata.gz: 50c9ee867cfbb4f09c14cc82a7675ebd43c561d87fdaea720cf4ad0455be6aec87dcb022103e82638bc722c2c09f07fe29386c621e05338e30cafd43074eb8a2
-  data.tar.gz: af4e44b07ad73739b00fdb2e77be8c7dd80e8a0fdff376e87cfaf73c3a1e2618e90761adc46c5d61477b78c1730f2c0c3fadf705b2ed8cb5822008230b559bf6
+  metadata.gz: 6fd91f8fee5dfdc32577d12f04e59bf9e8a433410080e061ecec918718bd781cc05ce6239c8f661187a83fd5eefd6aa81f406c1b53ef39248b23ecddd573c4d8
+  data.tar.gz: 1c2267b5ba17516168b88a368ca1a42899eb1a27a0cc34d39f57612a2f7fd01987a6e0a77fbc8cb5535af67e16e4fe18bfd1d5eea4a72b8e2503668ede996cc5

data/.github/workflows/gem-push.yml

@@ -0,0 +1,36 @@
+name: Ruby Gem
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 2.6
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+      with:
+        ruby-version: 3.1.1
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scalingo_backups_manager (0.7.0)
+    scalingo_backups_manager (0.9.2)
       httparty (~> 0.18)
       net-sftp (~> 3.0.0)
       scalingo (~> 3.0)
@@ -90,4 +90,4 @@ DEPENDENCIES
   scalingo_backups_manager!
 
 BUNDLED WITH
-   2.3.13
+   2.4.17

data/lib/scalingo_backups_manager/addon.rb

@@ -24,6 +24,7 @@ module ScalingoBackupsManager
 
     def database_api_url(options: {})
       return @database_api_url if @database_api_url
+
       @database_api_url = "#{options[:database_api_root_url] || DEFAULT_DATABASE_API_ROOT_URL}/api/databases/#{id}"
     end
 
@@ -40,7 +41,7 @@ module ScalingoBackupsManager
 
       addon_cli_config = Scalingo::Client.new
       addon_cli_config.token = bearer_token
-      @client = Scalingo::API::Client.new(database_api_url(options), scalingo: addon_cli_config)
+      @client = Scalingo::API::Client.new(database_api_url(options: options), scalingo: addon_cli_config)
     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/mysql.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'fileutils'
 require 'erb'
 module ScalingoBackupsManager
   module Restore
@@ -29,12 +30,15 @@ module ScalingoBackupsManager
           system untar_cmd
         end
 
-        rails_db_config = YAML.load(ERB.new(File.read("config/#{opts[:database_config_file]}")).result)[opts[:env]]
+        database_yml_content = File.read("config/#{opts[:database_config_file]}")
+        parsed_database_config = ERB.new(database_yml_content).result
+        rails_db_config = YAML.load(parsed_database_config)[opts[:env]]
         config = {
           host: rails_db_config["host"],
           database: rails_db_config["database"],
           password: rails_db_config["password"],
           user: rails_db_config["username"],
+          port: rails_db_config["port"]
         }
 
         restore_cmd = "/usr/bin/env mysql -h #{opts[:host] || config[:host]}"

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
@@ -25,13 +24,13 @@ module ScalingoBackupsManager
           untar_cmd = "tar zxvf #{filename} -C #{destination_path}"
           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 +60,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.8.0"
-end
+  VERSION = "0.9.2"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scalingo_backups_manager
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Kevin Clercin
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2024-07-19 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:
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".DS_Store"
+- ".github/workflows/gem-push.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -107,7 +108,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
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Gem allowing to download backups from scalingo
 test_files: []