aspera-cli 4.17.0 → 4.18.1

data/lib/aspera/cli/plugins/httpgw.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'aspera/rest'
+require 'aspera/api/httpgw'
+require 'aspera/nagios'
+
+module Aspera
+  module Cli
+    module Plugins
+      class Httpgw < Plugin
+        class << self
+          def application_name
+            'HTTP Gateway'
+          end
+
+          def detect(base_url)
+            api = Api::Httpgw.new(url: base_url)
+            api_info = api.info
+            return {
+              url:     base_url,
+              version: api_info['version']
+            } if api_info.is_a?(Hash) && api_info.key?('download_endpoint')
+            return nil
+          end
+        end
+        ACTIONS = %i[health info].freeze
+
+        def initialize(**env)
+          super
+          options.declare(:url, 'URL of application, e.g. https://app.example.com/aspera/app')
+          options.parse_options!
+        end
+
+        def execute_action
+          base_url = options.get_option(:url, mandatory: true)
+          command = options.get_next_command(ACTIONS)
+          case command
+          when :health
+            nagios = Nagios.new
+            begin
+              Api::Httpgw.new(url: base_url)
+              nagios.add_ok('api', 'answered ok')
+            rescue StandardError => e
+              nagios.add_critical('api', e.to_s)
+            end
+            return nagios.result
+          when :info
+            api_v1 = Api::Httpgw.new(url: base_url)
+            return {type: :single_object, data: api_v1.info}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/aspera/cli/plugins/node.rb

@@ -3,6 +3,7 @@
 # cspell:ignore snid fnid bidi ssync asyncs rund asnodeadmin mkfile mklink asperabrowser asperabrowserurl watchfolders watchfolderd entsrv
 require 'aspera/cli/basic_auth_plugin'
 require 'aspera/cli/sync_actions'
+require 'aspera/cli/special_values'
 require 'aspera/transfer/spec'
 require 'aspera/nagios'
 require 'aspera/hash_ext'
@@ -44,7 +45,8 @@ module Aspera
               next unless result[:http].body.eql?('')
               url_length = -2 - test_endpoint.length
               return {
-                url: result[:http].uri.to_s[0..url_length]
+                url:     result[:http].uri.to_s[0..url_length],
+                version: 'requires authentication'
               }
             rescue StandardError => e
               error = e
@@ -92,7 +94,7 @@ module Aspera
         SEARCH_REMOVE_FIELDS = %w[basename permissions].freeze
 
         # actions in execute_command_gen3
-        COMMANDS_GEN3 = %i[search space mkdir mklink mkfile rename delete browse upload download http_node_download sync]
+        COMMANDS_GEN3 = %i[search space mkdir mklink mkfile rename delete browse upload download http_node_download sync transport]
 
         BASE_ACTIONS = %i[api_details].concat(COMMANDS_GEN3).freeze
 
@@ -161,7 +163,7 @@ module Aspera
         # translates paths results into CLI result, and removes prefix
         def c_result_translate_rem_prefix(response, type, success_msg, path_prefix)
           errors = []
-          final_result = { data: [], type: :object_list, fields: [type, 'result']}
+          final_result = {type: :object_list, data: [], fields: [type, 'result']}
           JSON.parse(response[:http].body)['paths'].each do |p|
             result = success_msg
             if p.key?('error')
@@ -178,24 +180,78 @@ module Aspera
           return c_result_remove_prefix_path(final_result, type, path_prefix)
         end
 
