aspera-cli 4.17.0 → 4.18.1

data/lib/aspera/cli/plugin_factory.rb

@@ -6,34 +6,25 @@ module Aspera
     # option is retrieved from another object using accessor
     class PluginFactory
       include Singleton
-      attr_reader :lookup_folders, :plugins
 
       RUBY_FILE_EXT = '.rb'
       PLUGINS_MODULE = 'Plugins'
-      private_constant :RUBY_FILE_EXT
-      class << self
-        # instantiate a plugin
-        # plugins must be Capitalized
-        def plugin_class(plugin_name_sym)
-          # Module.nesting[2] is Cli::Plugins
-          return Object.const_get("#{Module.nesting[2]}::#{PLUGINS_MODULE}::#{plugin_name_sym.to_s.capitalize}")
-        end
-      end
+      private_constant :RUBY_FILE_EXT, :PLUGINS_MODULE
+
+      attr_reader :lookup_folders
 
       def initialize
         @lookup_folders = []
+        # information on plugins
         @plugins = {}
       end
 
-      def add_plugin_info(path)
-        raise "ERROR: plugin path must end with #{RUBY_FILE_EXT}" if !path.end_with?(RUBY_FILE_EXT)
-        plugin_symbol = File.basename(path, RUBY_FILE_EXT).to_sym
-        req = path.sub(/#{RUBY_FILE_EXT}$/o, '')
-        if @plugins.key?(plugin_symbol)
-          Log.log.warn{"skipping plugin already registered: #{plugin_symbol}"}
-          return
-        end
-        @plugins[plugin_symbol] = {source: path, require_stanza: req}
+      def plugin_list
+        @plugins.keys
+      end
+
+      def plugin_source(plugin_name_sym)
+        @plugins[plugin_name_sym][:source]
       end
 
       def add_lookup_folder(folder)
@@ -52,9 +43,29 @@ module Aspera
         end
       end
 
+      def plugin_class(plugin_name_sym)
+        raise "ERROR: plugin not found: #{plugin_name_sym}" unless @plugins.key?(plugin_name_sym)
+        require @plugins[plugin_name_sym][:require_stanza]
+        # Module.nesting[1] is Aspera::Cli
+        return Object.const_get("#{Module.nesting[1]}::#{PLUGINS_MODULE}::#{plugin_name_sym.to_s.capitalize}")
+      end
+
       def create(plugin_name_sym, **args)
         # TODO: check that ancestor is Plugin?
-        self.class.plugin_class(plugin_name_sym).new(**args)
+        plugin_class(plugin_name_sym).new(**args)
+      end
+
+      private
+
+      def add_plugin_info(path)
+        raise "ERROR: plugin path must end with #{RUBY_FILE_EXT}" if !path.end_with?(RUBY_FILE_EXT)
+        plugin_symbol = File.basename(path, RUBY_FILE_EXT).to_sym
+        req = path.sub(/#{RUBY_FILE_EXT}$/o, '')
+        if @plugins.key?(plugin_symbol)
+          Log.log.warn{"skipping plugin already registered: #{plugin_symbol}"}
+          return
+        end
+        @plugins[plugin_symbol] = {source: path, require_stanza: req}
       end
     end
   end

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

@@ -1,20 +1,32 @@
 # frozen_string_literal: true
 
 require 'aspera/api/aoc'
+require 'aspera/nagios'
 
 module Aspera
   module Cli
     module Plugins
       class Alee < Cli::BasicAuthPlugin
-        ACTIONS = %i[entitlement].freeze
+        ACTIONS = %i[health entitlement].freeze
 
         def execute_action
           command = options.get_next_command(ACTIONS)
           case command
+          when :health
+            nagios = Nagios.new
+            begin
+              api = Api::Alee.new(nil, nil, version: 'ping')
+              result = api.call(operation: 'GET', subpath: '')
+              raise "unexpected response: #{result[:http].body}" unless result[:http].body.eql?('pong')
+              nagios.add_ok('api', 'answered ok')
+            rescue StandardError => e
+              nagios.add_critical('api', e.to_s)
+            end
+            return nagios.result
           when :entitlement
             entitlement_id = options.get_option(:username, mandatory: true)
             customer_id = options.get_option(:password, mandatory: true)
-            api_metering = Api::AoC.metering_api(entitlement_id, customer_id)
+            api_metering = Api::Alee.new(entitlement_id, customer_id)
             return {type: :single_object, data: api_metering.read('entitlement')[:data]}
           end
         end

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

@@ -4,6 +4,7 @@ require 'aspera/cli/plugins/node'
 require 'aspera/cli/plugins/ats'
 require 'aspera/cli/basic_auth_plugin'
 require 'aspera/cli/transfer_agent'
+require 'aspera/cli/special_values'
 require 'aspera/agent/node'
 require 'aspera/transfer/spec'
 require 'aspera/api/aoc'
@@ -18,12 +19,41 @@ module Aspera
   module Cli
     module Plugins
       class Aoc < Cli::BasicAuthPlugin
-        AOC_PATH_API_CLIENTS = 'admin/api-clients'
         # default redirect for AoC web auth
         REDIRECT_LOCALHOST = 'http://localhost:12345'
         # OAuth methods supported
         STD_AUTH_TYPES = %i[web jwt].freeze
-        private_constant :AOC_PATH_API_CLIENTS, :REDIRECT_LOCALHOST, :STD_AUTH_TYPES
+        # admin objects that can be manipulated
+        ADMIN_OBJECTS = %i[
+          self
+          organization
+          user
+          group
+          group_membership
+          client
+          contact
+          dropbox
+          node
+          operation
+          package
+          saml_configuration
+          workspace
+          workspace_membership
+          dropbox_membership
+          short_link
+          application
+          client_registration_token
+          client_access_key
+          kms_profile].freeze
+        # query to list fully received packages
+        PACKAGE_RECEIVED_BASE_QUERY = {
+          'archived'    => false,
+          'has_content' => true,
+          'received'    => true,
+          'completed'   => true}.freeze
+        # options and parameters for Api::AoC.new
+        OPTIONS_NEW = %i[url auth client_id client_secret scope redirect_uri private_key passphrase username password workspace].freeze
+        private_constant :REDIRECT_LOCALHOST, :STD_AUTH_TYPES, :ADMIN_OBJECTS, :PACKAGE_RECEIVED_BASE_QUERY, :OPTIONS_NEW
         class << self
           def application_name
             'Aspera on Cloud'
@@ -33,12 +63,12 @@ module Aspera
             # no protocol ?
             base_url = "https://#{base_url}" unless base_url.match?(%r{^[a-z]{1,6}://})
             # only org provided ?
-            base_url = "#{base_url}.#{Api::AoC::PROD_DOMAIN}" unless base_url.include?('.')
+            base_url = "#{base_url}.#{Api::SAAS_DOMAIN_PROD}" unless base_url.include?('.')
             # AoC is only https
             return nil unless base_url.start_with?('https://')
             result = Rest.new(base_url: base_url, redirect_max: 10).read('')
             # Any AoC is on this domain
-            return nil unless result[:http].uri.host.end_with?(Api::AoC::PROD_DOMAIN)
+            return nil unless result[:http].uri.host.end_with?(Api::SAAS_DOMAIN_PROD)
             Log.log.debug{"AoC Main page: #{result[:http].body.include?(Api::AoC::PRODUCT_NAME)}"}
             base_url = result[:http].uri.to_s if result[:http].uri.path.include?('/public')
             # either in standard domain, or product name in page
@@ -48,6 +78,8 @@ module Aspera
             }
           end
 
+          # @param [String] url : url to check
+          # @return [Bool] true if private key is required for the url (i.e. no passcode)
           def private_key_required?(url)
             # pub link do not need private key
             return Api::AoC.link_info(url)[:token].nil?
@@ -92,7 +124,7 @@ module Aspera
               formatter.display_status(pub_key_pem)
               if !options.get_option(:test_mode)
                 formatter.display_status('Once updated or validated, press enter.')
-                OpenApplication.instance.uri(instance_url)
+                Environment.instance.open_uri(instance_url)
                 $stdin.gets
               end
             else
@@ -106,7 +138,7 @@ module Aspera
                 formatter.display_status('- origin: localhost')
                 formatter.display_status('Use the generated client id and secret in the following prompts.'.red)
               end
-              OpenApplication.instance.uri("#{instance_url}/#{AOC_PATH_API_CLIENTS}")
+              Environment.instance.open_uri("#{instance_url}/admin/api-clients")
               options.get_option(:client_id, mandatory: true)
               options.get_option(:client_secret, mandatory: true)
               use_browser_authentication = true
@@ -147,35 +179,8 @@ module Aspera
             }
           end
         end
-        # special value for package id
-        KNOWN_AOC_RES = %i[
-          self
-          organization
-          user
-          group
-          group_membership
-          client
-          contact
-          dropbox
-          node
-          operation
-          package
-          saml_configuration
-          workspace
-          workspace_membership
-          dropbox_membership
-          short_link
-          application
-          client_registration_token
-          client_access_key
-          kms_profile].freeze
-        PACKAGE_RECEIVED_BASE_QUERY = {
-          'archived'    => false,
-          'has_content' => true,
-          'received'    => true,
-          'completed'   => true}.freeze
 
-        def initialize(**env)
+        def initialize(**_)
           super
           @cache_workspace_info = nil
           @cache_home_node_file = nil
@@ -186,17 +191,15 @@ module Aspera
           options.declare(:scope, 'OAuth scope for AoC API calls', default: Api::AoC::SCOPE_FILES_USER)
           options.declare(:redirect_uri, 'OAuth API client redirect URI')
           options.declare(:private_key, 'OAuth JWT RSA private key PEM value (prefix file path with @file:)')
-          options.declare(:passphrase, 'RSA private key passphrase')
+          options.declare(:passphrase, 'RSA private key passphrase', types: String)
           options.declare(:workspace, 'Name of workspace', types: [String, NilClass], default: Api::AoC::DEFAULT_WORKSPACE)
-          options.declare(:new_user_option, 'New user creation option for unknown package recipients')
+          options.declare(:new_user_option, 'New user creation option for unknown package recipients', types: Hash)
           options.declare(:validate_metadata, 'Validate shared inbox metadata', values: :bool, default: true)
           options.parse_options!
           # add node plugin options (for manual)
           Node.declare_options(options)
         end
 
-        OPTIONS_NEW = %i[url auth client_id client_secret scope redirect_uri private_key passphrase username password workspace].freeze
-
         def api_from_options(new_base_path)
           create_values = {subpath: new_base_path, secret_finder: config}
           # create an API object with the same options, but with a different subpath
@@ -317,8 +320,8 @@ module Aspera
             # client side is agent
             # server side is transfer server
             # in same workspace
-            push_pull = options.get_next_argument('direction', expected: %i[push pull])
-            source_folder = options.get_next_argument('folder of source files', type: String)
+            push_pull = options.get_next_argument('direction', accept_list: %i[push pull])
+            source_folder = options.get_next_argument('folder of source files', validation: String)
             case push_pull
             when :push
               client_direction = Transfer::Spec::DIRECTION_SEND
@@ -333,12 +336,12 @@ module Aspera
             client_apfid = top_node_api.resolve_api_fid(file_id, client_folder)
             server_apfid = top_node_api.resolve_api_fid(file_id, server_folder)
             # force node as transfer agent
-            transfer.agent_instance = Agent::Node.new({
+            transfer.agent_instance = Agent::Node.new(
               url:      client_apfid[:api].base_url,
               username: client_apfid[:api].app_info[:node_info]['access_key'],
-              password: client_apfid[:api].oauth_token,
+              password: client_apfid[:api].oauth.token,
               root_id:  client_apfid[:file_id]
-            })
+            )
             # additional node to node TS info
             add_ts = {
               'remote_access_key'   => server_apfid[:api].app_info[:node_info]['access_key'],
@@ -350,15 +353,106 @@ module Aspera
               client_direction,
               add_ts)))
           else Aspera.error_unreachable_line
