ruby-jss 2.0.0a11 → 2.0.0b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89a063540145b18ab23771f87ad6eb8db80c154e911138b75a7a233117fb6dc6
-  data.tar.gz: 139bc4655da8a6a1e4bed21add476f6bfaa844dbda4fb0e477fdcee45079cc9e
+  metadata.gz: fe30c0681cd2c394be81e8f15797e5222d6ce95c7458717a206c91d9d1704137
+  data.tar.gz: 275bfb95e7924dd12612e4077fea75da21105b2b8fc7239e989704cdc9bca65a
 SHA512:
-  metadata.gz: 33d23b52e0f0bb2f42a4a606ae34288b4b7ceb35e3d051ccb1281456709cdee7d4bcaea26681f30126239e30bde8de55bc550fe021d2e59a9cd0f05fdeb40d65
-  data.tar.gz: b8b8c46c351833c47493ad2512349b952522d2916bcac4b0143a0c49aa140187635be582ad5971da0a63e599fbd263900eecb01bce24b88da6f88a8457ea82fc
+  metadata.gz: 747af106fa7e86e60535a831cbd36af1b850e6682cacee07fea2e30ed079188be1ddf6c17e06d25d8887cbda3e35411329fe91a5d2e60c49b5f93a3d2e1b03a3
+  data.tar.gz: 5e56d93b2dc5fa52faa6a385352d71b5d5691ce9a7428f459eece369d991504729b3ddfe0eea721f6e888306e524684a0bade6572e5c96752605d0179c8e923f

data/README-2.0.0.md

@@ -8,36 +8,38 @@ These changes have been in mind for some time, but the ability (soon to be requi
 
 **CONTENTS**
 
-<!-- TOC depthFrom:2 depthTo:6 withLinks:1 updateOnSave:1 orderedList:0 -->
-
-- [Requirements](#requirements)
-- [High level changes](#high-level-changes)
-  - [Ruby 3.x support](#ruby-3x-support)
-  - [Combined API access](#combined-api-access)
-    - [A single Connection class](#a-single-connection-class)
-      - [Connecting to the API](#connecting-to-the-api)
-        - [The default connection](#the-default-connection)
-    - [A single namespace `Jamf`](#a-single-namespace-jamf)
-      - [Inherant differences between the APIs](#inherant-differences-between-the-apis)
-      - [Which API does an object come from?](#which-api-does-an-object-come-from)
-  - [Automatic code generation](#automatic-code-generation)
-  - [Autoloading with Zeitwerk](#autoloading-with-zeitwerk)
-- [Notable changes from ruby-jss 1.x](#notable-changes-from-ruby-jss-1x)
-  - [Paged queries to the Jamf Pro API](#paged-queries-to-the-jamf-pro-api)
-  - [API data are no longer cached (?)](#api-data-are-no-longer-cached-)
-  - [No Attribute aliases for Jamf Pro API objects](#no-attribute-aliases-for-jamf-pro-api-objects)
-  - [Class/Mixin hierarchy for Jamf Pro API objects](#classmixin-hierarchy-for-jamf-pro-api-objects)
-- [Planned deprecations](#planned-deprecations)
-  - [Use of the term 'api' in method names, parameter names, and attributes](#use-of-the-term-api-in-method-names-parameter-names-and-attributes)
-  - [`.map_all_ids_to` method for Classic API collection classes](#map_all_ids_to-method-for-classic-api-collection-classes)
-  - [Using `.make`, `#create`, and `#update` for Classic API objects](#using-make-create-and-update-for-classic-api-objects)
-  - [JSS::CONFIG](#jssconfig)
-  - [Jamf::Connection instance methods `#next_refresh`, `#secs_to_refresh`, &  `#time_to_refresh`](#jamfconnection-instance-methods-next_refresh-secs_to_refresh---time_to_refresh)
-  - [Cross-object validation in setters](#cross-object-validation-in-setters)
-  - [.fetch :random](#fetch-random)
-- [Documentation](#documentation)
-- [How to install for testing](#how-to-install-for-testing)
-- [Contact](#contact)
+<!-- TOC -->
+
+- [ruby-jss 2.0: Combined access to the Classic and Jamf Pro APIs](#ruby-jss-20-combined-access-to-the-classic-and-jamf-pro-apis)
+  - [Requirements](#requirements)
+  - [High level changes](#high-level-changes)
+    - [Ruby 3.x support](#ruby-3x-support)
+    - [Combined API access](#combined-api-access)
+      - [A single Connection class](#a-single-connection-class)
+        - [Connecting to the API](#connecting-to-the-api)
+          - [The default connection](#the-default-connection)
+      - [A single namespace Jamf](#a-single-namespace-jamf)
+        - [Inherant differences between the APIs](#inherant-differences-between-the-apis)
+        - [Which API does an object come from?](#which-api-does-an-object-come-from)
+    - [Automatic code generation](#automatic-code-generation)
+    - [Autoloading with Zeitwerk](#autoloading-with-zeitwerk)
+  - [Notable changes from ruby-jss 1.x](#notable-changes-from-ruby-jss-1x)
+    - [Paged queries to the Jamf Pro API](#paged-queries-to-the-jamf-pro-api)
+    - [API data are no longer cached ?](#api-data-are-no-longer-cached-)
+    - [No Attribute aliases for Jamf Pro API objects](#no-attribute-aliases-for-jamf-pro-api-objects)
+    - [Class/Mixin hierarchy for Jamf Pro API objects](#classmixin-hierarchy-for-jamf-pro-api-objects)
+    - [Support for 'Sticky Sessions' in Jamf Cloud](#support-for-sticky-sessions-in-jamf-cloud)
+  - [Planned deprecations](#planned-deprecations)
+    - [Use of the term 'api' in method names, parameter names, and attributes](#use-of-the-term-api-in-method-names-parameter-names-and-attributes)
+    - [.map_all_ids_to method for Classic API collection classes](#map_all_ids_to-method-for-classic-api-collection-classes)
+    - [Using .make, #create, and #update for Classic API objects](#using-make-create-and-update-for-classic-api-objects)
+    - [JSS::CONFIG](#jssconfig)
+    - [Jamf::Connection instance methods #next_refresh, #secs_to_refresh, &  #time_to_refresh](#jamfconnection-instance-methods-next_refresh-secs_to_refresh---time_to_refresh)
+    - [Cross-object validation in setters](#cross-object-validation-in-setters)
+    - [fetch :random](#fetch-random)
+  - [Documentation](#documentation)
+  - [How to install for testing](#how-to-install-for-testing)
+  - [Contact](#contact)
 
 <!-- /TOC -->
 
@@ -51,7 +53,7 @@ This means it will work with the OS-supplied /usr/bin/ruby in macOS 10.15 Catali
 
 ### Ruby 3.x support
 
-The plan is for ruby-jss 2.0+ to be compatible with ruby 2.7 and higher, including ruby 3.x
+The plan is for ruby-jss 2.0+ to be compatible with ruby 2.6.3 and higher, including ruby 3.x
 
 As of this writing, basic access to the API seems to be working in ruby 3, but much much more testing is needed.
 
@@ -125,7 +127,7 @@ If you develop ruby-jss, please see (documentation link TBA) for more info about
 
 ### Autoloading with Zeitwerk
 
-Because the classes generated from the OAPI spec number in the hundreds, it's a waste of memory and time to load all of them in every time you `require ruby-jss`, since most of them will never be used for any given application.
+Because the classes generated from the OAPI spec number in the hundreds, it's a waste of memory and time to load all of them in every time you `require 'ruby-jss'`, since most of them will never be used for any given application.
 
 To deal with this, ruby-jss now uses the wonderfully cool [Zeitwerk gem](https://github.com/fxn/zeitwerk) to automatically load only the files needed for classes and modules as they are used.
 
@@ -177,6 +179,17 @@ There's a lot to document about these changes, and much of the current documenta
 
 Give us time and we'll get everything updated. In the meantime, feel free to reach out in the #ruby-jss channel of Macadmins Slack, or open an issue on GitHub, or email ruby-jss@pixar.com.
 
+### Support for 'Sticky Sessions' in Jamf Cloud
+
+If you are connecting to a Jamf Cloud server, you can specifcy `sticky_sessions: true` when calling `Jamf::Connection.new` or `Jamf::Connection#connect`. If you already have a connected Connection object, you can enable or disable Sticky Sessions using `my_connection_object.sticky_session =` with a boolean value (for the default connection use `Jamf.cnx.sticky_session = <boolean>`). To see the actual cookie being sent to enable sticky sessions, use `Jamf::Connection#sticky_session_cookie`. 
+
+Attempting to enable a sticky session with a connection to an on-prem server (host not ending in 'jamfcloud.com') will raise an error.
+
+For details about Sticky Sessions see [Sticky Sessions for Jamf Cloud](https://developer.jamf.com/developer-guide/docs/sticky-sessions-for-jamf-cloud) at the Jamf Developer site. 
+
+**WARNING:** Jamf recommends NOT using sticky sessions unless they are needed. Using them inappropriately may negatively impact performance, especially for large automated processes.
+
+
 ## Planned deprecations
 
 ### Use of the term 'api' in method names, parameter names, and attributes

data/lib/jamf/api/classic/api_objects/computer.rb

@@ -158,6 +158,7 @@ module Jamf
     include Jamf::Sitable
     include Jamf::MDM
     include Jamf::ManagementHistory
+    include Jamf::MacOSManagedUpdates
 
     extend Jamf::Matchable
 
@@ -183,24 +184,20 @@ module Jamf
     # these keys,  as well as :id and :name, can be used to look up objects
     # of this class in the JSS
     #
-    # the weird alises mac_addresse and macaddresse
-    # are for proper pluralization of 'mac_address' and such
     OTHER_LOOKUP_KEYS = {
       udid: {
-        aliases: [:uuid, :guid],
+        aliases: %i[uuid guid],
         fetch_rsrc_key: :udid
       },
       serial_number: {
-        aliases: [:serialnumber, :sn],
+        aliases: %i[serialnumber sn],
         fetch_rsrc_key: :serialnumber
       },
       mac_address: {
-        aliases: [
-          :mac_address,
-          :mac_addresse,
-          :macaddress,
-          :macaddresse,
-          :macaddr
+        aliases: %i[
+          mac_address
+          macaddress
+          macaddr
         ],
         fetch_rsrc_key: :macaddress
       }
@@ -367,14 +364,14 @@ module Jamf
     def self.all_macbookpros(refresh = false, api: nil, cnx: Jamf.cnx)
       cnx = api if api
 
-      all(refresh, cnx: cnx).select { |d| d[:model] =~ /^macbookpro\d/i  }
+      all(refresh, cnx: cnx).select { |d| d[:model] =~ /^macbookpro\d/i }
     end
 
     # @return [Array<Hash>] all macbookairs in the jss
     def self.all_macbookairs(refresh = false, api: nil, cnx: Jamf.cnx)
       cnx = api if api
 
-      all(refresh, cnx: cnx).select { |d| d[:model] =~ /^macbookair\d/i  }
+      all(refresh, cnx: cnx).select { |d| d[:model] =~ /^macbookair\d/i }
     end
 
     # @return [Array<Hash>] all xserves in the jss
@@ -573,6 +570,7 @@ module Jamf
 
       id = valid_id ident, cnx: cnx
       raise "No computer matches identifier: #{ident}" unless id
+
       if subset
         management_data_subset id, subset: subset, only: only, cnx: cnx
       else
@@ -1007,6 +1005,7 @@ module Jamf
     #
     def filevault1_accounts
       return [] if filevault2_enabled?
+
       local_accounts.select { |a| a[:filevault_enabled] }
     end
 
@@ -1059,6 +1058,7 @@ module Jamf
     #
     def management_data(subset: nil, only: nil)
       raise Jamf::NoSuchItemError, 'Computer not yet saved in the JSS' unless @in_jss
+
       Jamf::Computer.management_data @id, subset: subset, only: only, cnx: @cnx
     end
 
@@ -1144,6 +1144,7 @@ module Jamf
     #
     def make_unmanaged
       return nil unless managed?
+
       set_management_to(nil, nil)
       @unmange_at_update = true
     end
@@ -1186,30 +1187,35 @@ module Jamf
 
     def ip_address=(new_val)
       return nil if @ip_address == new_val
+
       @ip_address = new_val.empty? ? new_val : Jamf::Validate.ip_address(new_val)
       @need_to_update = true
     end
 
     def mac_address=(new_val)
       return nil if new_val == @mac_address
+
       @mac_address =  new_val.empty? ? new_val : Jamf::Validate.mac_address(new_val)
       @need_to_update = true
     end
 
     def alt_mac_address=(new_val)
       return nil if new_val == @alt_mac_address
+
       @alt_mac_address = new_val.empty? ? new_val : Jamf::Validate.mac_address(new_val)
       @need_to_update = true
     end
 
     def serial_number=(new_val)
       return nil if new_val == @serial_number
+
       @serial_number =  new_val.empty? ? new_val : Jamf::Validate.doesnt_already_exist(Jamf::Computer, :serial_number, new_val, cnx: cnx)
       @need_to_update = true
     end
 
     def udid=(new_val)
       return nil if new_val == @udid
+
       @udid = new_val.empty? ? new_val : Jamf::Validate.doesnt_already_exist(Jamf::Computer, :udid, new_val, cnx: cnx)
       @need_to_update = true
     end
@@ -1269,9 +1275,6 @@ module Jamf
       @software = nil
     end # delete
 
-
-
-
     # aliases
     alias alt_macaddress alt_mac_address
     alias bar_code_1 barcode1

data/lib/jamf/api/classic/api_objects/computer_group.rb

@@ -57,6 +57,7 @@ module Jamf
     ### Mix-Ins
     #####################################
     include Jamf::MDM
+    include Jamf::MacOSManagedUpdates
 
     #####################################
     ### Class Methods

data/lib/jamf/api/classic/api_objects/criteriable.rb

@@ -153,7 +153,7 @@ module Jamf
     #
     def parse_criteria
       @criteria = Jamf::Criteriable::Criteria.new
-      @criteria.criteria = @init_data[:criteria].map { |c| Jamf::Criteriable::Criterion.new **c } if @init_data[:criteria]
+      @criteria.criteria = @init_data[:criteria].map { |c| Jamf::Criteriable::Criterion.new(**c) } if @init_data[:criteria]
 
       @criteria.container = self
     end

data/lib/jamf/api/classic/api_objects/mdm.rb

@@ -442,7 +442,7 @@ module Jamf
       #
       # @return [Array<Integer>] The ids of the target devices for a command
       #
-      def raw_targets_to_ids(targets, expand_groups: true, api: nil, cnx: Jamf.cnx)
+      def raw_targets_to_ids(targets, expand_groups: true, unmanaged_ok: false, api: nil, cnx: Jamf.cnx)
         cnx = api if api
 
         targets = targets.is_a?(Array) ? targets : [targets]
@@ -454,6 +454,7 @@ module Jamf
         targets.map! do |md|
           id = valid_id md, cnx: cnx
           raise Jamf::NoSuchItemError, "No #{self} matches identifier: #{md}" unless id
+
           id
         end # map!
 
@@ -465,13 +466,17 @@ module Jamf
         end
 
         # make sure all of them are managed, or else the API will raise a 400
-        # 'Bad Request' when sending the command to an unmanaged target
-        all_mgd = map_all_ids_to(:managed, cnx: cnx).select { |_id, mgd| mgd }.keys
-
-        targets.each do |target_id|
-          raise Jamf::UnmanagedError, "#{self} with id #{target_id} is not managed. Cannot send command." unless all_mgd.include? target_id
-        end
-
+        # 'Bad Request' when sending the command to an unmanaged target.
+        # Some actions, like flushing MDM commands (see .flush_mdm_commands)
+        # are OK on unmanaged machines, so they will specify 'unmanaged_ok'
+        unless unmanaged_ok
+          all_mgd = map_all_ids_to(:managed, cnx: cnx).select { |_id, mgd| mgd }.keys
+
+          targets.each do |target_id|
+            raise Jamf::UnmanagedError, "#{self} with id #{target_id} is not managed. Cannot send command." unless all_mgd.include? target_id
+          end
+        end # unles
+        
         targets
       end
 
@@ -535,9 +540,11 @@ module Jamf
         case self::MDM_COMMAND_TARGET
         when *COMPUTER_TARGETS
           return command if COMPUTER_COMMANDS.include? command
+
           raise Jamf::UnsupportedError, "'#{command}' cannot be sent to computers or computer groups"
         when *DEVICE_TARGETS
           return command if DEVICE_COMMANDS.include? command
+
           raise Jamf::UnsupportedError, "'#{command}' cannot be sent to mobile devices or mobile device groups"
         end
 
@@ -585,6 +592,7 @@ module Jamf
         case self::MDM_COMMAND_TARGET
         when *COMPUTER_TARGETS
           raise Jamf::InvalidDataError, 'Locking computers requires a 6-character String passcode' unless passcode.size == 6
+
           opts = { passcode: passcode }
         when *DEVICE_TARGETS
           opts = {}
@@ -613,6 +621,7 @@ module Jamf
         case self::MDM_COMMAND_TARGET
         when *COMPUTER_TARGETS
           raise Jamf::InvalidDataError, 'Erasing computers requires a 6-character String passcode' unless passcode.size == 6
+
           opts = { passcode: passcode }
         when *DEVICE_TARGETS
           opts = {}
@@ -850,13 +859,17 @@ module Jamf
       def wallpaper(targets, wallpaper_setting: nil, wallpaper_content: nil, wallpaper_id: nil, api: nil, cnx: Jamf.cnx)
         cnx = api if api
 
-        raise ArgumentError, "wallpaper_setting must be one of: :#{WALLPAPER_LOCATIONS.keys.join ', :'}" unless WALLPAPER_LOCATIONS.keys.include? wallpaper_setting
+        unless WALLPAPER_LOCATIONS.keys.include? wallpaper_setting
+          raise ArgumentError, 
+                "wallpaper_setting must be one of: :#{WALLPAPER_LOCATIONS.keys.join ', :'}"
+        end
 
         opts = { wallpaper_setting: WALLPAPER_LOCATIONS[wallpaper_setting] }
 
         if wallpaper_content
           file = Pathname.new wallpaper_content
           raise Jamf::NoSuchItemError, "Not a file: #{file}" unless file.file?
+
           opts[:wallpaper_content] = Base64.encode64 file.read
         elsif wallpaper_id
           opts[:wallpaper_id] = wallpaper_id
@@ -993,18 +1006,19 @@ module Jamf
       # @return (see .send_mdm_command)
       #
       def enable_lost_mode(
-            targets,
-            message: nil,
-            phone: nil,
-            footnote: nil,
-            play_sound: false,
-            enforce_lost_mode: true,
-            api: nil,
-            cnx: Jamf.cnx
-          )
+        targets,
+        message: nil,
+        phone: nil,
+        footnote: nil,
+        play_sound: false,
+        enforce_lost_mode: true,
+        api: nil,
+        cnx: Jamf.cnx
+      )
         cnx = api if api
 
         raise ArgumentError, 'Either message: or phone_number: must be provided' unless message || phone
+
         opts = { always_enforce_lost_mode: enforce_lost_mode }
         opts[:lost_mode_message] = message if message
         opts[:lost_mode_phone] = phone if phone
@@ -1067,7 +1081,9 @@ module Jamf
 
         status = FLUSHABLE_STATUSES[status]
 
-        target_ids = raw_targets_to_ids targets, cnx: cnx, expand_groups: false
+        # TODO: add 'unmanaged_ok:' param to raw_targets_to_ids method, so that we can 
+        # use this to flush commands for unmanaged machines.
+        target_ids = raw_targets_to_ids targets, cnx: cnx, expand_groups: false, unmanaged_ok: true
 
         command_flush_rsrc = "commandflush/#{self::MDM_COMMAND_TARGET}/id"
 
@@ -1367,11 +1383,11 @@ module Jamf
     # @return (see .send_mdm_command)
     #
     def enable_lost_mode(
-          message: nil,
-          phone_number: nil,
-          footnote: nil,
-          enforce_lost_mode: true,
-          play_sound: false
+      message: nil,
+      phone_number: nil,
+      footnote: nil,
+      enforce_lost_mode: true,
+      play_sound: false
     )
       self.class.enable_lost_mode(
         @id,

data/lib/jamf/api/classic/api_objects/mobile_device.rb

@@ -106,21 +106,18 @@ module Jamf
     # are for proper pluralization of 'mac_address' and such
     OTHER_LOOKUP_KEYS = {
       udid: {
-        aliases: [:uuid, :guid],
+        aliases: %i[uuid guid],
         fetch_rsrc_key: :udid
       },
       serial_number: {
-        aliases: [:serialnumber, :sn],
+        aliases: %i[serialnumber sn],
         fetch_rsrc_key: :serialnumber
       },
       wifi_mac_address: {
-        aliases: [
-          :wifi_mac_addresse,
-          :mac_address,
-          :mac_addresse,
-          :macaddress,
-          :macaddresse,
-          :macaddr
+        aliases: %i[
+          wifi_macaddr
+          mac_address
+          macaddr
         ],
         fetch_rsrc_key: :macaddress
       }
@@ -530,21 +527,20 @@ module Jamf
       @needs_mdm_name_change = true if managed? && supervised?
     end
 
-    #
     def serial_number=(new_val)
       return nil if new_val == @serial_number
+
       @serial_number =  new_val.empty? ? new_val : Jamf::Validate.doesnt_already_exist(self.class, :serial_number, new_val, cnx: cnx)
       @need_to_update = true
     end
 
-    #
     def udid=(new_val)
       return nil if new_val == @udid
+
       @udid = new_val.empty? ? new_val : Jamf::Validate.doesnt_already_exist(self.class, :udid, new_val, cnx: cnx)
       @need_to_update = true
     end
 
-    #
     def asset_tag=(new_val)
       new_val = new_val.strip
       return nil if @asset_tag == new_val

data/lib/jamf/api/classic/api_objects/policy.rb

@@ -1425,29 +1425,21 @@ module Jamf
     #
     # @option [Symbol] priority: either :before or :after
     #
-    # @option [String] parameter4: the value of the 4th parameter passed to the script. this
-    #   overrides the same parameter in the script object itself.
+    # @option [String] parameter4: the value of the 4th parameter passed to the script.
     #
-    # @option [String] parameter5: the value of the 5th parameter passed to the script. this
-    #   overrides the same parameter in the script object itself.
+    # @option [String] parameter5: the value of the 5th parameter passed to the script.
     #
-    # @option [String] parameter6: the value of the 6th parameter passed to the script. this
-    #   overrides the same parameter in the script object itself.
+    # @option [String] parameter6: the value of the 6th parameter passed to the script.
     #
-    # @option [String] parameter7: the value of the 7th parameter passed to the script. this
-    #   overrides the same parameter in the script object itself.
+    # @option [String] parameter7: the value of the 7th parameter passed to the script.
     #
-    # @option [String] parameter8: the value of the 8th parameter passed to the script. this
-    #   overrides the same parameter in the script object itself.
+    # @option [String] parameter8: the value of the 8th parameter passed to the script.
     #
-    # @option [String] parameter9: the value of the 9th parameter passed to the script. this
-    #   overrides the same parameter in the script object itself.
+    # @option [String] parameter9: the value of the 9th parameter passed to the script.
     #
-    # @option [String] parameter10: the value of the 10th parameter passed to the script. this
-    #   overrides the same parameter in the script object itself.
+    # @option [String] parameter10: the value of the 10th parameter passed to the script.
     #
-    # @option [String] parameter11: the value of the 11th parameter passed to the script. this
-    #   overrides the same parameter in the script object itself.
+    # @option [String] parameter11: the value of the 11th parameter passed to the script.
     #
     # @return [Array, nil]  the new @scripts array, nil if script was already in the policy
     #
@@ -1643,7 +1635,6 @@ module Jamf
       @printers
     end
 
-
     # Remove a specific printer object from the policy.
     #
     # @author Tyler Morgan

data/lib/jamf/api/classic/api_objects/script.rb

@@ -389,7 +389,7 @@ module Jamf
       raise Jamf::MissingDataError, 'script_contents does not start with #!' unless @script_contents.to_s.start_with? '#!'
 
       opts[:target] ||= '/'
-      opts[:computer_name] ||= Jamf::Client.run_jamf('getComputerName')[/>(.)</, 1]
+      opts[:computer_name] ||= Jamf::Client.run_jamf('getComputerName')[/>(.*?)</, 1]
       opts[:username] ||= Jamf::Client.console_user
 
       params = [opts[:target], opts[:computer_name], opts[:username]]

data/lib/jamf/api/classic/base_classes/advanced_search.rb

@@ -189,7 +189,7 @@ module Jamf
       raise Jamf::InvalidDataError, 'Jamf::Criteriable::Criteria instance required' unless @criteria.is_a? Jamf::Criteriable::Criteria
       raise Jamf::InvalidDataError, 'display_fields must be an Array.' unless @display_fields.is_a? Array
 
-      orig_timeout = @cnx.cnx.options[:timeout]
+      orig_timeout = @cnx.timeout
       @cnx.timeout = 1800
       super()
       requery_search_results if get_results
@@ -207,7 +207,7 @@ module Jamf
     # @return [Integer] the id of the updated search
     #
     def update(get_results = false)
-      orig_timeout = @cnx.cnx.options[:timeout]
+      orig_timeout = @cnx.timeout
       @cnx.timeout = 1800
       super()
       requery_search_results if get_results
@@ -235,8 +235,8 @@ module Jamf
     # @return [Array<Hash>] the new search results
     #
     def requery_search_results
-      orig_open_timeout = @cnx.cnx.options[:open_timeout]
-      orig_timeout = @cnx.cnx.options[:timeout]
+      orig_open_timeout = @cnx.open_timeout
+      orig_timeout = @cnx.timeout
       @cnx.timeout = 1800
       @cnx.open_timeout = 1800
       begin