aspera-cli 4.27.2 → 4.27.4

data/lib/aspera/schema/IBM_Aspera_Shares.yaml

@@ -2930,21 +2930,25 @@ components:
         name:
           type: string
           minLength: 1
-        description:
-          type: string
         node_id:
           type: integer
-        path:
+        directory:
           type: string
+          description: Path of share folder on node
+        create_directory:
+          type: boolean
+          description: Create the share folder on node
     ShareUpdate:
       type: object
       properties:
         name:
           type: string
-        description:
-          type: string
-        path:
+        node_id:
+          type: integer
+          description: Admin only
+        directory:
           type: string
+          description: Path of share folder on node (admin only)
     # Node Schemas
     Node:
       type: object
@@ -3206,9 +3210,10 @@ components:
         name:
           type: string
           example: engineers
-        description:
-          type: string
-          nullable: true
+        group_id:
+          type: integer
+          format: int32
+          description: Identifier in groups from all sources
         created_at:
           type: string
           format: date-time
@@ -3224,16 +3229,12 @@ components:
         name:
           type: string
           example: engineers
-        description:
-          type: string
     LocalGroupUpdate:
       type: object
       properties:
         name:
           type: string
           example: engineers
-        description:
-          type: string
     LdapConfig:
       type: object
       properties:

data/lib/aspera/schema/documentation.rb

@@ -114,9 +114,9 @@ module Aspera
           end
           # Only keep lines that are usable in supported agents
           next if agents.empty?
-          item['description'].push("Allowed values: #{node['enum'].map { |v| @formatter.markdown_text("`#{v}`") }.join(', ')}.") if node.key?('enum')
-          item['description'].push("Default: #{@formatter.markdown_text("`#{node['default']}`")}.") if node.key?('default')
-          item['description'].push("Example: #{@formatter.markdown_text("`#{node['example']}`")}.") if node.key?('example')
+          item['description'].push("Allowed values: #{node['enum'].map { |v| value_text(v) }.join(', ')}.") if node.key?('enum')
+          item['description'].push("Default: #{value_text(node['default'])}.") if node.key?('default')
+          item['description'].push("Example: #{value_text(node['example'])}.") if node.key?('example')
           if @include_option
             envvar_prefix = ''
             cli_option =
@@ -139,6 +139,16 @@ module Aspera
         end
         self
       end
+
+      private
+
+      # Format a schema value (enum, default, example) as code
+      # @param value [Object] value from schema, `nil` for JSON `null`
+      # @return [String]
+      def value_text(value)
+        return @formatter.special_format('null') if value.nil?
+        @formatter.markdown_text("`#{value}`")
+      end
     end
   end
 end

data/lib/aspera/schema/reader.rb

@@ -116,15 +116,12 @@ module Aspera
           # Yield current property to block
           yield(property_schema, name, property_full_name)
 
-          # Recursively process nested structures
-          case node['type']
-          when 'object'
-            property_schema.each_property("#{property_full_name}.", on_variant: on_variant, &block) if node['properties']
-          when 'array'
-            if node['items']
-              array_item_schema = property_schema.dig('items')
-              array_item_schema.each_property("#{property_full_name}[].", on_variant: on_variant, &block) if array_item_schema.current['properties']
-            end
+          # Recursively process nested structures (`type` is a list for a nullable value, e.g. `[array, 'null']`)
+          types = Array(node['type'])
+          property_schema.each_property("#{property_full_name}.", on_variant: on_variant, &block) if types.include?('object') && node['properties']
+          if types.include?('array') && node['items']
+            array_item_schema = property_schema.dig('items')
+            array_item_schema.each_property("#{property_full_name}[].", on_variant: on_variant, &block) if array_item_schema.current['properties']
           end
           # allOf without explicit type: object — recurse to merge all branches
           property_schema.each_property("#{property_full_name}.", on_variant: on_variant, &block) if node['allOf']