-          end # command_repo
+          end
           Aspera.error_unreachable_line
-        end # execute_nodegen4_command
+        end
+
+        def execute_resource_action(resource_type)
+          # get path on API, resource type is singular, but api is plural
+          resource_class_path =
+            case resource_type
+            # special cases: singleton, in admin, with x
+            when :self, :organization then resource_type
+            when :client_registration_token, :client_access_key then "admin/#{resource_type}s"
+            when :application then 'admin/apps_new'
+            when :dropbox then "#{resource_type}es"
+            when :kms_profile then "integrations/#{resource_type}s"
+            else "#{resource_type}s"
+            end
+          # build list of supported operations
+          singleton_object = %i[self organization].include?(resource_type)
+          global_operations =  %i[create list]
+          supported_operations = %i[show modify]
+          supported_operations.push(:delete, *global_operations) unless singleton_object
+          supported_operations.push(:do) if resource_type.eql?(:node)
+          supported_operations.push(:set_pub_key) if resource_type.eql?(:client)
+          command = options.get_next_command(supported_operations)
+          # require identifier for non global commands
+          if !singleton_object && !global_operations.include?(command)
+            res_id = get_resource_id_from_args(resource_class_path)
+            resource_instance_path = "#{resource_class_path}/#{res_id}"
+          end
+          resource_instance_path = resource_class_path if singleton_object
+          case command
+          when :create
+            id_result = 'id'
+            id_result = 'token' if resource_class_path.eql?('admin/client_registration_tokens')
+            # TODO: report inconsistency: creation url is !=, and does not return id.
+            resource_class_path = 'admin/client_registration/token' if resource_class_path.eql?('admin/client_registration_tokens')
+            return do_bulk_operation(command: command, descr: 'creation data', id_result: id_result) do |params|
+              aoc_api.create(resource_class_path, params)[:data]
+            end
+          when :list
+            default_fields = ['id']
+            default_query = {}
+            case resource_type
+            when :application
+              default_query = {organization_apps: true}
+              default_fields.push('app_type', 'app_name', 'available', 'direct_authorizations_allowed', 'workspace_authorizations_allowed')
+            when :client, :client_access_key, :dropbox, :group, :package, :saml_configuration, :workspace then default_fields.push('name')
+            when :client_registration_token then default_fields.push('value', 'data.client_subject_scopes', 'created_at')
+            when :contact then default_fields = %w[email name source_id source_type]
+            when :node then default_fields.push('name', 'host', 'access_key')
+            when :operation then default_fields = nil
+            when :short_link then default_fields.push('short_url', 'data.url_token_data.purpose')
+            when :user then default_fields.push('name', 'email')
+            when :group_membership then default_fields.push(*%w[group_id member_type member_id])
+            when :workspace_membership then default_fields.push(*%w[workspace_id member_type member_id])
+            end
+            return result_list(resource_class_path, fields: default_fields, default_query: default_query)
+          when :show
+            object = aoc_api.read(resource_instance_path)[:data]
+            # default: show all, but certificate
+            fields = object.keys.reject{|k|k.eql?('certificate')}
+            return { type: :single_object, data: object, fields: fields }
+          when :modify
+            changes = options.get_next_argument('properties', validation: Hash)
+            return do_bulk_operation(command: command, descr: 'identifier', values: res_id) do |one_id|
+              aoc_api.update("#{resource_class_path}/#{one_id}", changes)
+              {'id' => one_id}
+            end
+          when :delete
+            return do_bulk_operation(command: command, descr: 'identifier', values: res_id) do |one_id|
+              aoc_api.delete("#{resource_class_path}/#{one_id}")
+              {'id' => one_id}
+            end
+          when :set_pub_key
+            # special : reads private and generate public
+            the_private_key = options.get_next_argument('private_key PEM value', validation: String)
+            the_public_key = OpenSSL::PKey::RSA.new(the_private_key).public_key.to_s
+            aoc_api.update(resource_instance_path, {jwt_grant_enabled: true, public_key: the_public_key})
+            return Main.result_success
+          when :do
+            command_repo = options.get_next_command(NODE4_EXT_COMMANDS)
+            # init context
+            aoc_api.context(:files)
+            return execute_nodegen4_command(command_repo, res_id)
+          else Aspera.error_unexpected_value(command)
+          end
+        end
+
+        ADMIN_ACTIONS = %i[ats resource usage_reports analytics subscription auth_providers].concat(ADMIN_OBJECTS).freeze
 
         def execute_admin_action
           # upgrade scope to admin
           aoc_api.oauth.scope = Api::AoC::SCOPE_FILES_ADMIN