-        # get path arguments from command line, and add prefix
-        def get_next_arg_add_prefix(path_prefix, name, number=:single)
-          path_or_list = options.get_next_argument(name, expected: number)
-          return path_or_list if path_prefix.nil?
-          return File.join(path_prefix, path_or_list) if path_or_list.is_a?(String)
-          return path_or_list.map {|p| File.join(path_prefix, p)} if path_or_list.is_a?(Array)
-          raise StandardError, 'expect: nil, String or Array'
+        # directory: node, container: shares
+        FOLDER_TYPE = %w[directory container].freeze
+
+        def browse_gen3(prefix_path)
+          folders_to_process = [get_one_argument_with_prefix(prefix_path, 'path')]
+          query = options.get_option(:query, default: {})
+          # special parameter: max number of entries in result
+          max_items = query.delete('max')
+          # special parameter: recursive browsing
+          recursive = query.delete('recursive')
+          # special parameter: only return one entry for the path, even if folder
+          only_path = query.delete('self')
+          # allow user to specify a single call, and not recursive
+          single_call = query.key?('skip')
+          # API default is 100, so use 1000 for default
+          query['count'] ||= 1000
+          raise Cli::BadArgument, 'options recursive and skip cannot be used together' if recursive && single_call
+          all_items = []
+          until folders_to_process.empty?
+            path = folders_to_process.shift
+            query['path'] = path
+            offset = 0
+            total_count = nil
+            result = nil
+            loop do
+              # example: send_result={'items'=>[{'file'=>"filename1","permissions"=>[{'name'=>'read'},{'name'=>'write'}]}]}
+              response = @api_node.call(
+                operation:   'POST',
+                subpath:     'files/browse',
+                headers:     {'Accept' => 'application/json'},
+                body:        query,
+                body_type:   :json)
+              # 'file','symbolic_link'
+              if only_path || !FOLDER_TYPE.include?(response[:data]['self']['type'])
+                result = { type: :single_object, data: response[:data]['self']}
+                break
+              end
+              items = response[:data]['items']
+              total_count ||= response[:data]['total_count']
+              all_items.concat(items)
+              if single_call
+                formatter.display_item_count(response[:data]['item_count'], total_count)
+                break
+              end
+              if recursive
+                folders_to_process.concat(items.select{|i|FOLDER_TYPE.include?(i['type'])}.map{|i|i['path']})
+              end
+              if !max_items.nil? && (all_items.count >= max_items)
+                all_items = all_items.slice(0, max_items) if all_items.count > max_items
+                break
+              end
+              break if all_items.count >= total_count
+              offset += items.count
+              query['skip'] = offset
+              formatter.long_operation_running(all_items.count)
+            end
+            query.delete('skip')
+          end
+          result ||= {type: :object_list, data: all_items}
+          return c_result_remove_prefix_path(result, 'path', prefix_path)
         end
 
         # file and folder related commands
         def execute_command_gen3(command, prefix_path)
           case command
           when :delete
-            paths_to_delete = get_next_arg_add_prefix(prefix_path, 'file list', :multiple)
+            # TODO: add query for recursive
+            paths_to_delete = get_all_arguments_with_prefix(prefix_path, 'file list')
             resp = @api_node.create('files/delete', { paths: paths_to_delete.map{|i| {'path' => i.start_with?('/') ? i : "/#{i}"} }})
             return c_result_translate_rem_prefix(resp, 'file', 'deleted', prefix_path)
           when :search
-            search_root = get_next_arg_add_prefix(prefix_path, 'search root')
+            search_root = get_one_argument_with_prefix(prefix_path, 'search root')
             parameters = {'path' => search_root}
             other_options = query_option
             parameters.merge!(other_options) unless other_options.nil?