@@ -180,15 +177,12 @@ module Aspera
           row['default'] = node['default'] if node.key?('default')
           row['enum']    = node['enum']    if node.key?('enum')
           rows << row
-          # Recurse into nested object or array-of-objects
-          case node['type']
-          when 'object'
-            collect_rows(rows, prop_reader, "#{full_name}.") if node['properties']
-          when 'array'
-            if node['items']
-              item_reader = prop_reader.dig('items')
-              collect_rows(rows, item_reader, "#{full_name}[].") if item_reader.current['properties']
-            end
+          # Recurse into nested object or array-of-objects (`type` is a list for a nullable value)
+          types = Array(node['type'])
+          collect_rows(rows, prop_reader, "#{full_name}.") if types.include?('object') && node['properties']
+          if types.include?('array') && node['items']
+            item_reader = prop_reader.dig('items')
+            collect_rows(rows, item_reader, "#{full_name}[].") if item_reader.current['properties']
           end
           collect_rows(rows, prop_reader, "#{full_name}.") if node['allOf']
         end

data/lib/aspera/schema/registry.rb

@@ -18,6 +18,12 @@ module Aspera
           LOCATIONS.key?(sym)
         end
 
+        # @param name_path [String] schema path, e.g. `opts:components.schemas.HttpOptions`
+        # @return [Boolean] `true` if schema is owned by ascli (not a vendor API)
+        def owned?(name_path)
+          OWNED.include?(name_path.split(':', 2).first.to_sym)
+        end
+
         # Split a component string into registry key and optional path prefix.
         # Syntax: 'key' or 'key+/prefix' (e.g. 'shares+/api/v1')
         # @param component [String] registry key with optional '+/prefix'
@@ -52,27 +58,39 @@ module Aspera
         args:         'aspera/sync/args.schema.yaml',
         conf:         'aspera/sync/conf.schema.yaml',
         opts:         'aspera/cli/options.schema.yaml',
+        preview:      'aspera/preview/options.schema.yaml',
         aoc:          'aspera/schema/IBM Aspera on Cloud API-0.2.6-enhanced.yaml',
+        automation:   'aspera/schema/IBM Aspera on Cloud Automation API-1.0.5-enhanced.yaml',
         faspex:       'aspera/schema/IBM Aspera Faspex API-5.0-enhanced.yaml',
         faspio:       'aspera/schema/IBM Aspera faspio Gateway API-1.0.0.yaml',
+        console:      'aspera/schema/IBM Aspera Console-enhanced.yaml',
         node:         'aspera/schema/IBM Aspera Node API-4.4.6.yaml',
         shares:       'aspera/schema/IBM_Aspera_Shares.yaml',
+        orchestrator: 'aspera/schema/IBM Aspera Orchestrator API-v1.yaml',
         async_tables: 'aspera/schema/async_tables.yaml'
       }
 
+      # Schemas owned by ascli: values are validated against them (vendor API schemas are validated by the API)
+      OWNED = %i[spec args conf opts preview async_tables].freeze
+
       OPTIONS = 'opts'
       TRANSFER_SPEC = 'spec'
       SYNC_CONF = 'conf'
       SYNC_ARGS = 'args'
+      PREVIEW_OPTIONS = 'preview'
       AOC = 'aoc'
+      AUTOMATION = 'automation'
       FASPEX = 'faspex'
       FASPIO = 'faspio'
+      CONSOLE = 'console'
       NODE = 'node'
+      ORCHESTRATOR = 'orchestrator'
       SHARES = 'shares+/api/v1'
       ASYNC_TABLES = 'async_tables'
       LOG_OPTIONS             = "#{OPTIONS}:components.schemas.LogOptions"
       DIRECT_AGENT_OPTIONS    = "#{OPTIONS}:components.schemas.DirectAgentOptions"
       NODE_AGENT_OPTIONS      = "#{OPTIONS}:components.schemas.NodeAgentOptions"