-          command_admin = options.get_next_command(%i[ats resource usage_reports analytics subscription auth_providers])
+          command_admin = options.get_next_command(ADMIN_ACTIONS)
           case command_admin
+          when :resource
+            Log.log.warn('resource command is deprecated (4.18), directly use the specific command instead')
+            return execute_resource_action(options.get_next_argument('resource', accept_list: ADMIN_OBJECTS))
+          when *ADMIN_OBJECTS
+            return execute_resource_action(command_admin)
           when :auth_providers
             command_auth_prov = options.get_next_command(%i[list update])
             case command_auth_prov
@@ -441,7 +535,7 @@ module Aspera
               return {type: :object_list, data: events}
             when :transfers
               event_type = command_analytics.to_s
-              filter_resource = options.get_next_argument('resource', expected: %i[organizations users nodes])
+              filter_resource = options.get_next_argument('resource', accept_list: %i[organizations users nodes])
               filter_id = options.get_next_argument('identifier', mandatory: false) ||
                 case filter_resource
                 when :organizations then aoc_api.current_user_info['organization_id']
@@ -480,89 +574,6 @@ module Aspera
               end
               return {type: :object_list, data: events}
             end
-          when :resource
-            resource_type = options.get_next_argument('resource', expected: KNOWN_AOC_RES)
-            # get path on API, resource type is singular, but api is plural
-            resource_class_path =
-              case resource_type
-              # special cases: singleton, in admin, with x
-              when :self, :organization then resource_type
-              when :client_registration_token, :client_access_key then "admin/#{resource_type}s"
-              when :application then 'admin/apps_new'
-              when :dropbox then "#{resource_type}es"
-              when :kms_profile then "integrations/#{resource_type}s"
-              else "#{resource_type}s"
-              end
-            # build list of supported operations
-            singleton_object = %i[self organization].include?(resource_type)
-            global_operations =  %i[create list]
-            supported_operations = %i[show modify]
-            supported_operations.push(:delete, *global_operations) unless singleton_object
-            supported_operations.push(:do) if resource_type.eql?(:node)
-            supported_operations.push(:set_pub_key) if resource_type.eql?(:client)
-            command = options.get_next_command(supported_operations)
-            # require identifier for non global commands
-            if !singleton_object && !global_operations.include?(command)
-              res_id = get_resource_id_from_args(resource_class_path)
-              resource_instance_path = "#{resource_class_path}/#{res_id}"
-            end
-            resource_instance_path = resource_class_path if singleton_object
-            case command
-            when :create
-              id_result = 'id'
-              id_result = 'token' if resource_class_path.eql?('admin/client_registration_tokens')
-              # TODO: report inconsistency: creation url is !=, and does not return id.
-              resource_class_path = 'admin/client_registration/token' if resource_class_path.eql?('admin/client_registration_tokens')
-              return do_bulk_operation(command: command, descr: 'creation data', id_result: id_result) do |params|
-                aoc_api.create(resource_class_path, params)[:data]
-              end
-            when :list
-              default_fields = ['id']
-              default_query = {}
-              case resource_type
-              when :application
-                default_query = {organization_apps: true}
-                default_fields.push('app_type', 'app_name', 'available', 'direct_authorizations_allowed', 'workspace_authorizations_allowed')
-              when :client, :client_access_key, :dropbox, :group, :package, :saml_configuration, :workspace then default_fields.push('name')
-              when :client_registration_token then default_fields.push('value', 'data.client_subject_scopes', 'created_at')
-              when :contact then default_fields = %w[email name source_id source_type]
-              when :node then default_fields.push('name', 'host', 'access_key')
-              when :operation then default_fields = nil
-              when :short_link then default_fields.push('short_url', 'data.url_token_data.purpose')
-              when :user then default_fields.push('name', 'email')
-              when :group_membership then default_fields.push(*%w[group_id member_type member_id])
-              when :workspace_membership then default_fields.push(*%w[workspace_id member_type member_id])
-              end
-              return result_list(resource_class_path, fields: default_fields, default_query: default_query)
-            when :show
-              object = aoc_api.read(resource_instance_path)[:data]
-              # default: show all, but certificate
-              fields = object.keys.reject{|k|k.eql?('certificate')}
-              return { type: :single_object, data: object, fields: fields }
-            when :modify
-              changes = options.get_next_argument('properties', type: Hash)
-              return do_bulk_operation(command: command, descr: 'identifier', values: res_id) do |one_id|
-                aoc_api.update("#{resource_class_path}/#{one_id}", changes)
-                {'id' => one_id}
-              end
-            when :delete
-              return do_bulk_operation(command: command, descr: 'identifier', values: res_id) do |one_id|
-                aoc_api.delete("#{resource_class_path}/#{one_id}")
-                {'id' => one_id}
-              end
-            when :set_pub_key
-              # special : reads private and generate public
-              the_private_key = options.get_next_argument('private_key PEM value', type: String)
-              the_public_key = OpenSSL::PKey::RSA.new(the_private_key).public_key.to_s
-              aoc_api.update(resource_instance_path, {jwt_grant_enabled: true, public_key: the_public_key})
-              return Main.result_success
-            when :do
-              command_repo = options.get_next_command(NODE4_EXT_COMMANDS)
-              # init context
-              aoc_api.context(:files)
-              return execute_nodegen4_command(command_repo, res_id)
-            else Aspera.error_unexpected_value(command)
-            end
           when :usage_reports
             return result_list('usage_reports', base_query: {workspace_id: aoc_api.context(:files)[:workspace_id]})
           end
