aspera-cli 4.22.0 → 4.24.0

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

@@ -19,6 +19,8 @@ module Aspera
         private_constant :CLOUD_TABLE
         def initialize(**_)
           super
+          @ats_api_pub = nil
+          @ats_api_pub_v1_cache = nil
           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)')
@@ -45,7 +47,8 @@ module Aspera
             auth:     {
               type:     :basic,
               username: options.get_option(:ats_key, mandatory: true),
-              password: options.get_option(:ats_secret, mandatory: true)}
+              password: options.get_option(:ats_secret, mandatory: true)
+            }
           )
         end
 
@@ -82,9 +85,7 @@ module Aspera
                   # specific one do not have s3 end point in id
                   params['transfer_server_id'] = server_data2['id']
                 end
-                if !params['storage'].key?('authentication_endpoint')
-                  params['storage']['endpoint'] = server_data2['s3_authentication_endpoint']
-                end
+                params['storage']['endpoint'] = server_data2['s3_authentication_endpoint'] if !params['storage'].key?('authentication_endpoint')
               end
             end
             res = ats_api_pub_v1.create('access_keys', params)
@@ -120,9 +121,10 @@ module Aspera
                 type:     :basic,
                 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(**init_params, api: api_node).execute_command_gen4(command, ak_data['root_file_id'])
+            return Node.new(context: context, api: api_node).execute_command_gen4(command, ak_data['root_file_id'])
           when :cluster
             ats_url = ats_api_pub_v1.base_url
             api_ak_auth = Rest.new(
@@ -131,7 +133,8 @@ module Aspera
                 type:     :basic,
                 username: access_key_id,
                 password: config.lookup_secret(url: ats_url, username: access_key_id)
-              })
+              }
+            )
             return Main.result_single_object(api_ak_auth.read('servers'))
           else Aspera.error_unexpected_value(command)
           end
@@ -150,13 +153,13 @@ module Aspera
             else
               server_id = instance_identifier
               server_data = @ats_api_pub.all_servers.find{ |i| i['id'].eql?(server_id)}
-              raise 'no such server id' if server_data.nil?
+              raise BadIdentifier.new('server', server_id) if server_data.nil?
             end
             return Main.result_single_object(server_data)
           end
         end
 
-        def ats_api_v2_auth_ibm(rest_add_headers={})
+        def ats_api_v2_auth_ibm(rest_add_headers = {})
           return Rest.new(
             base_url: "#{Api::Ats::SERVICE_BASE_URL}/v2",
             headers:  rest_add_headers,
@@ -168,14 +171,13 @@ module Aspera
               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
           command = options.get_next_command(%i[instances create list show delete])
-          if %i[show delete].include?(command)
-            concerned_id = instance_identifier
-          end
+          concerned_id = instance_identifier if %i[show delete].include?(command)
           rest_add_header = {}
           if !command.eql?(:instances)
             instance = options.get_option(:instance)