@@ -207,48 +263,34 @@ module Aspera
             formatter.display_status("params: #{resp[:data]['parameters'].keys.map{|k|"#{k}:#{resp[:data]['parameters'][k]}"}.join(',')}")
             return c_result_remove_prefix_path(result, 'path', prefix_path)
           when :space
-            path_list = get_next_arg_add_prefix(prefix_path, 'folder path or ext.val. list')
-            path_list = [path_list] unless path_list.is_a?(Array)
+            path_list = get_all_arguments_with_prefix(prefix_path, 'folder path or ext.val. list')
             resp = @api_node.create('space', { 'paths' => path_list.map {|i| { path: i} } })
-            result = { data: resp[:data]['paths'], type: :object_list}
+            result = { type: :object_list, data: resp[:data]['paths']}
             # return c_result_translate_rem_prefix(resp,'folder','created',prefix_path)
             return c_result_remove_prefix_path(result, 'path', prefix_path)
           when :mkdir
-            path_list = get_next_arg_add_prefix(prefix_path, 'folder path or ext.val. list')
-            path_list = [path_list] unless path_list.is_a?(Array)
-            resp = @api_node.create('files/create', { 'paths' => [{ type: :directory, path: path_list }] })
+            path_list = get_all_arguments_with_prefix(prefix_path, 'folder path or ext.val. list')
+            resp = @api_node.create('files/create', { 'paths' => path_list.map{|i|{ type: :directory, path: i }}})
             return c_result_translate_rem_prefix(resp, 'folder', 'created', prefix_path)
           when :mklink
-            target = get_next_arg_add_prefix(prefix_path, 'target')
-            path_list = get_next_arg_add_prefix(prefix_path, 'link path')
-            resp = @api_node.create('files/create', { 'paths' => [{ type: :symbolic_link, path: path_list, target: { path: target} }] })
+            target = get_one_argument_with_prefix(prefix_path, 'target')
+            one_path = get_one_argument_with_prefix(prefix_path, 'link path')
+            resp = @api_node.create('files/create', { 'paths' => [{ type: :symbolic_link, path: one_path, target: { path: target} }] })
             return c_result_translate_rem_prefix(resp, 'folder', 'created', prefix_path)
           when :mkfile
-            path_list = get_next_arg_add_prefix(prefix_path, 'file path')
+            one_path = get_one_argument_with_prefix(prefix_path, 'file path')
             contents64 = Base64.strict_encode64(options.get_next_argument('contents'))
-            resp = @api_node.create('files/create', { 'paths' => [{ type: :file, path: path_list, contents: contents64 }] })
+            resp = @api_node.create('files/create', { 'paths' => [{ type: :file, path: one_path, contents: contents64 }] })
             return c_result_translate_rem_prefix(resp, 'folder', 'created', prefix_path)
           when :rename
-            path_base = get_next_arg_add_prefix(prefix_path, 'path_base')
-            path_src = get_next_arg_add_prefix(prefix_path, 'path_src')
-            path_dst = get_next_arg_add_prefix(prefix_path, 'path_dst')
+            # TODO: multiple ?
+            path_base = get_one_argument_with_prefix(prefix_path, 'path_base')
+            path_src = get_one_argument_with_prefix(prefix_path, 'path_src')
+            path_dst = get_one_argument_with_prefix(prefix_path, 'path_dst')
             resp = @api_node.create('files/rename', { 'paths' => [{ 'path' => path_base, 'source' => path_src, 'destination' => path_dst }] })
             return c_result_translate_rem_prefix(resp, 'entry', 'moved', prefix_path)
           when :browse
-            query = { path: get_next_arg_add_prefix(prefix_path, 'path')}
-            additional_query = options.get_option(:query)
-            query.merge!(additional_query) unless additional_query.nil?
-            send_result = @api_node.create('files/browse', query)[:data]
-            # example: send_result={'items'=>[{'file'=>"filename1","permissions"=>[{'name'=>'read'},{'name'=>'write'}]}]}
-            # if there is no items
-            case send_result['self']['type']
-            when 'directory', 'container' # directory: node, container: shares
-              result = { data: send_result['items'], type: :object_list }
-              formatter.display_item_count(send_result['item_count'], send_result['total_count'])
-            else # 'file','symbolic_link'
-              result = { data: send_result['self'], type: :single_object}
-            end
-            return c_result_remove_prefix_path(result, 'path', prefix_path)
+            return browse_gen3(prefix_path)
           when :sync
             return execute_sync_action do |sync_direction, local_path, remote_path|
               # Gen3 API
@@ -296,13 +338,15 @@ module Aspera
             transfer_spec.delete('paths') if command.eql?(:upload)
             return Main.result_transfer(transfer.start(transfer_spec))
           when :http_node_download
-            remote_path = get_next_arg_add_prefix(prefix_path, 'remote path')
+            remote_path = get_one_argument_with_prefix(prefix_path, 'remote path')
             file_name = File.basename(remote_path)
             @api_node.call(
               operation: 'GET',
               subpath: "files/#{URI.encode_www_form_component(remote_path)}/contents",
               save_to_file: File.join(transfer.destination_folder(Transfer::Spec::DIRECTION_RECEIVE), file_name))
             return Main.result_status("downloaded: #{file_name}")
+          when :transport
+            return {type: :single_object, data: @api_node.transport_params}
           end
           Aspera.error_unreachable_line
         end
@@ -338,7 +382,7 @@ module Aspera
             when :set_bearer_key
               access_key_id = options.get_next_argument('access key id')
               access_key_id = @api_node.read('access_keys/self')[:data]['id'] if access_key_id.eql?('self')
-              bearer_key_pem = options.get_next_argument('public or private RSA key PEM value', type: String)
+              bearer_key_pem = options.get_next_argument('public or private RSA key PEM value', validation: String)
               key = OpenSSL::PKey.read(bearer_key_pem)
               key = key.public_key if key.private?
               bearer_key_pem = key.to_pem
@@ -358,9 +402,10 @@ module Aspera
             begin
               @api_node.call(
                 operation: 'POST',
-                subpath: 'services/soap/Transfer-201210',
-                headers: {'Content-Type' => 'text/xml;charset=UTF-8', 'SOAPAction' => 'FASPSessionNET-200911#GetSessionInfo'},
-                text_body_params: CENTRAL_SOAP_API_TEST)[:http].body
+                subpath:   'services/soap/Transfer-201210',
+                headers:   {'Content-Type' => 'text/xml;charset=UTF-8', 'SOAPAction' => 'FASPSessionNET-200911#GetSessionInfo'},
+                body:      CENTRAL_SOAP_API_TEST,
+                body_type: :text)[:http].body
               nagios.add_ok('central', 'accessible by node')
             rescue StandardError => e
               nagios.add_critical('central', e.to_s)