@@ -591,7 +602,7 @@ module Aspera
           when :servers
             return {type: :object_list, data: Rest.new(base_url: "#{Api::AoC.api_base_url}/#{Api::AoC::API_V1}").read('servers')[:data]}
           when :bearer_token
-            return {type: :text, data: aoc_api.oauth_token}
+            return {type: :text, data: aoc_api.oauth.token}
           when :organization
             return { type: :single_object, data: aoc_api.read('organization')[:data] }
           when :tier_restrictions
@@ -612,7 +623,7 @@ module Aspera
               when :show
                 return { type: :single_object, data: aoc_api.current_user_info(exception: true) }
               when :modify
-                aoc_api.update("users/#{aoc_api.current_user_info(exception: true)['id']}", options.get_next_argument('properties', type: Hash))
+                aoc_api.update("users/#{aoc_api.current_user_info(exception: true)['id']}", options.get_next_argument('properties', validation: Hash))
                 return Main.result_status('modified')
               end
             when :preferences
@@ -621,7 +632,7 @@ module Aspera
               when :show
                 return { type: :single_object, data: aoc_api.read(user_preferences_res)[:data] }
               when :modify
-                aoc_api.update(user_preferences_res, options.get_next_argument('properties', type: Hash))
+                aoc_api.update(user_preferences_res, options.get_next_argument('properties', validation: Hash))
                 return Main.result_status('modified')
               end
             end
