Merge branch 'reg-import-log' into 'master'

Add log to stdout option to gitlab-ctl registry import command

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7327

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Clemens Beck <[email protected]>
Approved-by: Andrew Patterson <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: João Pereira <[email protected]>

Author: balasankarc

files/gitlab-ctl-commands/lib/registry/import.rb

@@ -28,6 +28,7 @@ def self.indent(str, len)
     -1, --step-one pre-import         Perform step one of a multi-step import: alias for pre-import
     -2, --step-two all-repositories   Perform step two of a multi-step import: alias for all-repositories
     -3, --step-three common-blobs     Perform step three of a multi-step import: alias for common-blobs
+    -l, --log-to-stdout               Write detailed log to standard output instead of showing progress bars
   EOS
 
   def self.parse_options!(args, parser, options)
@@ -81,6 +82,9 @@ def self.parse_options!(args, parser, options)
       options[:step_three] = '--step-three'
     end
 
+    parser.on('-l', '--log-to-stdout', indent('write detailed log to standard output instead of showing progress bars', DESC_INDENT)) do
+      options[:log_to_stdout] = '--log-to-stdout'
+    end
     parser.order!(args)
 
     options

spec/chef/gitlab-ctl-commands/lib/registry/import_spec.rb

@@ -17,7 +17,8 @@
       [:all_repositories, 'all-repositories', true],
       [:step_one, 'step-one', false],
       [:step_two, 'step-two', true],
-      [:step_three, 'step-three', false]
+      [:step_three, 'step-three', false],
+      [:log_to_stdout, 'log-to-stdout', false]
     ]
 
     options_data.each do |option, option_name, read_only|