@@ -420,7 +465,7 @@ module Aspera
               result[:password] = apifid[:api].auth_params[:password]
             when :oauth2
               result[:username] = apifid[:api].params[:headers][Api::Node::HEADER_X_ASPERA_ACCESS_KEY]
-              result[:password] = apifid[:api].oauth_token
+              result[:password] = apifid[:api].oauth.token
             else Aspera.error_unreachable_line
             end
             return {type: :single_object, data: result} if command_repo.eql?(:node_info)
@@ -431,7 +476,7 @@ module Aspera
             apifid = @api_node.resolve_api_fid(top_file_id, options.get_next_argument('path'))
             file_info = apifid[:api].read("files/#{apifid[:file_id]}")[:data]
             if file_info['type'].eql?('folder')
-              result = apifid[:api].read("files/#{apifid[:file_id]}/files", old_query_read_delete)
+              result = apifid[:api].read("files/#{apifid[:file_id]}/files", query_read_delete)
               items = result[:data]
               formatter.display_item_count(result[:data].length, result[:http]['X-Total-Count'])
             else
@@ -528,7 +573,7 @@ module Aspera
             return {type: :single_object, data: items}
           when :modify
             apifid = apifid_from_next_arg(top_file_id)
-            update_param = options.get_next_argument('update data', type: Hash)
+            update_param = options.get_next_argument('update data', validation: Hash)
             apifid[:api].update("files/#{apifid[:file_id]}", update_param)[:data]
             return Main.result_status('Done')
           when :thumbnail
@@ -538,7 +583,7 @@ module Aspera
               subpath: "files/#{apifid[:file_id]}/preview",
               headers: {'Accept' => 'image/png'}
             )
-            return Main.result_picture_in_terminal(options, result[:http].body)
+            return Main.result_image(result[:http].body, formatter: formatter)
           when :permission
             apifid = apifid_from_next_arg(top_file_id)
             command_perm = options.get_next_command(%i[list create delete])
@@ -559,7 +604,7 @@ module Aspera
                 {'id' => one_id}
               end
             when :create
-              create_param = options.get_next_argument('creation data', type: Hash)
+              create_param = options.get_next_argument('creation data', validation: Hash)
               raise 'no file_id' if create_param.key?('file_id')
               create_param['file_id'] = apifid[:file_id]
               create_param['access_levels'] = Api::Node::ACCESS_LEVELS unless create_param.key?('access_levels')
@@ -574,9 +619,9 @@ module Aspera
             else Aspera.error_unreachable_line
             end
           else Aspera.error_unreachable_line
-          end # command_repo
+          end
           Aspera.error_unreachable_line
-        end # execute_command_gen4
+        end
 
         # This is older API
         def execute_async
@@ -585,7 +630,7 @@ module Aspera
             async_name = options.get_option(:sync_name)
             if async_name.nil?
               async_id = instance_identifier
-              if async_id.eql?(ExtendedValue::ALL) && %i[show delete].include?(command)
+              if async_id.eql?(SpecialValues::ALL) && %i[show delete].include?(command)
                 async_ids = @api_node.read('async/list')[:data]['sync_ids']
               else
                 Integer(async_id) # must be integer
@@ -608,7 +653,7 @@ module Aspera
           when :show
             resp = @api_node.create('async/summary', post_data)[:data]['sync_summaries']
             return Main.result_empty if resp.empty?
-            return { type: :object_list, data: resp, fields: %w[snid name local_dir remote_dir] } if async_id.eql?(ExtendedValue::ALL)
+            return { type: :object_list, data: resp, fields: %w[snid name local_dir remote_dir] } if async_id.eql?(SpecialValues::ALL)
             return { type: :single_object, data: resp.first }
           when :delete
             resp = @api_node.create('async/delete', post_data)[:data]
@@ -695,11 +740,15 @@ module Aspera
             when *Plugin::ALL_OPS then return entity_command(sync_command, @api_node, 'asyncs', item_list_key: 'ids'){|field, value|ssync_lookup(field, value)}
             else
               asyncs_id = instance_identifier {|field, value|ssync_lookup(field, value)}
-              parameters = nil
               if %i[start stop].include?(sync_command)
-                @api_node.create("asyncs/#{asyncs_id}/#{sync_command}", parameters)
+                @api_node.call(
+                  operation: 'POST',
+                  subpath:   "asyncs/#{asyncs_id}/#{sync_command}",
+                  body:      '',
+                  body_type: :text)[:http].body
                 return Main.result_status('Done')
               end
+              parameters = nil
               parameters = query_option(default: {}) if %i[bandwidth counters files].include?(sync_command)
               return { type: :single_object, data: @api_node.read("asyncs/#{asyncs_id}/#{sync_command}", parameters)[:data] }
             end
@@ -707,7 +756,7 @@ module Aspera
             command = options.get_next_command(%i[list create show modify cancel])
             case command
             when :list
-              resp = @api_node.read('ops/transfers', old_query_read_delete)
+              resp = @api_node.read('ops/transfers', query_read_delete)
               return { type: :object_list, data: resp[:data], fields: %w[id status] } # TODO: useful?
             when :create
               resp = @api_node.create('streams', value_create_modify(command: command))
@@ -758,7 +807,7 @@ module Aspera
               resp = @api_node.read(one_res_path)
               return { type: :other_struct, data: resp[:data] }
             when :modify