@@ -680,13 +691,13 @@ module Aspera
                     ].concat(aoc_api.additional_persistence_ids)))
               end
               case ids_to_download
-              when ExtendedValue::ALL, ExtendedValue::INIT
+              when SpecialValues::ALL, SpecialValues::INIT
                 query = query_read_delete(default: PACKAGE_RECEIVED_BASE_QUERY)
                 Aspera.assert_type(query, Hash){'query'}
                 resolve_dropbox_name_default_ws_id(query)
                 # remove from list the ones already downloaded
                 all_ids = api_read_all('packages', query)[:data].map{|e|e['id']}
-                if ids_to_download.eql?(ExtendedValue::INIT)
+                if ids_to_download.eql?(SpecialValues::INIT)
                   Aspera.assert(skip_ids_persistency){'Only with option once_only'}
                   skip_ids_persistency.data.clear.concat(all_ids)
                   skip_ids_persistency.save
@@ -696,7 +707,7 @@ module Aspera
                 ids_to_download = all_ids.reject{|id|skip_ids_data.include?(id)}
               else
                 ids_to_download = [ids_to_download] unless ids_to_download.is_a?(Array)
-              end # ExtendedValue::ALL
+              end
               # list here
               result_transfer = []
               formatter.display_status("found #{ids_to_download.length} package(s).")
