aspera-cli 4.16.0 → 4.17.0

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

@@ -3,7 +3,8 @@
 # cspell:ignore trustpolicy
 
 require 'aspera/cli/plugins/node'
-require 'aspera/ats_api'
+require 'aspera/api/ats'
+require 'aspera/api/aoc'
 require 'aspera/assert'
 
 module Aspera
@@ -11,10 +12,10 @@ module Aspera
     module Plugins
       # Access Aspera Transfer Service
       # https://developer.ibm.com/aspera/docs/ats-api-reference/creating-ats-api-keys/
-      class Ats < Aspera::Cli::Plugin
+      class Ats < Cli::Plugin
         CLOUD_TABLE = %w[id name].freeze
-        def initialize(env)
-          super(env)
+        def initialize(**env)
+          super
           options.declare(:ibm_api_key, 'IBM API key, see https://cloud.ibm.com/iam/apikeys')
           options.declare(:instance, 'ATS instance in ibm cloud')
           options.declare(:ats_key, 'ATS key identifier (ats_xxx)')
@@ -35,13 +36,13 @@ module Aspera
         # require api key only if needed
         def ats_api_pub_v1
           return @ats_api_pub_v1_cache unless @ats_api_pub_v1_cache.nil?
-          @ats_api_pub_v1_cache = Rest.new({
-            base_url: AtsApi.base_url + '/pub/v1',
+          @ats_api_pub_v1_cache = Rest.new(
+            base_url: "#{Api::Ats::SERVICE_BASE_URL}/pub/v1",
             auth:     {
               type:     :basic,
               username: options.get_option(:ats_key, mandatory: true),
               password: options.get_option(:ats_secret, mandatory: true)}
-          })
+          )
         end
 
         def execute_action_access_key
@@ -99,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 = AoC.metering_api(ak['license']['entitlement_id'], ak['license']['customer_id'])
+            api_bss = Api::AoC.metering_api(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}")
@@ -109,27 +110,26 @@ module Aspera
             server_data = @ats_api_pub.all_servers.find {|i| i['id'].start_with?(ak_data['transfer_server_id'])}
             raise Cli::Error, 'no such server found' if server_data.nil?
             node_url = server_data['transfer_setup_url']
-            api_node = Aspera::Node.new(params: {
+            api_node = Api::Node.new(
               base_url: node_url,
               auth:     {
                 type:     :basic,
                 username: access_key_id,
-                password: @agents[:config].lookup_secret(url: node_url, username: access_key_id)
-              }})
+                password: config.lookup_secret(url: node_url, username: access_key_id)
+              })
             command = options.get_next_command(Node::COMMANDS_GEN4)
-            return Node.new(@agents, api: api_node).execute_command_gen4(command, ak_data['root_file_id'])
+            return Node.new(**init_params, api: api_node).execute_command_gen4(command, ak_data['root_file_id'])
           when :cluster
-            ats_url = ats_api_pub_v1.params[:base_url]
-            rest_params = {
+            ats_url = ats_api_pub_v1.base_url
+            api_ak_auth = Rest.new(
               base_url: ats_url,
               auth:     {
                 type:     :basic,
                 username: access_key_id,
-                password: @agents[:config].lookup_secret(url: ats_url, username: access_key_id)
-              }}
-            api_ak_auth = Rest.new(rest_params)
+                password: config.lookup_secret(url: ats_url, username: access_key_id)
+              })
             return {type: :single_object, data: api_ak_auth.read('servers')[:data]}
-          else error_unreachable_line
+          else Aspera.error_unexpected_value(command)
           end
         end
 
@@ -153,19 +153,18 @@ module Aspera
         end
 
         def ats_api_v2_auth_ibm(rest_add_headers={})
-          return Rest.new({
-            base_url: AtsApi.base_url + '/v2',
+          return Rest.new(
+            base_url: "#{Api::Ats::SERVICE_BASE_URL}/v2",
             headers:  rest_add_headers,
             auth:     {
-              type:         :oauth2,
-              base_url:     'https://iam.bluemix.net/identity',
+              type:          :oauth2,
+              grant_method:  :generic,
+              base_url:      'https://iam.bluemix.net/identity',
               # does not work:  base_url:    'https://iam.cloud.ibm.com/identity',
-              grant_method: :generic,
-              generic:      {
-                grant_type:    'urn:ibm:params:oauth:grant-type:apikey',
-                response_type: 'cloud_iam',
-                apikey:        options.get_option(:ibm_api_key, mandatory: true)
-              }}})
+              grant_type:    'urn:ibm:params:oauth:grant-type:apikey',
+              response_type: 'cloud_iam',
+              apikey:        options.get_option(:ibm_api_key, mandatory: true)
+            })
         end
 
         def execute_action_api_key
@@ -201,7 +200,7 @@ module Aspera
           when :delete
             ats_ibm_api.delete("api_keys/#{concerned_id}")
             return Main.result_status("deleted #{concerned_id}")
-          else error_unreachable_line
+          else Aspera.error_unexpected_value(command)
           end
         end
 
@@ -214,7 +213,7 @@ module Aspera
           command = options.get_next_command(actions)
           @ats_api_pub_v1_cache = ats_api_arg
           # keep as member variable as we may want to use the api in AoC name space
-          @ats_api_pub = AtsApi.new
+          @ats_api_pub = Api::Ats.new
           case command
           when :cluster # display general ATS cluster information, this uses public API, no auth
             return execute_action_cluster_pub
@@ -225,7 +224,7 @@ module Aspera
           when :aws_trust_policy
             res = ats_api_pub_v1.read('aws/trustpolicy', {region: options.get_option(:region, mandatory: true)})[:data]
             return {type: :single_object, data: res}
-          else error_unexpected_value(command)
+          else Aspera.error_unexpected_value(command)
           end
         end
 
@@ -235,5 +234,5 @@ module Aspera
         end
       end
     end
-  end # Cli
-end # Aspera
+  end
+end

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

@@ -5,16 +5,15 @@ require 'aspera/rest'
 module Aspera
   module Cli
     module Plugins
-      class Bss < Aspera::Cli::BasicAuthPlugin
+      class Bss < Cli::BasicAuthPlugin
         ACTIONS = %i[subscription].freeze
 
         FIELDS = {
           'bssSubscriptions' => %w[id name termVolumeGb termMonths trial startDate endDate plan renewalType chargeAgreementNumber customerName]
         }.freeze
 
-        def initialize(env)
-          super(env)
-          @api_bss = env[:bss_api] if env.key?(:bss_api)
+        def initialize(**env)
+          super
         end
 
         def all_fields(name)