aspera-cli 4.10.0 → 4.12.0

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

@@ -6,16 +6,16 @@ require 'aspera/nagios'
 module Aspera
   module Cli
     module Plugins
-      class Console < BasicAuthPlugin
+      class Console < Aspera::Cli::BasicAuthPlugin
         DEFAULT_FILTER_AGE_SECONDS = 3 * 3600
         private_constant :DEFAULT_FILTER_AGE_SECONDS
         def initialize(env)
           super(env)
-          options.add_opt_date(:filter_from,'only after date')
-          options.add_opt_date(:filter_to,'only before date')
+          options.add_opt_date(:filter_from, 'only after date')
+          options.add_opt_date(:filter_to, 'only before date')
           time_now = Time.now
-          options.set_option(:filter_from,Manager.time_to_string(time_now - DEFAULT_FILTER_AGE_SECONDS))
-          options.set_option(:filter_to,Manager.time_to_string(time_now))
+          options.set_option(:filter_from, Manager.time_to_string(time_now - DEFAULT_FILTER_AGE_SECONDS))
+          options.set_option(:filter_to, Manager.time_to_string(time_now))
           options.parse_options!
         end
 
@@ -29,9 +29,9 @@ module Aspera
             nagios = Nagios.new
             begin
               api_console.read('ssh_keys')
-              nagios.add_ok('console api','accessible')
+              nagios.add_ok('console api', 'accessible')
             rescue StandardError => e
-              nagios.add_critical('console api',e.to_s)
+              nagios.add_critical('console api', e.to_s)
             end
             return nagios.result
           when :transfer
@@ -41,11 +41,11 @@ module Aspera
               command = options.get_next_command(%i[list submit])
               case command
               when :list
-                return {type: :object_list,data: api_console.read('smart_transfers')[:data]}
+                return {type: :object_list, data: api_console.read('smart_transfers')[:data]}
               when :submit
                 smart_id = options.get_next_argument('smart_id')
                 params = options.get_next_argument('transfer parameters')
-                return {type: :object_list,data: api_console.create('smart_transfers/' + smart_id,params)[:data]}
+                return {type: :object_list, data: api_console.create('smart_transfers/' + smart_id, params)[:data]}
               end
             when :current
               command = options.get_next_command([:list])
@@ -53,9 +53,9 @@ module Aspera
               when :list
                 return {
                   type:   :object_list,
-                  data:   api_console.read('transfers',{
-                    'from' => options.get_option(:filter_from,is_type: :mandatory),
-                    'to'   => options.get_option(:filter_to,is_type: :mandatory)
+                  data:   api_console.read('transfers', {
+                    'from' => options.get_option(:filter_from, is_type: :mandatory),
+                    'to'   => options.get_option(:filter_to, is_type: :mandatory)
                   })[:data],
                   fields: %w[id contact name status]}
               end

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

@@ -7,18 +7,18 @@ require 'aspera/cos_node'
 module Aspera
   module Cli
     module Plugins
-      class Cos < Plugin
+      class Cos < Aspera::Cli::Plugin
         def initialize(env)
           super(env)
           @service_creds = nil
-          options.add_opt_simple(:bucket,'Bucket name')
-          options.add_opt_simple(:endpoint,'Storage endpoint url')
-          options.add_opt_simple(:apikey,'Storage API key')
-          options.add_opt_simple(:crn,'Ressource instance id')
-          options.add_opt_simple(:service_credentials,'IBM Cloud service credentials (Hash)')
-          options.add_opt_simple(:region,'Storage region')
-          options.add_opt_simple(:identity,"Authentication url (#{CosNode::IBM_CLOUD_TOKEN_URL})")
-          options.set_option(:identity,CosNode::IBM_CLOUD_TOKEN_URL)
+          options.add_opt_simple(:bucket, 'Bucket name')
+          options.add_opt_simple(:endpoint, 'Storage endpoint url')
+          options.add_opt_simple(:apikey, 'Storage API key')
+          options.add_opt_simple(:crn, 'Resource instance id')
+          options.add_opt_simple(:service_credentials, 'IBM Cloud service credentials (Hash)')
+          options.add_opt_simple(:region, 'Storage region')
+          options.add_opt_simple(:identity, "Authentication url (#{CosNode::IBM_CLOUD_TOKEN_URL})")
+          options.set_option(:identity, CosNode::IBM_CLOUD_TOKEN_URL)
           options.parse_options!
         end
 
@@ -28,26 +28,24 @@ module Aspera
           command = options.get_next_command(ACTIONS)
           case command
           when :node
-            bucket_name = options.get_option(:bucket,is_type: :mandatory)
+            bucket_name = options.get_option(:bucket, is_type: :mandatory)
             # get service credentials, Hash, e.g. @json:@file:...
             service_credentials = options.get_option(:service_credentials)
             storage_endpoint = options.get_option(:endpoint)
-            raise CliBadArgument,'one of: endpoint or service_credentials is required' if service_credentials.nil? && storage_endpoint.nil?
-            raise CliBadArgument,'endpoint and service_credentials are mutually exclusive' unless service_credentials.nil? || storage_endpoint.nil?
+            raise CliBadArgument, 'one of: endpoint or service_credentials is required' if service_credentials.nil? && storage_endpoint.nil?
+            raise CliBadArgument, 'endpoint and service_credentials are mutually exclusive' unless service_credentials.nil? || storage_endpoint.nil?
             if service_credentials.nil?
-              service_api_key = options.get_option(:apikey,is_type: :mandatory)
-              instance_id = options.get_option(:crn,is_type: :mandatory)
+              service_api_key = options.get_option(:apikey, is_type: :mandatory)
+              instance_id = options.get_option(:crn, is_type: :mandatory)
             else
-              params=CosNode.parameters_from_svc_creds(service_credentials,options.get_option(:region,is_type: :mandatory))
+              params = CosNode.parameters_from_svc_creds(service_credentials, options.get_option(:region, is_type: :mandatory))
               storage_endpoint = params[:storage_endpoint]
               service_api_key = params[:service_api_key]
               instance_id = params[:instance_id]
             end
-            api_node = CosNode.new(bucket_name,storage_endpoint,instance_id,service_api_key,options.get_option(:identity,is_type: :mandatory))
-            #command=self.options.get_next_command(Node::ACTIONS)
-            #command=self.options.get_next_command(Node::COMMON_ACTIONS)
-            command = options.get_next_command(%i[upload download info access_key api_details transfer])
-            node_plugin = Node.new(@agents.merge(skip_basic_auth_options: true, node_api: api_node, add_request_param: api_node.add_ts))
+            api_node = CosNode.new(bucket_name, storage_endpoint, instance_id, service_api_key, options.get_option(:identity, is_type: :mandatory))
+            node_plugin = Node.new(@agents.merge(skip_basic_auth_options: true, node_api: api_node))
+            command = options.get_next_command(Node::COMMANDS_COS)
             return node_plugin.execute_action(command)
           end
         end