@@ -748,9 +759,9 @@ module Aspera
             when *NODE4_EXT_COMMANDS
               return execute_nodegen4_command(command_repo, aoc_api.context[:home_node_id], file_id: aoc_api.context[:home_file_id], scope: Api::Node::SCOPE_USER)
             when :short_link
-              link_type = options.get_next_argument('link type', expected: %i[public private])
+              link_type = options.get_next_argument('link type', accept_list: %i[public private])
               short_link_command = options.get_next_command(%i[create delete list])
-              folder_dest = options.get_next_argument('path', type: String)
+              folder_dest = options.get_next_argument('path', validation: String)
               home_node_api = aoc_api.node_api_from(
                 node_id:        aoc_api.context[:home_node_id],
                 workspace_id:   aoc_api.context[:workspace_id],
@@ -847,8 +858,8 @@ module Aspera
                   # TODO: event ?
                 end
                 return {type: :single_object, data: result_create_short_link}
-              end # short_link command
-            end # files command
+              end
+            end
             raise 'Error: shall not reach this line'
           when :automation
             Log.log.warn('BETA: work under progress')
@@ -891,7 +902,7 @@ module Aspera
             server.start
             return Main.result_status('Gateway terminated')
           else Aspera.error_unreachable_line
-          end # action
+          end
           Aspera.error_unreachable_line
         end
 

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

@@ -100,7 +100,7 @@ module Aspera
             return Main.result_status('modified')
           when :entitlement
             ak = ats_api_pub_v1.read("access_keys/#{access_key_id}")[:data]
-            api_bss = Api::AoC.metering_api(ak['license']['entitlement_id'], ak['license']['customer_id'])
+            api_bss = Api::Alee.new(ak['license']['entitlement_id'], ak['license']['customer_id'])
             return {type: :single_object, data: api_bss.read('entitlement')[:data]}
           when :delete
             ats_api_pub_v1.delete("access_keys/#{access_key_id}")