-              resp = @api_node.update(one_res_path, options.get_next_argument('update value', type: Hash))
+              resp = @api_node.update(one_res_path, options.get_next_argument('update value', validation: Hash))
               return { type: :other_struct, data: resp[:data] }
             when :bandwidth_average
               transfers_data = @api_node.read(res_class_path, query_read_delete)[:data]
@@ -819,7 +868,7 @@ module Aspera
               return { type: :object_list, data: resp[:data]['services'] }
             when :create
               # @json:'{"type":"WATCHFOLDERD","run_as":{"user":"user1"}}'
-              params = options.get_next_argument('Run creation data (structure)')
+              params = options.get_next_argument('creation data', validation: Hash)
               resp = @api_node.create('rund/services', params)
               return Main.result_status("#{resp[:data]['id']} created")
             when :delete
@@ -841,7 +890,7 @@ module Aspera
               resp = @api_node.create(res_class_path, value_create_modify(command: command))
               return Main.result_status("#{resp[:data]['id']} created")
             when :list
-              resp = @api_node.read(res_class_path, old_query_read_delete)
+              resp = @api_node.read(res_class_path, query_read_delete)
               return { type: :value_list, data: resp[:data]['ids'], name: 'id' }
             when :show
               return { type: :single_object, data: @api_node.read(one_res_path)[:data]}
@@ -895,13 +944,13 @@ module Aspera
             }
             # encode parameters so that it looks good in url
             encoded_params = Base64.strict_encode64(Zlib::Deflate.deflate(JSON.generate(browse_params))).gsub(/=+$/, '').tr('+/', '-_').reverse
-            OpenApplication.instance.uri("#{options.get_option(:asperabrowserurl)}?goto=#{encoded_params}")
+            Environment.instance.open_uri("#{options.get_option(:asperabrowserurl)}?goto=#{encoded_params}")
             return Main.result_status('done')
           when :basic_token
             return Main.result_status(Rest.basic_token(options.get_option(:username, mandatory: true), options.get_option(:password, mandatory: true)))
           when :bearer_token
-            private_key = OpenSSL::PKey::RSA.new(options.get_next_argument('private RSA key PEM value', type: String))
-            token_info = options.get_next_argument('user and group identification', type: Hash)
+            private_key = OpenSSL::PKey::RSA.new(options.get_next_argument('private RSA key PEM value', validation: String))
+            token_info = options.get_next_argument('user and group identification', validation: Hash)
             access_key = options.get_option(:username, mandatory: true)
             return Main.result_status(Api::Node.bearer_token(payload: token_info, access_key: access_key, private_key: private_key))
           when :simulator
@@ -914,9 +963,25 @@ module Aspera
             server.mount(uri.path, NodeSimulatorServlet, parameters[:credentials], transfer)
             server.start
             return Main.result_status('Simulator terminated')
-          end # case command
+          end
           raise 'ERROR: shall not reach this line'
         end
+
+        private
+
+        # get remaining path arguments from command line, and add prefix
+        def get_all_arguments_with_prefix(path_prefix, name)
+          path_args = options.get_next_argument(name, multiple: true)
+          return path_args if path_prefix.nil?
+          return path_args.map {|p| File.join(path_prefix, p)}
+        end
+
+        # get next path argument from command line, and add prefix
+        def get_one_argument_with_prefix(path_prefix, name)
+          path_arg = options.get_next_argument(name, validation: String)
+          return path_arg if path_prefix.nil?
+          return File.join(path_prefix, path_arg)
+        end
       end
     end
   end

data/lib/aspera/cli/plugins/orchestrator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'aspera/cli/basic_auth_plugin'
+require 'aspera/cli/special_values'
 require 'aspera/nagios'
 require 'aspera/log'
 require 'aspera/assert'
@@ -60,33 +61,37 @@ module Aspera
 
         ACTIONS = %i[health info workflow plugins processes].freeze
 
-        def call_ao(endpoint, opt={})
-          opt[:prefix] = 'api' unless opt.key?(:prefix)
+        # call orchestrator api
+        # @param endpoint [String] the endpoint to call
+        # @param prefix [String] the prefix to add to the endpoint
+        # @param id [String] the id to add to the endpoint
+        # @param ret_style [Symbol] the return style, :header, :arg, :ext(extension)
+        # @param format [String] the format to request, 'json', 'xml', nil
+        # @param args [Hash] the arguments to pass
+        # @param xml_arrays [Boolean] if true, force arrays in xml parsing
+        def call_ao(endpoint, prefix: 'api', id: nil, ret_style: nil, format: 'json', args: nil, xml_arrays: true)
           # calls are GET
           call_args = {operation: 'GET', subpath: endpoint}
           # specify prefix if necessary
-          call_args[:subpath] = "#{opt[:prefix]}/#{call_args[:subpath]}" unless opt[:prefix].nil?
+          call_args[:subpath] = "#{prefix}/#{call_args[:subpath]}" unless prefix.nil?
           # specify id if necessary
-          call_args[:subpath] = "#{call_args[:subpath]}/#{opt[:id]}" if opt.key?(:id)
-          call_type = options.get_option(:ret_style, mandatory: true)
-          call_type = opt[:ret_style] if opt.key?(:ret_style)
-          format = 'json'
-          format = opt[:format] if opt.key?(:format)
-          call_args[:url_params] = opt[:args] unless opt[:args].nil?
+          call_args[:subpath] = "#{call_args[:subpath]}/#{id}" unless id.nil?
+          ret_style = options.get_option(:ret_style, mandatory: true) if ret_style.nil?
+          call_args[:query] = args unless args.nil?
           unless format.nil?
-            case call_type
+            case ret_style
             when :header
               call_args[:headers] = {'Accept' => "application/#{format}" }
             when :arg
-              call_args[:url_params] ||= {}
-              call_args[:url_params][:format] = format
+              call_args[:query] ||= {}
+              call_args[:query][:format] = format
             when :ext
               call_args[:subpath] = "#{call_args[:subpath]}.#{format}"
-            else Aspera.error_unexpected_value(call_type)
+            else Aspera.error_unexpected_value(ret_style)
             end
           end
           result = @api_orch.call(**call_args)
-          result[:data] = XmlSimple.xml_in(result[:http].body, opt[:xml_opt] || {'ForceArray' => true}) if format.eql?('xml')
+          result[:data] = XmlSimple.xml_in(result[:http].body, {'ForceArray' => xml_arrays}) if format.eql?('xml')
           Log.log.debug{Log.dump(:data, result[:data])}
           return result
         end
@@ -121,7 +126,7 @@ module Aspera
           when :health
             nagios = Nagios.new
             begin
-              info = call_ao('remote_node_ping', format: 'xml', xml_opt: {'ForceArray' => false})[:data]
+              info = call_ao('remote_node_ping', format: 'xml', xml_arrays: false)[:data]
               nagios.add_ok('api', 'accessible')
               nagios.check_product_version('api', 'orchestrator', info['orchestrator-version'])
             rescue StandardError => e
@@ -129,7 +134,7 @@ module Aspera
             end
             return nagios.result
           when :info
-            result = call_ao('remote_node_ping', format: 'xml', xml_opt: {'ForceArray' => false})[:data]
+            result = call_ao('remote_node_ping', format: 'xml', xml_arrays: false)[:data]
             return {type: :single_object, data: result}
           when :processes
             # TODO: Bug ? API has only XML format
@@ -146,9 +151,8 @@ module Aspera
             end
             case command
             when :status
-              call_opts = {}
-              call_opts[:id] = wf_id unless wf_id.eql?(ExtendedValue::ALL)
-              result = call_ao('workflows_status', call_opts)[:data]
+              wf_id = nil if wf_id.eql?(SpecialValues::ALL)
+              result = call_ao('workflows_status', id: wf_id)[:data]
               return {type: :object_list, data: result['workflows']['workflow']}
             when :list
               result = call_ao('workflows_list', id: 0)[:data]
@@ -172,9 +176,8 @@ module Aspera
                 data: nil
               }
               call_params = {format: :json}
-              override_accept = nil
               # get external parameters if any
-              options.get_next_argument('external_parameters', mandatory: false, type: Hash, default: {}).each do |name, value|
+              options.get_next_argument('external_parameters', mandatory: false, validation: Hash, default: {}).each do |name, value|
                 call_params["external_parameters[#{name}]"] = value
               end
               # synchronous call ?
@@ -192,15 +195,15 @@ module Aspera
               end
               if call_params['synchronous']
                 result[:type] = :text
-                override_accept = 'text/plain'
               end
-              result[:data] = call_ao('initiate', id: wf_id, args: call_params, accept: override_accept)[:data]
+              result[:data] = call_ao('initiate', id: wf_id, args: call_params)[:data]
               return result
-            end # wf command
+            end
           else Aspera.error_unexpected_value(command)
-          end # case command
-        end # execute_action
-      end # Orchestrator
-    end # Plugins
-  end # Cli
-end # Aspera
+          end
+        end
+        private :call_ao
+      end
+    end
+  end
+end

data/lib/aspera/cli/plugins/preview.rb

@@ -128,7 +128,11 @@ module Aspera
         def get_folder_entries(file_id, request_args=nil)
           headers = {'Accept' => 'application/json'}
           headers['X-Aspera-Cache-Control'] = 'no-cache' if @option_folder_reset_cache.eql?(:header)
-          return @api_node.call(operation: 'GET', subpath: "files/#{file_id}/files", headers: headers, url_params: request_args)[:data]
+          return @api_node.call(
+            operation: 'GET',
+            subpath:   "files/#{file_id}/files",
+            headers:   headers,
+            query:     request_args)[:data]
           # return @api_node.read("files/#{file_id}/files",request_args)[:data]
         end
 
@@ -338,7 +342,7 @@ module Aspera
         rescue StandardError => e
           Log.log.error{"Ignore: #{e.message}"}
           Log.log.debug(e.backtrace.join("\n").red)
-        end # generate_preview
+        end
 
         # scan all files in provided folder entry
         # @param top_path subpath to start folder scan inside
@@ -485,7 +489,7 @@ module Aspera
             return Main.result_status('Tools validated')
           when :test, :show
             source = options.get_next_argument('source file')
-            format = options.get_next_argument('format', expected: Aspera::Preview::Generator::PREVIEW_FORMATS, default: :png)
+            format = options.get_next_argument('format', accept_list: Aspera::Preview::Generator::PREVIEW_FORMATS, default: :png)
             generated_file_path = preview_filename(format, options.get_option(:base))
             g = Aspera::Preview::Generator.new(source, generated_file_path, @gen_options, @tmp_folder, nil)
             g.generate

data/lib/aspera/cli/plugins/server.rb

@@ -232,7 +232,7 @@ module Aspera
           when *TRANSFER_COMMANDS
             return execute_transfer(command, server_transfer_spec)
           when *AsCmd::OPERATIONS
-            command_arguments = options.get_next_argument('ascmd command arguments', expected: :multiple, mandatory: false)
+            command_arguments = options.get_next_argument('ascmd command arguments', multiple: true, mandatory: false)
             ascmd = AsCmd.new(ascmd_executor)
             begin
               result = ascmd.execute_single(command, command_arguments)
@@ -251,8 +251,8 @@ module Aspera
             end
           else Aspera.error_unreachable_line
           end
-        end # execute_action
-      end # Server
-    end # Plugins
-  end # Cli
-end # Aspera
+        end
+      end
+    end
+  end
+end