manageiq-appliance_console 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d7e378f02630aa568cd8ff477da4a1e492421119f5c964e8c5093ace832a501
-  data.tar.gz: c6ad984e153ef15639aa0f23bef9dfb9aad6e3dc448f2ce05263670499c98b2c
+  metadata.gz: 321a59af1bedf7724c6a91de23b21d132f721cc368a514035ff04fc137fa4736
+  data.tar.gz: '04968551c5da4d87cc95696b4a608babc6f588b9eb14a3524b2d4791a20020ef'
 SHA512:
-  metadata.gz: 21756d451a2359bcbee0085dc816383ec2e3d5dab9f49111976d838ab4a42d0f0a80a2c36ae9ebadeb98805c4a7955516014a763dc293f6262c84e7327969e49
-  data.tar.gz: 51b11f3030dd224fc9cc4ebba9eb4d3fe16148f340d63452f24a5943579e0ea4f5515be482f3026ca2f46e77f1ba07749116a55da1483c26aef40c28519f6a3e
+  metadata.gz: 157cd575271810d91800e6ca1b2e7c6ef4194d7ec7bc750a40f311c1917ed526a23d8488fe8785da70605765e844b0894e019f3558b1a7138ab1ce91c222a7c9
+  data.tar.gz: 85220ed73c634509697d25020b6f9023dd0f3c1524ec05d5bca79c9e27866b5b220c0d5f4be5b451682fcbe04ea2dd73965cebb009e34d07dd91a3e415d21940

data/bin/appliance_console

@@ -42,12 +42,12 @@ def ensure_key_configured
     else
       say("\nEncryption key not configured.")
       press_any_key
-      raise MiqSignalError
+      raise ManageIQ::ApplianceConsole::MiqSignalError
     end
   end
 end
 
-[:INT, :TERM, :ABRT, :TSTP].each { |s| trap(s) { raise MiqSignalError } }
+[:INT, :TERM, :ABRT, :TSTP].each { |s| trap(s) { raise ManageIQ::ApplianceConsole::MiqSignalError } }
 
 VERSION_FILE  = ManageIQ::ApplianceConsole::RAILS_ROOT.join("VERSION")
 LOGFILE       = ManageIQ::ApplianceConsole::RAILS_ROOT.join("log", "appliance_console.log")

data/lib/manageiq/appliance_console/database_admin.rb

@@ -8,7 +8,8 @@ module ManageIQ
       LOCAL_FILE     = "Local file".freeze
       NFS_FILE       = "Network File System (NFS)".freeze
       SMB_FILE       = "Samba (SMB)".freeze
-      FILE_OPTIONS   = [LOCAL_FILE, NFS_FILE, SMB_FILE, CANCEL].freeze
+      S3_FILE        = "Amazon S3 (S3)".freeze
+      FILE_OPTIONS   = [LOCAL_FILE, NFS_FILE, SMB_FILE, S3_FILE, CANCEL].freeze
 
       DB_RESTORE_FILE      = "/tmp/evm_db.backup".freeze
       DB_DEFAULT_DUMP_FILE = "/tmp/evm_db.dump".freeze
@@ -56,6 +57,7 @@ module ManageIQ
         when LOCAL_FILE then ask_local_file_options
         when NFS_FILE   then ask_nfs_file_options
         when SMB_FILE   then ask_smb_file_options
+        when S3_FILE    then ask_s3_file_options
         when CANCEL     then raise MiqSignalError
         end
       end
@@ -94,6 +96,29 @@ module ManageIQ
         @task_params = ["--", params]
       end
 
+      def ask_s3_file_options
+        access_key_prompt = <<-PROMPT.strip_heredoc.chomp
+          Access Key ID with access to this file.
+          Example: 'amazon_aws_user'
+        PROMPT
+
+        @uri         = ask_for_uri(*remote_file_prompt_args_for("s3"))
+        user         = just_ask(access_key_prompt)
+        pass         = ask_for_password("Secret Access Key for #{user}")
+        region       = just_ask("Amazon Region for database file", "us-east-1")
+
+        @task        = "evm:db:#{action}:remote"
+        @task_params = [
+          "--",
+          {
+            :uri          => uri,
+            :uri_username => user,
+            :uri_password => pass,
+            :aws_region   => region
+          }
+        ]
+      end
+
       def ask_to_delete_backup_after_restore
         if action == :restore && backup_type == LOCAL_FILE
           say("The local database restore file is located at: '#{uri}'.\n")

data/lib/manageiq/appliance_console/database_configuration.rb

@@ -269,6 +269,7 @@ FRIENDLY
 
     def validate_encryption_key!
       raise "Encryption key invalid" unless ManageIQ::ApplianceConsole::Utilities.rake("evm:validate_encryption_key", {})
+      true
     end
 
     def do_save(settings)

data/lib/manageiq/appliance_console/prompts.rb

@@ -1,4 +1,5 @@
 require 'resolv'
+require 'io/console'
 
 module ManageIQ
 module ApplianceConsole
@@ -17,6 +18,7 @@ module ApplianceConsole
     SAMPLE_URLS = {
       'nfs' => 'nfs://host.mydomain.com/exported/my_exported_folder/db.backup',
       'smb' => 'smb://host.mydomain.com/my_share/daily_backup/db.backup',
+      's3'  => 's3://mybucket/my_subdirectory/daily_backup/db.backup',
     }
 
     def sample_url(scheme)
@@ -41,12 +43,7 @@ module ApplianceConsole
 
     def press_any_key
       say("\nPress any key to continue.")
-      begin
-        system("stty raw -echo")
-        STDIN.getc
-      ensure
-        system("stty -raw echo")
-      end
+      STDIN.noecho(&:getc)
     end
 
     def clear_screen

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '3.0.0'.freeze
+    VERSION = '3.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord