For database dumps don't modify the directory name

[kbrock]

overview

Typically "db_dump" or "db_backup" is added the remote path for backup upload.

This PR gives the rake task the --skip-directory option so "db_backup" is not added to the target directory name

related to:

• https://bugzilla.redhat.com/show_bug.cgi?id=1632433
• Anonymous FTP upload manageiq-appliance_console#65

before:

bundle exec rake evm:db:dump:remote -- --uri ftp://ftp.example.com/incoming/ \
                                       --remote-file-name test-db3.backup

# target: ftp://ftp.example.com/incoming/db_dump/the_file.tgz

after (using this option):

bundle exec rake evm:db:dump:remote -- --uri ftp://ftp.example.com/incoming/ \
                                       --remote-file-name test-db3.backup --skip-directory

# target: ftp://ftp.example.com/incoming/the_file.tgz

[NickLaMuro]

Just a suggestion, the rest of the code seems fine.

[NickLaMuro]

I think this is my only suggestion. Just don't like how this looks currently (question if my suggestion is better...), but I am a bit squeamish about passing a [] to File.join (seems odd):

folder   = nil
folder ||= action == :dump ? "db_dump" : "db_backup" unless connect_opts[:skip_directory]
uri = File.join(*[connect_opts[:uri], folder, connect_opts[:remote_file_name].compact)

I would maybe suggest moving this to a method, but since we are doing class methods here (not necessarily a fan of how this class is built) we would have to pass action and connect_opts as well, so I did it this way for less complexity.

[kbrock]

File.join("a", %w(b c), nil, "d")
TypeError: no implicit conversion of nil into String
	from (irb):1:in `join'
	from (irb):1
	from /opt/rubies/ruby-2.3.7/bin/irb:11:in `<main>'
File.join("a", %w(b c), [], "d")
# => "a/b/c/d"  

[kbrock]

I put in a work around, hope this one looks better.

[NickLaMuro]

@kbrock just an FYI, I was using the * (splat) operator on a compacted array (removes nil values), so that is why my sample worked, where your example does not.

But, I think what you have changed it to works for me, so lets go with that. Thanks. 👍

[NickLaMuro]

NO! Boo! 😡

See ManageIQ/manageiq-providers-amazon#434 (comment)

(pedantic, don't actually change this)

[NickLaMuro]

Looks good to me. 👍

[miq-bot]

This pull request is not mergeable. Please rebase and repush.

[kbrock]

fixed merge conflict

[miq-bot]

Checked commits kbrock/manageiq@28a79ac~...77d1616 with ruby 2.3.3, rubocop 0.52.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. 🍰

[simaishi]

Hammer backport details:

$ git log -1
commit d765fee4ed82b5a62e16dfff70f9e143b98323d8
Author: Nick Carboni <[email protected]>
Date:   Mon Oct 15 09:53:24 2018 -0400

    Merge pull request #18058 from kbrock/skip_directory_upload
    
    For database dumps don't modify the directory name
    
    (cherry picked from commit 256bdd6a579fea32ce46a5742b9de0ecb6bc36c5)