aspera-cli 4.24.1 → 4.25.0.pre

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

@@ -2,12 +2,12 @@
 
 require 'aspera/rest'
 require 'aspera/nagios'
-require 'aspera/cli/basic_auth_plugin'
+require 'aspera/cli/plugins/basic_auth'
 
 module Aspera
   module Cli
     module Plugins
-      class Faspio < BasicAuthPlugin
+      class Faspio < BasicAuth
         class << self
           def application_name
             'faspio Gateway'
@@ -15,33 +15,34 @@ module Aspera
 
           def detect(base_url)
             api = Rest.new(base_url: base_url)
-            ping_result = api.call(operation: 'GET', subpath: 'ping', headers: {'Accept' => Rest::MIME_JSON})
-            server_type = ping_result[:http]['Server']
-            return unless ping_result[:data].is_a?(Hash) && ping_result[:data].empty?
+            data, http = api.read('ping', ret: :both)
+            server_type = http['Server']
+            return unless data.is_a?(Hash) && data.empty?
             return unless server_type.is_a?(String) && server_type.include?('faspio')
             return {
               version: server_type.gsub(%r{^.*/}, ''),
               url:     base_url
             }
           end
+        end
 
-          # @param object [Plugin] An instance of this class
-          # @return [Hash] :preset_value, :test_args
-          def wizard(object:)
-            options = object.options
-            return {
-              preset_value: {
-                url: options.get_option(:url, mandatory: true)
-              },
-              test_args:    'info'
-            }
-          end
+        # @param wizard  [Wizard] The wizard object
+        # @param app_url [Wizard] The wizard object
+        # @return [Hash] :preset_value, :test_args
+        def wizard(wizard, app_url)
+          return {
+            preset_value: {
+              url: app_url
+            },
+            test_args:    'info'
+          }
         end
+
         ACTIONS = %i[health bridges].freeze
 
         def initialize(**_)
           super
-          options.declare(:auth, 'OAuth type of authentication', values: %i[jwt basic])
+          options.declare(:auth, 'OAuth type of authentication', allowed: %i[jwt basic])
           options.declare(:client_id, 'OAuth client identifier')
           options.declare(:private_key, 'OAuth JWT RSA private key PEM value (prefix file path with @file:)')
           options.declare(:passphrase, 'OAuth JWT RSA private key passphrase')
@@ -87,7 +88,7 @@ module Aspera
             rescue StandardError => e
               nagios.add_critical('api', e.to_s)
             end
-            return nagios.result
+            Main.result_object_list(nagios.status_list)
           when :bridges
             return entity_execute(api: api, entity: 'bridges')
           end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'aspera/cli/plugins/base'
 require 'aspera/rest'
 require 'aspera/api/httpgw'
 require 'aspera/nagios'
@@ -7,7 +8,7 @@ require 'aspera/nagios'
 module Aspera
   module Cli
     module Plugins
-      class Httpgw < Plugin
+      class Httpgw < Base
         class << self
           def application_name
             'HTTP Gateway'
@@ -22,18 +23,18 @@ module Aspera
             } if api_info.is_a?(Hash) && api_info.key?('download_endpoint')
             return
           end
+        end
 
-          # @param object [Plugin] An instance of this class
-          # @return [Hash] :preset_value, :test_args
-          def wizard(object:)
-            options = object.options
-            return {
-              preset_value: {
-                url: options.get_option(:url, mandatory: true)
-              },
-              test_args:    'info'
-            }
-          end
+        # @param wizard  [Wizard] The wizard object
+        # @param app_url [Wizard] The wizard object
+        # @return [Hash] :preset_value, :test_args
+        def wizard(wizard, app_url)
+          return {
+            preset_value: {
+              url: app_url
+            },
+            test_args:    'info'
+          }
         end
         ACTIONS = %i[health info].freeze
 
@@ -55,7 +56,7 @@ module Aspera
             rescue StandardError => e
               nagios.add_critical('api', e.to_s)
             end
-            return nagios.result
+            Main.result_object_list(nagios.status_list)
           when :info
             api_v1 = Api::Httpgw.new(url: base_url)
             return Main.result_single_object(api_v1.info)