aspera-cli 4.19.0 → 4.21.1

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

@@ -5,6 +5,7 @@
 require 'aspera/cli/plugins/node'
 require 'aspera/api/ats'
 require 'aspera/api/aoc'
+require 'aspera/api/alee'
 require 'aspera/assert'
 
 module Aspera
@@ -24,13 +25,14 @@ module Aspera
           options.declare(:cloud, 'Cloud provider')
           options.declare(:region, 'Cloud region')
           options.parse_options!
+          Node.declare_options(options)
         end
 
         def server_by_cloud_region
           # TODO: provide list ?
           cloud = options.get_option(:cloud, mandatory: true).upcase
           region = options.get_option(:region, mandatory: true)
-          return @ats_api_pub.read("servers/#{cloud}/#{region}")[:data]
+          return @ats_api_pub.read("servers/#{cloud}/#{region}")
         end
 
         # require api key only if needed
@@ -84,29 +86,29 @@ module Aspera
               end
             end
             res = ats_api_pub_v1.create('access_keys', params)
-            return {type: :single_object, data: res[:data]}
+            return {type: :single_object, data: res}
             # TODO : action : modify, with "PUT"
           when :list
             params = options.get_option(:params) || {'offset' => 0, 'max_results' => 1000}
             res = ats_api_pub_v1.read('access_keys', params)
-            return {type: :object_list, data: res[:data]['data'], fields: ['name', 'id', 'created.at', 'modified.at']}
+            return {type: :object_list, data: res['data'], fields: ['name', 'id', 'created.at', 'modified.at']}
           when :show
             res = ats_api_pub_v1.read("access_keys/#{access_key_id}")
-            return {type: :single_object, data: res[:data]}
+            return {type: :single_object, data: res}
           when :modify
             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')
           when :entitlement
-            ak = ats_api_pub_v1.read("access_keys/#{access_key_id}")[:data]
+            ak = ats_api_pub_v1.read("access_keys/#{access_key_id}")
             api_bss = Api::Alee.new(ak['license']['entitlement_id'], ak['license']['customer_id'])
-            return {type: :single_object, data: api_bss.read('entitlement')[:data]}
+            return {type: :single_object, data: api_bss.read('entitlement')}
           when :delete
             ats_api_pub_v1.delete("access_keys/#{access_key_id}")
             return Main.result_status("deleted #{access_key_id}")
           when :node
-            ak_data = ats_api_pub_v1.read("access_keys/#{access_key_id}")[:data]
+            ak_data = ats_api_pub_v1.read("access_keys/#{access_key_id}")
             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']
@@ -128,7 +130,7 @@ module Aspera
                 username: access_key_id,
                 password: config.lookup_secret(url: ats_url, username: access_key_id)
               })
-            return {type: :single_object, data: api_ak_auth.read('servers')[:data]}
+            return {type: :single_object, data: api_ak_auth.read('servers')}
           else Aspera.error_unexpected_value(command)
           end
         end
@@ -177,7 +179,7 @@ module Aspera
             instance = options.get_option(:instance)
             if instance.nil?
               # Take the first Aspera on Cloud transfer service instance ID if not provided by user
-              instance = ats_api_v2_auth_ibm.read('instances')[:data]['data'].first
+              instance = ats_api_v2_auth_ibm.read('instances')['data'].first
               formatter.display_status("using first instance: #{instance}")
             end
             rest_add_header = {'X-ATS-Service-Instance-Id' => instance}
@@ -185,18 +187,18 @@ module Aspera
           ats_ibm_api = ats_api_v2_auth_ibm(rest_add_header)
           case command
           when :instances
-            instances = ats_ibm_api.read('instances')[:data]
+            instances = ats_ibm_api.read('instances')
             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: {}))[:data]
+            created_key = ats_ibm_api.create('api_keys', value_create_modify(command: command, default: {}))
             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})
-            return {type: :value_list, data: res[:data]['data'], name: 'ats_id'}
+            return {type: :value_list, data: res['data'], name: 'ats_id'}
           when :show # show one of api_key in ATS
             res = ats_ibm_api.read("api_keys/#{concerned_id}")
-            return {type: :single_object, data: res[:data]}
+            return {type: :single_object, data: res}
           when :delete
             ats_ibm_api.delete("api_keys/#{concerned_id}")
             return Main.result_status("deleted #{concerned_id}")
@@ -222,7 +224,7 @@ module Aspera
           when :api_key # manage credential to access ATS API
             return execute_action_api_key
           when :aws_trust_policy
-            res = ats_api_pub_v1.read('aws/trustpolicy', {region: options.get_option(:region, mandatory: true)})[:data]
+            res = ats_api_pub_v1.read('aws/trustpolicy', {region: options.get_option(:region, mandatory: true)})
             return {type: :single_object, data: res}
           else Aspera.error_unexpected_value(command)
           end