ll-innobackup 0.1.20 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e822135070e395eb93e490d1fb13c69e7ca4bcb7
-  data.tar.gz: 0abda3c7121759c254444334397d7b893c79ad89
+SHA256:
+  metadata.gz: fd4efe2cc26ec55323d76eabcc4b30152dc75d3a4cb1970b778acb91f9241777
+  data.tar.gz: 735208065ac94159dd58a0fe42880cb9f5fa45ac104629dd163fa3ff63daed3d
 SHA512:
-  metadata.gz: 1b970a97f2090c57a67015c32f386084dd58ef6bfd9c7f020a303156490da3e5e12827c2d79fdbb3bb349b0e2843aba82cd5967cfd574fbf299a7a4b77202a4e
-  data.tar.gz: 85e7231eb9aafed5b399b75cab6219eb11bbe1761c88aa9a3f9fb7c3a995302dea2108f7a09b824d873dd8bdf58733144225f384f3605ac938af741cec38b251
+  metadata.gz: 8feeba652828c7b8e68332a65636f1ea90031c1badfa6d405dd4f5165a7adef8dec73ec8ff2204917c1c01a16f9944fd713d53e007574709dc62417a2707e30b
+  data.tar.gz: ae3be48a9ad23170afb6d64ea89f8ef1306debe967058a6144c881d3b681e0c673534ab32a8afeb7509b0fb3c49eec407af4f70727f9ca4f31249aa1f2823239

data/lib/ll-innobackup.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'date'
+require 'aws-sdk-s3'
 
 # Run Inmental or Full backups on MySQL
 module LL
@@ -62,7 +63,8 @@ class InnoBackup
               :date,
               :state_files,
               :lock_files,
-              :options
+              :options,
+              :s3
 
   def initialize(options = {})
     @now = Time.now
@@ -71,6 +73,7 @@ class InnoBackup
     @lock_files = {}
     @state_files = {}
     @type = backup_type
+    @s3 = Aws::S3::Resource.new()
   end
 
   def aws_log
@@ -139,6 +142,10 @@ class InnoBackup
     @backup_compress_threads = options['backup_compress_threads'] ||= 4
   end
 
+  def encryption_threads
+    @encryption_threads = options['encryption_threads'] ||= 4
+  end
+
   def sql_backup_user
     @sql_backup_user ||= options['sql_backup_user']
   end
@@ -181,7 +188,7 @@ class InnoBackup
     [
      "--parallel=#{backup_parallel}",
      "--compress-threads=#{backup_compress_threads}",
-     ("--encrypt=AES256 --encrypt-key=#{encryption_key}" if is_encrypted?),
+     ("--encrypt=AES256 --encrypt-key=#{encryption_key} --encrypt-threads=#{encryption_threads}" if is_encrypted?),
      '--stream=xbstream --compress'
     ].join(" ")
   end
@@ -213,10 +220,14 @@ class InnoBackup
     "--expected-size=#{expected_full_size}" if type == 'full'
   end
 
-  def aws_command
-    "#{aws_bin} s3 cp #{working_file} s3://#{aws_bucket}/#{aws_backup_file} "\
-    "#{expected_size} #{expires} "\
-    "2> #{aws_log} >> #{aws_log}"
+  def s3object_uploaded?(bucket_name, object_key, file_path)
+    object = @s3.bucket(bucket_name).object(object_key)
+      object.upload_file(file_path, {expires: expires_date, thread_count: @options['thread_count']}) do |r|
+        return true
+      end
+  rescue StandardError => e
+    STDERR.puts "Error uploading object: #{e.message}"
+    return false
   end
 
   def valid_commands?
@@ -230,8 +241,7 @@ class InnoBackup
     `#{innobackup_command}`
     @completed_inno = $CHILD_STATUS == 0
     raise InnoBackup::StateError, 'Unable to run innobackup correctly' unless @completed_inno
-    `#{aws_command}`
-    @completed_aws = $CHILD_STATUS == 0
+    @completed_aws = s3object_uploaded?(aws_bucket, aws_backup_file, working_file)
     raise InnoBackup::StateError, 'Unable to run aws upload correctly' unless @completed_aws
     return record if success? && completed?
   rescue InnoBackup::StateError => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ll-innobackup
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.25
 platform: ruby
 authors:
 - Stuart Harland, LiveLink Technology Ltd
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.2.6
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.12.0
 description: A program to conduct innobackup
 email: essjayhch@gmail.com, infra@livelinktechnology.net
 executables:
@@ -37,7 +65,7 @@ homepage: http://rubygems.org/gems/ll-innobackup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -52,9 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Livelink Innobackup Script
 test_files: []