ll-innobackup 0.1.18 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d09c40ad1250fc616aee53e4d78cf9e5bc5efdc6
-  data.tar.gz: d02829f2bfcbabbd365e8a914c22ad98fc5fa950
+SHA256:
+  metadata.gz: fd27a56519f0cdd13a91e939f23e72456a75038431bd9c9f859ab5ad594a03b9
+  data.tar.gz: ded194f7c99d75373087f380abf7aecb2e99e934fb34301cb782567ce62fd8a7
 SHA512:
-  metadata.gz: 548e3d2beef7af97b014b4b4b17be021aed68462811df87a725f69c1a662979adb1f0c066c678a11884f8edfecd592cca5d29e52730a23f069206cb94c1d2efd
-  data.tar.gz: f1a8a54bce6df502895a23ad5e4ba7640e216778d0656ff4cd27606a3801e0aed80e2916e50df5a83cb6eed2a4d9632964709d8e21d4089922272810a67496fb
+  metadata.gz: 01bc8257a97fd022789492d3d5f28379d4336cf4894ffbf78d71a010cf59fe4f45c8bdf4b8e03beefaab1b80b98c10f54afb643457852a2fdbb7a924d10a0a85
+  data.tar.gz: ad7016da0416537ee9313629ad88c0d00f1e26b1c876cb6028e03ad2dd15a7c946501c0a23b4213ef8292c6b0572a4fc848d90b6498a3d8420f44528032ec85c

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
@@ -105,6 +108,10 @@ class InnoBackup
     false
   end
 
+  def is_encrypted?
+    !options['encryption_key'].empty?
+  end
+
   def can_full_backup?
     !fully_backed_up_today? && lock?('full')
   end
@@ -135,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
@@ -143,6 +154,10 @@ class InnoBackup
     @sql_backup_password ||= options['sql_backup_password']
   end
 
+  def encryption_key
+    @encryption_key ||= options['encryption_key']
+  end
+
   def aws_bin
     @aws_bin = options['aws_bin'] ||= '/usr/local/bin/aws'
   end
@@ -170,9 +185,12 @@ class InnoBackup
   end
 
   def innobackup_options
-    "--parallel=#{backup_parallel} "\
-    "--compress-threads=#{backup_compress_threads} "\
-    '--stream=xbstream --compress'
+    [
+     "--parallel=#{backup_parallel}",
+     "--compress-threads=#{backup_compress_threads}",
+     ("--encrypt=AES256 --encrypt-key=#{encryption_key} --encrypt-threads=#{encryption_threads}" if is_encrypted?),
+     '--stream=xbstream --compress'
+    ].join(" ")
   end
 
   def innobackup_command
@@ -202,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?
@@ -218,12 +240,11 @@ class InnoBackup
     return unless valid_commands?
     `#{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
-    raise Innobackup::StateError, 'Unable to run aws upload correctly' unless @completed_aws
+    raise InnoBackup::StateError, 'Unable to run innobackup correctly' unless @completed_inno
+    @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
+  rescue InnoBackup::StateError => e
     revert_aws
   rescue InnoBackup::NoStateError => e
     STDERR.puts e.message
@@ -340,6 +361,9 @@ class InnoBackup
 
   class NoStateError < StandardError
   end
+
+  class StateError < StandardError
+  end
 end
 end
 InnoBackup.new(InnoBackup.options).backup if $PROGRAM_NAME == __FILE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ll-innobackup
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.23
 platform: ruby
 authors:
 - Stuart Harland, LiveLink Technology Ltd
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-11 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ 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'
 description: A program to conduct innobackup
 email: essjayhch@gmail.com, infra@livelinktechnology.net
 executables:
@@ -37,7 +51,7 @@ homepage: http://rubygems.org/gems/ll-innobackup
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -52,9 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Livelink Innobackup Script
 test_files: []