Add latest changes from gitlab-org/gitlab@master

gems/gitlab-backup-cli/lib/gitlab/backup/cli/targets/database.rb

@@ -24,15 +24,15 @@ module Gitlab
             @force = options.force?
           end
 
-          def dump(destination)
-            FileUtils.mkdir_p(destination)
+          def dump(destination_dir, _)
+            FileUtils.mkdir_p(destination_dir)
 
-            each_database(destination) do |backup_connection|
+            each_database(destination_dir) do |backup_connection|
               pg_env = backup_connection.database_configuration.pg_env_variables
               active_record_config = backup_connection.database_configuration.activerecord_variables
               pg_database_name = active_record_config[:database]
 
-              dump_file_name = file_name(destination, backup_connection.connection_name)
+              dump_file_name = file_name(destination_dir, backup_connection.connection_name)
               FileUtils.rm_f(dump_file_name)
 
               Gitlab::Backup::Cli::Output.print_info("Dumping PostgreSQL database #{pg_database_name} ... ")
@@ -68,13 +68,13 @@ module Gitlab
               rescue ActiveRecord::ConnectionNotEstablished
                 raise DatabaseBackupError.new(
                   backup_connection.database_configuration.activerecord_variables,
-                  file_name(destination, database_connection_name)
+                  file_name(destination_dir, database_connection_name)
                 )
               end
             end
           end
 
-          def restore(source)
+          def restore(destination_dir, _)
             @errors = []
 
             base_models_for_backup.each do |database_name, _|
@@ -82,7 +82,7 @@ module Gitlab
 
               config = backup_connection.database_configuration.activerecord_variables
 
-              db_file_name = file_name(source, database_name)
+              db_file_name = file_name(destination_dir, database_name)
               database = config[:database]
 
               unless File.exist?(db_file_name)

gems/gitlab-backup-cli/lib/gitlab/backup/cli/targets/object_storage/google.rb

@@ -19,7 +19,7 @@ module Gitlab
               @client = ::Google::Cloud::StorageTransfer.storage_transfer_service
             end
 
-            def dump(backup_id)
+            def dump(_, backup_id)
               response = find_or_create_job(backup_id, "backup")
               run_request = {
                 project_id: backup_job_spec(backup_id)[:project_id],
@@ -28,7 +28,7 @@ module Gitlab
               @results = client.run_transfer_job run_request
             end
 
-            def restore(backup_id)
+            def restore(_, backup_id)
               response = find_or_create_job(backup_id, "restore")
               run_request = {
                 project_id: restore_job_spec(backup_id)[:project_id],

gems/gitlab-backup-cli/lib/gitlab/backup/cli/targets/target.rb

@@ -20,16 +20,16 @@ module Gitlab
             false
           end
 
-          # dump task backup to `destination`
+          # dump task backup to `path`
           #
-          # @param [String] destination fully qualified backup task destination
-          # or a backup id - a unique identifier for a cloud backup
-          def dump(destination)
+          # @param [String] path fully qualified backup task destination
+          # @param [String] backup_id unique identifier for the backup
+          def dump(path, backup_id)
             raise NotImplementedError
           end
 
-          # restore task backup from `source`
-          def restore(source)
+          # restore task backup from `path`
+          def restore(path, backup_id)
             raise NotImplementedError
           end
         end

gems/gitlab-backup-cli/spec/gitlab/backup/cli/targets/object_storage/google_spec.rb

@@ -79,7 +79,7 @@ RSpec.describe Gitlab::Backup::Cli::Targets::ObjectStorage::Google do
           transfer_job: updated_spec
         )
         expect(client).to receive(:run_transfer_job).with({ job_name: "fake_transfer_job", project_id: "fake_project" })
-        object_storage.dump(12345)
+        object_storage.dump(nil, 12345)
       end
     end
 
@@ -94,7 +94,7 @@ RSpec.describe Gitlab::Backup::Cli::Targets::ObjectStorage::Google do
       it "creates a new job" do
         expect(client).to receive(:create_transfer_job)
           .with(transfer_job: new_backup_transfer_job_spec).and_return(backup_transfer_job)
-        object_storage.dump(12345)
+        object_storage.dump(nil, 12345)
       end
     end
   end
@@ -113,7 +113,7 @@ RSpec.describe Gitlab::Backup::Cli::Targets::ObjectStorage::Google do
           transfer_job: updated_spec
         )
         expect(client).to receive(:run_transfer_job).with({ job_name: "fake_transfer_job", project_id: "fake_project" })
-        object_storage.restore(12345)
+        object_storage.restore(nil, 12345)
       end
     end
 
@@ -128,7 +128,7 @@ RSpec.describe Gitlab::Backup::Cli::Targets::ObjectStorage::Google do
       it "creates a new job" do
         expect(client).to receive(:create_transfer_job)
           .with(transfer_job: new_restore_transfer_job_spec).and_return(restore_transfer_job)
-        object_storage.restore(12345)
+        object_storage.restore(nil, 12345)
       end
     end
   end