aspera-cli 4.14.0 → 4.16.0

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

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+# cspell:ignore trustpolicy
+
 require 'aspera/cli/plugins/node'
 require 'aspera/ats_api'
+require 'aspera/assert'
 
 module Aspera
   module Cli
@@ -9,6 +12,7 @@ module Aspera
       # Access Aspera Transfer Service
       # https://developer.ibm.com/aspera/docs/ats-api-reference/creating-ats-api-keys/
       class Ats < Aspera::Cli::Plugin
+        CLOUD_TABLE = %w[id name].freeze
         def initialize(env)
           super(env)
           options.declare(:ibm_api_key, 'IBM API key, see https://cloud.ibm.com/iam/apikeys')
@@ -89,7 +93,7 @@ module Aspera
             res = ats_api_pub_v1.read("access_keys/#{access_key_id}")
             return {type: :single_object, data: res[:data]}
           when :modify
-            params = value_create_modify(command: command, type: Hash)
+            params = value_create_modify(command: command)
             params['id'] = access_key_id
             ats_api_pub_v1.update("access_keys/#{access_key_id}", params)
             return Main.result_status('modified')
@@ -103,7 +107,7 @@ module Aspera
           when :node
             ak_data = ats_api_pub_v1.read("access_keys/#{access_key_id}")[:data]
             server_data = @ats_api_pub.all_servers.find {|i| i['id'].start_with?(ak_data['transfer_server_id'])}
-            raise CliError, 'no such server found' if server_data.nil?
+            raise Cli::Error, 'no such server found' if server_data.nil?
             node_url = server_data['transfer_setup_url']
             api_node = Aspera::Node.new(params: {
               base_url: node_url,
@@ -113,7 +117,7 @@ module Aspera
                 password: @agents[:config].lookup_secret(url: node_url, username: access_key_id)
               }})
             command = options.get_next_command(Node::COMMANDS_GEN4)
-            return Node.new(@agents.merge(skip_basic_auth_options: true, node_api: api_node)).execute_command_gen4(command, ak_data['root_file_id'])
+            return Node.new(@agents, 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 = {
@@ -125,7 +129,7 @@ module Aspera
               }}
             api_ak_auth = Rest.new(rest_params)
             return {type: :single_object, data: api_ak_auth.read('servers')[:data]}
-          else raise 'INTERNAL ERROR'
+          else error_unreachable_line
           end
         end
 
@@ -133,7 +137,7 @@ module Aspera
           command = options.get_next_command(%i[clouds list show])
           case command
           when :clouds
-            return {type: :single_object, data: @ats_api_pub.cloud_names, columns: %w[id name]}
+            return {type: :object_list, data: @ats_api_pub.cloud_names.map { |k, v| CLOUD_TABLE.zip([k, v]).to_h }}
           when :list
             return {type: :object_list, data: @ats_api_pub.all_servers, fields: %w[id cloud region]}
           when :show
@@ -186,7 +190,7 @@ module Aspera
             Log.log.warn{"more instances remaining: #{instances['remaining']}"} unless instances['remaining'].to_i.eql?(0)
             return {type: :value_list, data: instances['data'], name: 'instance'}
           when :create
-            created_key = ats_ibm_api.create('api_keys', value_create_modify(command: command, default: {}, type: Hash))[:data]
+            created_key = ats_ibm_api.create('api_keys', value_create_modify(command: command, default: {}))[:data]
             return {type: :single_object, data: created_key}
           when :list # list known api keys in ATS (this require an api_key ...)
             res = ats_ibm_api.read('api_keys', {'offset' => 0, 'max_results' => 1000})
@@ -197,7 +201,7 @@ module Aspera
           when :delete
             ats_ibm_api.delete("api_keys/#{concerned_id}")
             return Main.result_status("deleted #{concerned_id}")
-          else raise 'INTERNAL ERROR'
+          else error_unreachable_line
           end
         end
 
@@ -221,7 +225,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 raise 'ERROR'
+          else error_unexpected_value(command)
           end
         end
 

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

@@ -48,8 +48,8 @@ module Aspera
               id = instance_identifier
               request = {
                 'variables' => {'id' => id},
-                'query'     => "query($id: ID!) {#{object}(id: $id) { #{all_fields('bssSubscriptions')} roleAssignments(uniqueSubjectId: true) { id subjectId } "\
-                  'instances { id state planId serviceId ssmSubscriptionId entitlement { id } aocOrganization { id subdomainName name status tier urlId trialExpiresAt '\
+                'query'     => "query($id: ID!) {#{object}(id: $id) { #{all_fields('bssSubscriptions')} roleAssignments(uniqueSubjectId: true) { id subjectId } " \
+                  'instances { id state planId serviceId ssmSubscriptionId entitlement { id } aocOrganization { id subdomainName name status tier urlId trialExpiresAt ' \
                   'users(organizationAdmin: true) { id name email atsAdmin subscriptionAdmin } } } } }'
               }
               result = @api_bss.create('graphql', request)[:data]['data'][object].first