+      NODE_EMULATOR_OPTIONS   = "#{OPTIONS}:components.schemas.NodeEmulatorOptions"
       HTTPGW_AGENT_OPTIONS    = "#{OPTIONS}:components.schemas.HttpgwAgentOptions"
       TRANSFERD_AGENT_OPTIONS = "#{OPTIONS}:components.schemas.TransferdAgentOptions"
       TRANSFER_AGENT_OPTIONS  = "#{OPTIONS}:components.schemas.TransferAgentOptions"
@@ -111,7 +129,11 @@ module Aspera
         if path&.end_with?(QUERY_PARAMS_SUFFIX)
           parent_path = path.delete_suffix(QUERY_PARAMS_SUFFIX)
           node = @cache[sym].dig(*parent_path.split('.'))
-          return Reader.from_query_params(node&.fetch('parameters', []) || [])
+          # Parameters may be references to components.parameters
+          params = (node&.fetch('parameters', []) || []).map do |param|
+            param.key?('$ref') ? @cache[sym].dig(*param['$ref'].delete_prefix('#/').split('/')) : param
+          end
+          return Reader.from_query_params(params.compact)
         end
         reader = Reader.new(@cache[sym])
         return reader unless path

data/lib/aspera/schema/validator.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'singleton'
+require 'json'
+require 'aspera/schema/registry'
+
+module Aspera
+  module Schema
+    # Validate values against the JSON schemas of the registry.
+    # Only schemas owned by ascli are validated: vendor API schemas are checked by the API itself.
+    # @!method self.instance
+    #   Returns the singleton instance of Validator
+    #   @return [Validator] the singleton instance
+    class Validator
+      include Singleton
+
+      def initialize
+        # compiled documents, key: [registry key, partial]
+        @documents = {}
+      end
+
+      # Validate a value against a schema.
+      # @param value   [Object]  value to validate
+      # @param path    [String]  schema path, e.g. `opts:components.schemas.HttpOptions`
+      # @param partial [Boolean] `true`: value may be incomplete, `required` is not enforced, `null` values (removal) are ignored
+      # @return [Array<String>] error messages, empty if valid or schema not validated
+      def errors(value, path, partial: false)
+        return [] unless path.is_a?(String) && Registry.owned?(path)
+        key, dotted = path.split(':', 2)
+        schema = document(key, partial)
+        schema = schema.ref("#/#{dotted.split('.').map { |s| s.gsub('~', '~0').gsub('/', '~1') }.join('/')}") if dotted
+        # JSON view of value: symbol keys and values become strings
+        data = JSON.parse(JSON.generate(value))
+        data = without_null(data) if partial
+        schema.validate(data).filter_map { |error| message(error, partial) }
+      end
+
+      private
+
+      # @param key     [String]  registry key
+      # @param partial [Boolean] remove `required` from schema
+      # @return [JSONSchemer::Schema] compiled schema document
+      def document(key, partial)
+        @documents[[key, partial]] ||=
+          begin
+            require 'json_schemer'
+            root = Registry.instance.reader(key).current
+            root = without_required(root) if partial
+            meta =
+              case root['openapi']
+              when /^3\.0\./ then JSONSchemer.openapi30
+              when /^3\.1\./ then JSONSchemer.openapi31
+              end
+            meta ? JSONSchemer.schema(root, meta_schema: meta) : JSONSchemer.schema(root)
+          end
+      end
+
+      # @param node [Object] schema node
+      # @return [Object] copy of node without `required` lists
+      def without_required(node)
+        case node
+        when Hash then node.each_with_object({}) { |(k, v), h| h[k] = without_required(v) unless k.eql?('required') && v.is_a?(Array) }
+        when Array then node.map { |e| without_required(e) }
+        else node
+        end
+      end
+
+      # @param node [Object] JSON value
+      # @return [Object] copy of node without Hash entries whose value is `null` (entry removal requested by user)
+      def without_null(node)
+        case node
+        when Hash then node.each_with_object({}) { |(k, v), h| h[k] = without_null(v) unless v.nil? }
+        when Array then node.map { |e| without_null(e) }
+        else node
+        end
+      end
+
+      # @param error   [Hash]    json_schemer error
+      # @param partial [Boolean] partial validation
+      # @return [String, nil] message, or nil if error is ignored
+      def message(error, partial)
+        return error['error'] unless error['type'].eql?('discriminator')
+        property = error['schema'].dig('discriminator', 'propertyName')
+        object = error['data']
+        # Partial value: selector may come from another source or a default
+        return if partial && object.is_a?(Hash) && !object.key?(property)
+        allowed = error['schema'].dig('discriminator', 'mapping')&.keys
+        "value at `#{error['data_pointer']}/#{property}` is not one of: #{allowed}"
+      end
+    end
+  end
+end

