aspera-cli 4.2.1 → 4.5.0

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

@@ -44,9 +44,7 @@ module Aspera
           commands=[:create,:list,:show,:modify,:delete,:node,:cluster,:entitlement]
           command=self.options.get_next_command(commands)
           # those dont require access key id
-          unless [:create,:list].include?(command)
-            access_key_id=self.options.get_option(:id,:mandatory)
-          end
+          access_key_id=self.instance_identifier() unless [:create,:list].include?(command)
           case command
           when :create
             params=self.options.get_option(:params,:optional) || {}
@@ -102,21 +100,24 @@ module Aspera
             ak_data=ats_api_pub_v1.read("access_keys/#{access_key_id}")[:data]
             server_data=@ats_api_pub.all_servers.select {|i| i['id'].start_with?(ak_data['transfer_server_id'])}.first
             raise CliError,"no such server found" if server_data.nil?
+            base_url=server_data['transfer_setup_url']
             api_node=Rest.new({
-              :base_url => server_data['transfer_setup_url'],
+              :base_url => base_url,
               :auth     => {
               :type     => :basic,
               :username => access_key_id,
-              :password => @agents[:secret].get_secret(access_key_id)}})
+              :password => @agents[:config].get_secret(url: base_url,username: access_key_id)
+              }})
             command=self.options.get_next_command(Node::COMMON_ACTIONS)
             return Node.new(@agents.merge(skip_basic_auth_options: true, node_api: api_node)).execute_action(command)
           when :cluster
+            base_url=ats_api_pub_v1.params[:base_url]
             rest_params={
-              :base_url => ats_api_pub_v1.params[:base_url],
+              :base_url => base_url,
               :auth     => {
               :type     => :basic,
               :username => access_key_id,
-              :password => @agents[:secret].get_secret(access_key_id)
+              :password => @agents[:config].get_secret(url: base_url, username: access_key_id)
               }}
             api_ak_auth=Rest.new(rest_params)
             return {:type=>:single_object, :data=>api_ak_auth.read("servers")[:data]}
@@ -132,10 +133,10 @@ module Aspera
           when :list
             return {:type=>:object_list, :data=>@ats_api_pub.all_servers, :fields=>['id','cloud','region']}
           when :show
-            server_id=self.options.get_option(:id,:optional)
-            if server_id.nil?
+            if self.options.get_option(:cloud,:optional) or self.options.get_option(:region,:optional)
               server_data=server_by_cloud_region
             else
+              server_id=instance_identifier()
               server_data=@ats_api_pub.all_servers.select {|i| i['id'].eql?(server_id)}.first
               raise "no such server id" if server_data.nil?
             end
@@ -160,7 +161,7 @@ module Aspera
         def execute_action_api_key
           command=self.options.get_next_command([:instances, :create, :list, :show, :delete])
           if [:show,:delete].include?(command)
-            concerned_id=self.options.get_option(:id,:mandatory)
+            concerned_id=self.instance_identifier()
           end
           rest_add_header={}
           if !command.eql?(:instances)

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

@@ -46,7 +46,7 @@ module Aspera
               # give fields to keep order
               return {:type=>:object_list, :data=>result['data'][object],:fields=> FIELDS['bssSubscriptions']}
             when :show
-              id = self.options.get_option(:id,:mandatory)
+              id = self.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 users(organizationAdmin: true) { id name email atsAdmin subscriptionAdmin } } } } }"
@@ -55,7 +55,7 @@ module Aspera
               result.delete('instances')
               return {:type=>:single_object, :data=>result}
             when :instances
-              id = self.options.get_option(:id,:mandatory)
+              id = self.instance_identifier()
               request={
                 'variables'=>{'id'=>id},
                 'query'=>"query($id: ID!) {#{object}(id: $id) { aocOrganization { id subdomainName name status tier urlId trialExpiresAt } } } }"