data/lib/aspera/secret_hider.rb

@@ -2,6 +2,7 @@
 
 # cspell:ignore FILEPASS
 require 'logger'
+require 'set'
 require 'singleton'
 
 module Aspera
@@ -13,8 +14,6 @@ module Aspera
   class SecretHider
     include Singleton
 
-    # configurable:
-    ADDITIONAL_KEYS_TO_HIDE = []
     # display string for hidden secrets
     HIDDEN_PASSWORD = '🔑'
     # env vars for ascp with secrets
@@ -23,8 +22,8 @@ module Aspera
     KEY_SECRETS = %w[password secret passphrase _key apikey crn token].freeze
     HTTP_SECRETS = %w[Authorization].freeze
     ALL_SECRETS = (ASCP_ENV_SECRETS + KEY_SECRETS + HTTP_SECRETS).freeze
-    ALL_SECRETS2 = (KEY_SECRETS + HTTP_SECRETS).freeze
-    KEY_FALSE_POSITIVES = [/^access_key$/, /^fallback_private_key$/].freeze
+    NON_ENV_SECRETS = (KEY_SECRETS + HTTP_SECRETS).freeze
+    KEY_FALSE_POSITIVES = [/^access_key$/, /^fallback_private_key$/, /public_key$/, /^token_type$/].freeze
     # min length of hidden secrets, use `+` or `{n,}`
     SECRET_LENGTH = '{5,}'
     # regex that define named captures :begin and :end
@@ -32,38 +31,42 @@ module Aspera
       # private key values (place first)
       /(?<begin>--+BEGIN [^-]+ KEY--+)[[:ascii:]]+?(?<end>--+?END [^-]+ KEY--+)\n*/,
       # CLI manager get/set options
-      /(?<begin>[sg]et (?:#{KEY_SECRETS.join('|')})=).*(?<end>)/,
+      /(?<begin>[sg]et (?:#{KEY_SECRETS.join('|')})=).*(?<end>)/i,
       # env var ascp exec
-      /(?<begin> (?:#{ASCP_ENV_SECRETS.join('|')})=)[^ ]+(?<end> )/,
-      # rendered JSON or Ruby
-      /(?<begin>(?:(?<quote>["'])|:)[^"':=]*(?:#{ALL_SECRETS.join('|')})[^"':=]*\k<quote>?(?:=>|:) *")[^"]+(?<end>")/,
+      /(?<begin> (?:#{ASCP_ENV_SECRETS.join('|')})=)[^ \n]+(?<end> |$)/,
+      # rendered JSON or Ruby (quoted key or legacy symbol key: `"k":"v"`, `"k" => "v"`, `:k=>"v"`)
+      /(?<begin>(?:(?<quote>["'])|:)[^"':=]*(?:#{ALL_SECRETS.join('|')})[^"':=]*\k<quote>? *(?:=>|:) *")(?:[^"\\]|\\.)+(?<end>")/i,
+      # rendered Ruby 3.4+ symbol key: `k: "v"`
+      /(?<begin>\b\w*(?:#{ALL_SECRETS.join('|')})\w*: *")(?:[^"\\]|\\.)+(?<end>")/i,
       # logged data
-      /(?<begin>(?:#{ALL_SECRETS2.join('|')})[ =:]+)[^ "]#{SECRET_LENGTH}(?<end>$)/,
+      /(?<begin>(?:#{NON_ENV_SECRETS.join('|')})[ =:]+)[^ "\n]#{SECRET_LENGTH}(?<end>$)/i,
       # cred in http dump
       /(?<begin>(?:#{HTTP_SECRETS.join('|')}): )[^\\]+(?<end>\\)/i
     ].freeze
-    private_constant :HIDDEN_PASSWORD, :ASCP_ENV_SECRETS, :KEY_SECRETS, :HTTP_SECRETS, :ALL_SECRETS, :KEY_FALSE_POSITIVES, :REGEX_LOG_REPLACES
+    private_constant :HIDDEN_PASSWORD, :ASCP_ENV_SECRETS, :KEY_SECRETS, :HTTP_SECRETS, :ALL_SECRETS, :NON_ENV_SECRETS, :KEY_FALSE_POSITIVES, :SECRET_LENGTH, :REGEX_LOG_REPLACES
     attr_accessor :log_secrets
 
     # @return [Proc] new log formatter that hides secrets
     def log_formatter(original_formatter)
       original_formatter ||= Logger::Formatter.new
       # NOTE: that @log_secrets may be set AFTER this init is done, so it's done at runtime
+      # Hiding is applied on the formatted line, so that non-String messages (e.g. Exception) are covered too
       return lambda do |severity, date_time, program_name, msg|
-        if msg.is_a?(String) && !@log_secrets
-          REGEX_LOG_REPLACES.each do |reg_ex|
-            msg = msg.gsub(reg_ex) { "#{Regexp.last_match(:begin)}#{HIDDEN_PASSWORD}#{Regexp.last_match(:end)}" }
-          end
-        end
-        original_formatter.call(severity, date_time, program_name, msg)
+        line = original_formatter.call(severity, date_time, program_name, msg)
+        line = hide_secrets_in_string(line, all: true) if line.is_a?(String) && !@log_secrets
+        line
       end
     end
 
-    # Replace private key content in a string with the hidden password placeholder
-    # @param value [String] Input string possibly containing a private key
-    # @return [String] String with private key replaced by placeholder
-    def hide_secrets_in_string(value)
-      return value.gsub(REGEX_LOG_REPLACES.first) { "#{Regexp.last_match(:begin)}#{HIDDEN_PASSWORD}#{Regexp.last_match(:end)}" }
+    # Replace secrets in a string with the hidden password placeholder
+    # @param value [String] Input string possibly containing secrets
+    # @param all   [Boolean] `false`: only private keys, `true`: all known secret patterns
+    # @return [String] String with secrets replaced by placeholder
+    def hide_secrets_in_string(value, all: false)
+      (all ? REGEX_LOG_REPLACES : REGEX_LOG_REPLACES.first(1)).each do |reg_ex|
+        value = value.gsub(reg_ex) { "#{Regexp.last_match(:begin)}#{HIDDEN_PASSWORD}#{Regexp.last_match(:end)}" }
+      end
+      return value
     end
 
     # @param keyword [String, Symbol] Key name to check
@@ -73,11 +76,12 @@ module Aspera
       keyword = keyword.to_s if keyword.is_a?(Symbol)
       # only Strings can be secrets, not booleans, or hash, arrays
       return false unless keyword.is_a?(String) && value.is_a?(String)
+      return true if @additional_keys.include?(keyword)
+      keyword = keyword.downcase
       # those are not secrets
       return false if KEY_FALSE_POSITIVES.any? { |f| f.match?(keyword) }
-      return true if ADDITIONAL_KEYS_TO_HIDE.include?(keyword)
       # check if keyword (name) contains an element that designate it as a secret
-      ALL_SECRETS.any? { |kw| keyword.include?(kw) }
+      ALL_SECRETS.any? { |kw| keyword.include?(kw.downcase) }
     end
 
     # Hides recursively secrets in Hash or Array of Hash
@@ -89,18 +93,25 @@ module Aspera
         obj.each do |k, v|
           if secret?(k, v)
             obj[k] = HIDDEN_PASSWORD
-          elsif obj[k].is_a?(Hash)
-            deep_remove_secret(obj[k])
+          elsif v.is_a?(Hash) || v.is_a?(Array)
+            deep_remove_secret(v)
           end
         end
       end
       return obj
     end
 
+    # Declare additional exact key names whose values are secrets
+    # @param keys [Array<String, Symbol>] Key names
+    def add_secret_keys(keys)
+      @additional_keys.merge(keys.map(&:to_s))
+    end
+
     private
 
     def initialize
       @log_secrets = false
+      @additional_keys = Set.new
     end
   end
 end

data/lib/aspera/string_ext.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ::String
+  # Transform capitalized to snake case
+  def capital_to_snake
+    return gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .downcase
+  end
+
+  # Transform snake case to capitalized
+  def snake_to_capital
+    split('_').map(&:capitalize).join
+  end
+end

data/lib/aspera/temp_file_manager.rb

@@ -3,7 +3,7 @@
 require 'singleton'
 require 'fileutils'
 require 'etc'
-require 'tempfile'
+require 'tmpdir'
 
 module Aspera
   # create a temp file name for a given folder
@@ -58,10 +58,11 @@ module Aspera
     def new_file_path_in_folder(temp_folder, prefix: nil, suffix: nil)
       FileUtils.mkdir_p(temp_folder)
       basename = [prefix || 'aspera', SecureRandom.uuid].join('-')
-      # Tempfile.new creates the file atomically with O_EXCL; close keeps it on disk
-      tmp = Tempfile.new([basename, suffix ? "-#{suffix}" : ''], temp_folder)
-      tmp.close
-      new_file = tmp.path
+      # Create the file atomically with O_EXCL (retry with another name if it exists)
+      # Note: Tempfile is not used, as its file is deleted when the object is garbage collected
+      new_file = Dir::Tmpname.create([basename, suffix ? "-#{suffix}" : ''], temp_folder) do |path|
+        File.open(path, File::WRONLY | File::CREAT | File::EXCL, 0o600) { nil }
+      end
       @created_files.push(new_file)
       new_file
     end

data/lib/aspera/transfer/parameters.rb

@@ -16,6 +16,8 @@ require 'base64'
 require 'json'
 require 'fileutils'
 require 'openssl'
+require 'aspera/rainbow'
+using Rainbow
 
 module Aspera
   module Transfer

data/lib/aspera/transfer/spec.rb

@@ -25,6 +25,7 @@ module Aspera
       TRANSPORT_FIELDS = (%w[remote_host] + AK_TSPEC_BASE.keys + WSS_FIELDS).freeze
       # reserved tag for Aspera
       TAG_RESERVED = 'aspera'
+      # Specific fields to not display
       SPECIFIC = %w{token paths direction source_root destination_root}.freeze
       class << self
         # wrong def in transferd

data/lib/aspera/uri_reader.rb

@@ -22,7 +22,7 @@ module Aspera
   #
   # The short form is consistent with RFC 8089 (file:///<path> = absolute,
   # file:<path> = relative).  Both forms are handled identically by this module.
-  # The canonical form built by {file_url} uses the +file:///+ prefix.
+  # The canonical form built by {file_url} uses the `file:///` prefix.
   module UriReader
     SCHEME_FILE = 'file'
     SCHEME_FILE_PFX1 = "#{SCHEME_FILE}:"
@@ -31,13 +31,13 @@ module Aspera
     SCHEME_FILE_PFX2 = "#{SCHEME_FILE_PFX1}///"
     private_constant :SCHEME_FILE, :SCHEME_FILE_PFX1, :SCHEME_FILE_PFX2
     class << self
-      # @return [Boolean] true if +url+ uses the file: scheme recognised by this module
+      # @return [Boolean] true if `url` uses the file: scheme recognised by this module
       def file?(url)
         url.start_with?(SCHEME_FILE_PFX1)
       end
 
-      # Build a file: URL from +path+.
-      # A relative path yields +file:///path+; an absolute path yields +file:////path+.
+      # Build a file: URL from `path`.
+      # A relative path yields `file:///path`; an absolute path yields `file:////path`.
       # @param path [String] relative or absolute file-system path
       # @return [String] corresponding file: URL
       def file_url(path)
@@ -45,7 +45,7 @@ module Aspera
       end
 
       # Extract the file-system path from a file: URL.
-      # Accepts both the canonical +file:///+ form and the short +file:+ form.
+      # Accepts both the canonical `file:///` form and the short `file:` form.
       # Returns the literal path (relative or absolute) without working-directory expansion.
       # @param url [String] a file: URL (canonical or short form)
       # @return [String] the literal path encoded in the URL
@@ -57,12 +57,12 @@ module Aspera
       end
 
       # Read content from a URI and return it as a String.
-      # Supported schemes: +http+, +https+, +data+, +file+, and bare paths (no scheme).
+      # Supported schemes: `http`, `https`, `data`, `file`, and bare paths (no scheme).
       # For file: URLs the path is extracted via {file_path} to respect the module convention
       # (see module-level documentation).  Ruby's URI parser is not used for file: URLs because
       # it interprets the three-slash prefix differently (it always produces an absolute path).
-      # Bare paths (no scheme) are passed to File.read directly; leading +/~/+, +/./+, +/../+
-      # are expanded via +File.expand_path+ after stripping the synthetic leading slash added by
+      # Bare paths (no scheme) are passed to File.read directly; leading `/~/`, `/./`, `/../`
+      # are expanded via `File.expand_path` after stripping the synthetic leading slash added by
       # URI.
       def read(uri_to_read)
         # Handle file: URLs directly to honour the file:///relative vs file:////absolute convention.
@@ -70,7 +70,7 @@ module Aspera
         uri = URI.parse(uri_to_read)
         case uri.scheme
         when 'http', 'https'
-          return Rest.new(base_url: uri_to_read, redirect_max: 5).read(nil, headers: {'Accept' => '*/*'})
+          return Rest::Client.new(base_url: uri_to_read, redirect_max: 5).read(nil, headers: {'Accept' => '*/*'})
         when 'data'
           metadata, encoded_data = uri.opaque.split(',', 2)
           if metadata.end_with?(';base64')
@@ -87,7 +87,7 @@ module Aspera
         end
       end
 
-      # Return the local file-system path for the content at +url+, downloading to a temp file if needed.
+      # Return the local file-system path for the content at `url`, downloading to a temp file if needed.
       # For file: URLs the path is extracted directly (no download).
       # For data: and http(s): URLs the content is written to a temporary file and its path is returned.
       # @return [String] local path to a file containing the URL content
@@ -105,7 +105,7 @@ module Aspera
           # download to temp file
           # auto-delete on exit
           temp_file = TempFileManager.instance.new_file_path_global(suffix: File.basename(url))
-          Aspera::Rest.new(base_url: url, redirect_max: 3).call(operation: 'GET', save_to: temp_file)
+          Aspera::Rest::Client.new(base_url: url, redirect_max: 3).call(operation: 'GET', save_to: temp_file)
           return temp_file
         end
       end