ruby-jss 1.6.4 → 2.0.0b1

data/lib/{jss/api_object → jamf/api/classic/api_objects}/policy.rb

@@ -1,4 +1,4 @@
-# Copyright 2020 Pixar
+# Copyright 2022 Pixar
 
 #
 #    Licensed under the Apache License, Version 2.0 (the "Apache License")
@@ -23,7 +23,7 @@
 #
 #
 
-module JSS
+module Jamf
 
   # Module Constants
   ######################
@@ -55,29 +55,29 @@ module JSS
   # - - category
   # - - triggers
   # - - client maintenance tasks
-  # - - scope, see {JSS::Scopable} and {JSS::Scopable::Scope}
+  # - - scope, see {Jamf::Scopable} and {Jamf::Scopable::Scope}
   # - - files and processes
   # - - packages, see {#add_package} and {#remove_package}
   # - - scripts see {#add_script} and {#remove_script}
-  # - - self service, see {JSS::SelfServable}
+  # - - self service, see {Jamf::SelfServable}
   # - - reboot options
   #
   # All other values and sections must be edited via the Web App.
   #
   # Policies may be deleted via this class
   #
-  class Policy < JSS::APIObject
+  class Policy < Jamf::APIObject
 
     # Mix-Ins
     #####################################
 
-    include JSS::Creatable
-    include JSS::Updatable
-    include JSS::Scopable
-    include JSS::Uploadable
-    include JSS::SelfServable
-    include JSS::Categorizable
-    include JSS::Sitable
+    include Jamf::Creatable
+    include Jamf::Updatable
+    include Jamf::Scopable
+    include Jamf::Uploadable
+    include Jamf::SelfServable
+    include Jamf::Categorizable
+    include Jamf::Sitable
 
     # Class Constants
     #####################################
@@ -314,45 +314,47 @@ module JSS
     #   either ids, names, SNs, macaddrs, or UDIDs. If omitted, flushes logs for
     #   all computers
     #
-    # @param api [JSS::APIConnection] the API  connection to use.
+    # @param cnx [Jamf::Connection] the API  connection to use.
     #
     # @return [void]
     #
-    def self.flush_logs(policy, older_than: 0, period: :days, computers: [], api: JSS.api)
-      orig_timeout = api.cnx.options.timeout
-      pol_id = valid_id policy
-      raise JSS::NoSuchItemError, "No Policy identified by '#{policy}'." unless pol_id
+    def self.flush_logs(policy, older_than: 0, period: :days, computers: [], api: nil, cnx: Jamf.cnx)
+      cnx = api if api
+
+      orig_timeout = cnx.timeout
+      pol_id = valid_id policy, cnx: cnx
+      raise Jamf::NoSuchItemError, "No Policy identified by '#{policy}'." unless pol_id
 
       older_than = LOG_FLUSH_INTERVAL_INTEGERS[older_than]
-      raise JSS::InvalidDataError, "older_than must be one of these integers: #{LOG_FLUSH_INTERVAL_INTEGERS.keys.join ', '}" unless older_than
+      raise Jamf::InvalidDataError, "older_than must be one of these integers: #{LOG_FLUSH_INTERVAL_INTEGERS.keys.join ', '}" unless older_than
 
       period = LOG_FLUSH_INTERVAL_PERIODS[period]
-      raise JSS::InvalidDataError, "period must be one of these symbols: :#{LOG_FLUSH_INTERVAL_PERIODS.keys.join ', :'}" unless period
+      raise Jamf::InvalidDataError, "period must be one of these symbols: :#{LOG_FLUSH_INTERVAL_PERIODS.keys.join ', :'}" unless period
 
       computers = [computers] unless computers.is_a? Array
 
       # log flushes can be really slow
-      api.timeout = 1800 unless orig_timeout && orig_timeout > 1800
+      cnx.timeout = 1800 unless orig_timeout && orig_timeout > 1800
 
-      return api.delete_rsrc "#{LOG_FLUSH_RSRC}/policy/id/#{pol_id}/interval/#{older_than}+#{period}" if computers.empty?
+      return cnx.c_delete "#{LOG_FLUSH_RSRC}/policy/id/#{pol_id}/interval/#{older_than}+#{period}" if computers.empty?
 
-      flush_logs_for_specific_computers pol_id, older_than, period, computers, api
+      flush_logs_for_specific_computers pol_id, older_than, period, computers, cnx
     ensure
-      api.timeout = orig_timeout
+      cnx.timeout = orig_timeout
     end
 
     # use an XML body in a DELETE request to flush logs for
     # a list of computers - used by the flush_logs class method
-    def self.flush_logs_for_specific_computers(pol_id, older_than, period, computers, api)
+    def self.flush_logs_for_specific_computers(pol_id, older_than, period, computers, cnx)
       # build the xml body for a DELETE request
-      xml_doc = REXML::Document.new JSS::APIConnection::XML_HEADER
+      xml_doc = REXML::Document.new Jamf::Connection::XML_HEADER
       lf = xml_doc.add_element 'logflush'
       lf.add_element('log').text = 'policy'
       lf.add_element('log_id').text = pol_id.to_s
       lf.add_element('interval').text = "#{older_than} #{period}"
       comps_elem = lf.add_element 'computers'
       computers.each do |c|
-        id = JSS::Computer.valid_id c
+        id = Jamf::Computer.valid_id c, cnx: cnx
         next unless id
 
         ce = comps_elem.add_element 'computer'
@@ -360,8 +362,8 @@ module JSS
       end
 
       # Do a DELETE request with a body.
-      api.cnx.delete(LOG_FLUSH_RSRC) do |req|
-        req.headers[JSS::APIConnection::HTTP_CONTENT_TYPE_HEADER] = JSS::APIConnection::MIME_XML
+      cnx.delete(LOG_FLUSH_RSRC) do |req|
+        req.headers[Jamf::Connection::HTTP_CONTENT_TYPE_HEADER] = Jamf::Connection::MIME_XML
         req.body = xml_doc.to_s
       end
     end
@@ -694,7 +696,7 @@ module JSS
 
     # @see APIObject#initialize
     #
-    def initialize(args = {})
+    def initialize(**args)
       super
 
       if @in_jss
@@ -702,7 +704,7 @@ module JSS
         @target_drive = gen[:target_drive]
         @offline = gen[:offline]
         @enabled = gen[:enabled]
-        @site = JSS::APIObject.get_name(gen[:site][:name])
+        @site = Jamf::APIObject.get_name(gen[:site][:name])
         @override_default_settings = gen[:override_default_settings]
         @trigger = gen[:trigger]
         @trigger_events = {
@@ -755,7 +757,7 @@ module JSS
 
         uint = @init_data[:user_interaction]
         @user_may_defer = uint[:allow_users_to_defer]
-        @user_may_defer_until = JSS.parse_datetime uint[:allow_deferral_until_utc]
+        @user_may_defer_until = Jamf.parse_time uint[:allow_deferral_until_utc]
         @user_message_start =  uint[:message_start]
         @user_message_finish = uint[:message_finish]
 
@@ -800,7 +802,7 @@ module JSS
         @reboot_options[:no_user_logged_in] = 'Do not restart'
       end
 
-      @scope ||= JSS::Scopable::Scope.new(:computers, all_computers: false)
+      @scope ||= Jamf::Scopable::Scope.new(:computers, all_computers: false)
     end # init
 
     ###### General
@@ -813,7 +815,7 @@ module JSS
     #
     def enabled=(new_val)
       return if @enabled == new_val
-      @enabled = JSS::Validate.boolean new_val
+      @enabled = Jamf::Validate.boolean new_val
       @need_to_update = true
     end
 
@@ -834,7 +836,7 @@ module JSS
     # @return [void]
     #
     def frequency=(freq)
-      raise JSS::InvalidDataError, "New frequency must be one of :#{FREQUENCIES.keys.join ', :'}" unless FREQUENCIES.key?(freq) || FREQUENCIES.value?(freq)
+      raise Jamf::InvalidDataError, "New frequency must be one of :#{FREQUENCIES.keys.join ', :'}" unless FREQUENCIES.key?(freq) || FREQUENCIES.value?(freq)
 
       freq = freq.is_a?(Symbol) ? FREQUENCIES[freq] : freq
       return if freq == @frequency
@@ -859,7 +861,7 @@ module JSS
     #
     def retry_event=(evt)
       validate_retry_opt
-      raise JSS::InvalidDataError, "Retry event must be one of :#{RETRY_EVENTS.keys.join ', :'}" unless RETRY_EVENTS.key?(evt) || RETRY_EVENTS.value?(evt)
+      raise Jamf::InvalidDataError, "Retry event must be one of :#{RETRY_EVENTS.keys.join ', :'}" unless RETRY_EVENTS.key?(evt) || RETRY_EVENTS.value?(evt)
 
       evt = evt.is_a?(Symbol) ? RETRY_EVENTS[evt] : evt
       return if evt == @retry_event
@@ -891,7 +893,7 @@ module JSS
     #
     def retry_attempts=(int)
       validate_retry_opt
-      raise JSS::InvalidDataError, 'Retry attempts must be an integer from 0-10' unless int.is_a?(Integer) && (-1..10).include?(int)
+      raise Jamf::InvalidDataError, 'Retry attempts must be an integer from 0-10' unless int.is_a?(Integer) && (-1..10).include?(int)
 
       # if zero or -1, turn off retries
       if int <= 0
@@ -917,7 +919,7 @@ module JSS
     # @return [void]
     def notify_failed_retries=(bool)
       validate_retry_opt
-      bool = JSS::Validate.boolean bool
+      bool = Jamf::Validate.boolean bool
       return if @notify_failed_retries == bool
 
       @notify_failed_retries = bool
@@ -931,7 +933,7 @@ module JSS
     # @return [void]
     #
     def target_drive=(path_to_drive)
-      raise JSS::InvalidDataError, 'Path to target drive must be absolute' unless path_to_drive.to_s.start_with? '/'
+      raise Jamf::InvalidDataError, 'Path to target drive must be absolute' unless path_to_drive.to_s.start_with? '/'
       @target_drive = path_to_drive.to_s
       @need_to_update = true
     end
@@ -943,7 +945,7 @@ module JSS
     # @return [void]
     #
     def offline=(new_val)
-      raise JSS::InvalidDataError, 'New value must be boolean true or false' unless JSS::TRUE_FALSE.include? new_val
+      raise Jamf::InvalidDataError, 'New value must be boolean true or false' unless Jamf::TRUE_FALSE.include? new_val
       @offline = new_val
       @need_to_update = true
     end
@@ -957,11 +959,11 @@ module JSS
     # @return [void]
     #
     def set_trigger_event(type, new_val)
-      raise JSS::InvalidDataError, "Trigger type must be one of #{TRIGGER_EVENTS.keys.join(', ')}" unless TRIGGER_EVENTS.key?(type)
+      raise Jamf::InvalidDataError, "Trigger type must be one of #{TRIGGER_EVENTS.keys.join(', ')}" unless TRIGGER_EVENTS.key?(type)
       if type == :custom
-        raise JSS::InvalidDataError, 'Custom triggers must be Strings' unless new_val.is_a? String
+        raise Jamf::InvalidDataError, 'Custom triggers must be Strings' unless new_val.is_a? String
       else
-        raise JSS::InvalidDataError, 'Non-custom triggers must be true or false' unless JSS::TRUE_FALSE.include? new_val
+        raise Jamf::InvalidDataError, 'Non-custom triggers must be true or false' unless Jamf::TRUE_FALSE.include? new_val
       end
       @trigger_events[TRIGGER_EVENTS[type]] = new_val
       @need_to_update = true
@@ -974,7 +976,7 @@ module JSS
     # @return [void]
     #
     def server_side_activation=(activation)
-      raise JSS::InvalidDataError, 'Activation must be a Time' unless activation.is_a? Time
+      raise Jamf::InvalidDataError, 'Activation must be a Time' unless activation.is_a? Time
       @server_side_limitations[:activation] = activation
       @need_to_update = true
     end
@@ -986,7 +988,7 @@ module JSS
     # @return [void]
     #
     def server_side_expiration=(expiration)
-      raise JSS::InvalidDataError, 'Expiration must be a Time' unless expiration.is_a? Time
+      raise Jamf::InvalidDataError, 'Expiration must be a Time' unless expiration.is_a? Time
       @server_side_limitations[:expiration] = expiration
       @need_to_update = true
     end
@@ -997,7 +999,7 @@ module JSS
     #
     def verify_startup_disk=(bool)
       return if @verify_startup_disk == bool
-      @verify_startup_disk = JSS::Validate.boolean bool
+      @verify_startup_disk = Jamf::Validate.boolean bool
       @need_to_update = true
     end
 
@@ -1005,7 +1007,7 @@ module JSS
     #
     def permissions_repair=(bool)
       return if @permissions_repair == bool
-      @permissions_repair = JSS::Validate.boolean bool
+      @permissions_repair = Jamf::Validate.boolean bool
       @need_to_update = true
     end
 
@@ -1013,7 +1015,7 @@ module JSS
     #
     def recon=(bool)
       return if @recon == bool
-      @recon = JSS::Validate.boolean bool
+      @recon = Jamf::Validate.boolean bool
       @need_to_update = true
     end
     alias update_inventory= recon=
@@ -1022,7 +1024,7 @@ module JSS
     #
     def fix_byhost=(bool)
       return if @fix_byhost == bool
-      @fix_byhost = JSS::Validate.boolean bool
+      @fix_byhost = Jamf::Validate.boolean bool
       @need_to_update = true
     end
 
@@ -1030,7 +1032,7 @@ module JSS
     #
     def reset_name=(bool)
       return if @reset_name == bool
-      @reset_name = JSS::Validate.boolean bool
+      @reset_name = Jamf::Validate.boolean bool
       @need_to_update = true
     end
 
@@ -1038,7 +1040,7 @@ module JSS
     #
     def flush_system_cache=(bool)
       return if @flush_system_cache == bool
-      @flush_system_cache = JSS::Validate.boolean bool
+      @flush_system_cache = Jamf::Validate.boolean bool
       @need_to_update = true
     end # see attr_reader :recon
 
@@ -1046,7 +1048,7 @@ module JSS
     #
     def install_cached_pkgs=(bool)
       return if @install_cached_pkgs == bool
-      @install_cached_pkgs = JSS::Validate.boolean bool
+      @install_cached_pkgs = Jamf::Validate.boolean bool
       @need_to_update = true
     end
 
@@ -1054,7 +1056,7 @@ module JSS
     #
     def flush_user_cache=(bool)
       return if @flush_user_cache == bool
-      @flush_user_cache = JSS::Validate.boolean bool
+      @flush_user_cache = Jamf::Validate.boolean bool
       @need_to_update = true
     end
 
@@ -1068,7 +1070,7 @@ module JSS
     # @return [void]
     #
     def no_user_logged_in=(no_user_option)
-      raise JSS::InvalidDataError, "no_user_logged_in options: #{NO_USER_LOGGED_IN.join(', ')}" unless NO_USER_LOGGED_IN.include? no_user_option
+      raise Jamf::InvalidDataError, "no_user_logged_in options: #{NO_USER_LOGGED_IN.join(', ')}" unless NO_USER_LOGGED_IN.include? no_user_option
       @reboot_options[:no_user_logged_in] = no_user_option
       @need_to_update = true
     end
@@ -1080,7 +1082,7 @@ module JSS
     # @return [void]
     #
     def user_logged_in=(logged_in_option)
-      raise JSS::InvalidDataError, "user_logged_in options: #{USER_LOGGED_IN.join(', ')}" unless USER_LOGGED_IN.include? logged_in_option
+      raise Jamf::InvalidDataError, "user_logged_in options: #{USER_LOGGED_IN.join(', ')}" unless USER_LOGGED_IN.include? logged_in_option
       @reboot_options[:user_logged_in] = logged_in_option
       @need_to_update = true
     end
@@ -1092,7 +1094,7 @@ module JSS
     # @return [void] description of returned object
     #
     def reboot_message=(message)
-      raise JSS::InvalidDataError, 'Reboot message must be a String' unless message.is_a? String
+      raise Jamf::InvalidDataError, 'Reboot message must be a String' unless message.is_a? String
       @reboot_options[:message] = message
       @need_to_update = true
     end
@@ -1104,7 +1106,7 @@ module JSS
     #
     # @return [void] description of returned object
     def user_message_start=(message)
-      raise JSS::InvalidDataError, 'User message must be a String' unless message.is_a? String
+      raise Jamf::InvalidDataError, 'User message must be a String' unless message.is_a? String
       @user_message_start = message
       @need_to_update = true
     end
@@ -1115,7 +1117,7 @@ module JSS
     #
     # @return [void] description of returned object
     def user_message_end=(message)
-      raise JSS::InvalidDataError, 'User message must be a String' unless message.is_a? String
+      raise Jamf::InvalidDataError, 'User message must be a String' unless message.is_a? String
       @user_message_finish = message
       @need_to_update = true
     end
@@ -1130,7 +1132,7 @@ module JSS
     # @return [void]
     #
     def startup_disk=(startup_disk_option)
-      raise JSS::InvalidDataError, "#{startup_disk_option} is not a valid Startup Disk" unless startup_disk_option.is_a? String
+      raise Jamf::InvalidDataError, "#{startup_disk_option} is not a valid Startup Disk" unless startup_disk_option.is_a? String
       @reboot_options[:startup_disk] = 'Specify Local Startup Disk'
       self.specify_startup = startup_disk_option
       @need_to_update = true
@@ -1144,7 +1146,7 @@ module JSS
     # @return [void]
     #
     def specify_startup=(startup_volume)
-      raise JSS::InvalidDataError, "#{startup_volume} is not a valid Startup Disk" unless startup_volume.is_a? String
+      raise Jamf::InvalidDataError, "#{startup_volume} is not a valid Startup Disk" unless startup_volume.is_a? String
       @reboot_options[:specify_startup] = startup_volume
       @need_to_update = true
     end
@@ -1169,7 +1171,7 @@ module JSS
     # @return [void]
     #
     def minutes_until_reboot=(minutes)
-      raise JSS::InvalidDataError, 'Minutes until reboot must be an Integer' unless minutes.is_a? Integer
+      raise Jamf::InvalidDataError, 'Minutes until reboot must be an Integer' unless minutes.is_a? Integer
       @reboot_options[:minutes_until_reboot] = minutes
       @need_to_update = true
     end
@@ -1182,7 +1184,7 @@ module JSS
     # @return [void]
     #
     def file_vault_2_reboot=(fv_bool)
-      raise JSS::InvalidDataError, 'FileVault 2 Reboot must be a Boolean' unless fv_bool.jss_boolean?
+      raise Jamf::InvalidDataError, 'FileVault 2 Reboot must be a Boolean' unless fv_bool.jss_boolean?
       @reboot_options[:file_vault_2_reboot] = fv_bool
       @need_to_update = true
     end
@@ -1203,7 +1205,7 @@ module JSS
     # @return [void]
     #
     def run_command=(command)
-      raise JSS::InvalidDataError, 'Command to run must be a String' unless command.is_a? String
+      raise Jamf::InvalidDataError, 'Command to run must be a String' unless command.is_a? String
       @files_processes[:run_command] = command
       @need_to_update = true
     end
@@ -1222,7 +1224,7 @@ module JSS
     # @return [void]
     #
     def update_locate_database=(bool)
-      @files_processes[:update_locate_database] = JSS::Validate.boolean bool
+      @files_processes[:update_locate_database] = Jamf::Validate.boolean bool
       @need_to_update = true
     end
 
@@ -1286,7 +1288,7 @@ module JSS
     # @return [void]
     #
     def set_search_by_path(path, delete = false)
-      raise JSS::InvalidDataError, 'Path to search for must be a String or a Pathname' unless path.is_a?(String) || path.is_a?(Pathname)
+      raise Jamf::InvalidDataError, 'Path to search for must be a String or a Pathname' unless path.is_a?(String) || path.is_a?(Pathname)
       @files_processes[:search_by_path] = path.to_s
       @files_processes[:delete_file] = delete ? true : false
       @need_to_update = true
@@ -1305,7 +1307,7 @@ module JSS
     # @return [void]
     #
     def spotlight_search=(term)
-      raise JSS::InvalidDataError, 'Spotlight search term must be a String' unless term.is_a? String
+      raise Jamf::InvalidDataError, 'Spotlight search term must be a String' unless term.is_a? String
       @files_processes[:spotlight_search] = term
       @need_to_update = true
     end
@@ -1323,7 +1325,7 @@ module JSS
     # @return [void]
     #
     def locate_file=(term)
-      raise JSS::InvalidDataError, 'Term to locate must be a String' unless term.is_a? String
+      raise Jamf::InvalidDataError, 'Term to locate must be a String' unless term.is_a? String
       @files_processes[:locate_file] = term
       @need_to_update = true
     end
@@ -1369,7 +1371,7 @@ module JSS
 
       return nil if @packages.map { |p| p[:id] }.include? id
 
-      name = JSS::Package.map_all_ids_to(:name, api: @api)[id]
+      name = Jamf::Package.map_all_ids_to(:name, cnx: @cnx)[id]
 
       pkg_data = {
         id: id,
@@ -1423,29 +1425,21 @@ module JSS
     #
     # @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
     #
@@ -1454,7 +1448,7 @@ module JSS
 
       return nil if @scripts.map { |s| s[:id] }.include? id
 
-      name = JSS::Script.map_all_ids_to(:name, api: @api)[id]
+      name = Jamf::Script.map_all_ids_to(:name, cnx: @cnx)[id]
 
       script_data = {
         id: id,
@@ -1521,11 +1515,11 @@ module JSS
     # @return [Array] the scripts array
     #
     def set_script_parameters(identifier, **opts)
-      id = JSS::Script.valid_id identifier, api: @api
-      raise JSS::NoSuchItemError, "No script matches '#{identifier}'" unless id
+      id = Jamf::Script.valid_id identifier, cnx: @cnx
+      raise Jamf::NoSuchItemError, "No script matches '#{identifier}'" unless id
 
       script_data = @scripts.select { |s| s[:id] == id }[0]
-      raise JSS::InvalidDataError, "Script #{id} is not configured. Use add_script method." unless script_data
+      raise Jamf::InvalidDataError, "Script #{id} is not configured. Use add_script method." unless script_data
 
       opts.each do |parameter, value|
         script_data[parameter] = value if SCRIPT_PARAMETERS_AVAILABLE.include? parameter
@@ -1564,7 +1558,7 @@ module JSS
 
       return nil if @directory_bindings.map { |s| s[:id] }.include? id
 
-      name = JSS::DirectoryBinding.map_all_ids_to(:name, api: @api)[id]
+      name = Jamf::DirectoryBinding.map_all_ids_to(:name, cnx: @cnx)[id]
 
       directory_binding_data = {
         id: id,
@@ -1626,7 +1620,7 @@ module JSS
 
       return nil if @printers.map { |p| p[:id] }.include? id
 
-      name = JSS::Printer.map_all_ids_to(:name, api: @api)[id]
+      name = Jamf::Printer.map_all_ids_to(:name, cnx: @cnx)[id]
 
       printer_data = {
         id: id,
@@ -1641,7 +1635,6 @@ module JSS
       @printers
     end
 
-
     # Remove a specific printer object from the policy.
     #
     # @author Tyler Morgan
@@ -1658,15 +1651,15 @@ module JSS
 
     # Add a dock item to the policy
     def add_dock_item(identifier, action)
-      id = JSS::DockItem.valid_id identifier, api: @api
+      id = Jamf::DockItem.valid_id identifier, cnx: @cnx
 
-      raise JSS::NoSuchItemError, "No Dock Item matches '#{identifier}'" unless id
+      raise Jamf::NoSuchItemError, "No Dock Item matches '#{identifier}'" unless id
 
-      raise JSS::InvalidDataError, "Action must be one of: :#{DOCK_ITEM_ACTIONS.keys.join ', :'}" unless DOCK_ITEM_ACTIONS.include? action
+      raise Jamf::InvalidDataError, "Action must be one of: :#{DOCK_ITEM_ACTIONS.keys.join ', :'}" unless DOCK_ITEM_ACTIONS.include? action
 
       return nil if @dock_items.map { |d| d[:id] }.include? id
 
-      name = JSS::DockItem.map_all_ids_to(:name, api: @api)[id]
+      name = Jamf::DockItem.map_all_ids_to(:name, cnx: @cnx)[id]
 
       @dock_items << {id: id, name: name, action: DOCK_ITEM_ACTIONS[action]}
 
@@ -1676,7 +1669,7 @@ module JSS
 
     # Remove a dock item from the policy
     def remove_dock_item(identifier)
-      # TODO: Add validation against JSS::DockItem
+      # TODO: Add validation against Jamf::DockItem
       removed = @dock_items.delete_if { |d| d[:id] == identifier || d[:name] == identifier }
       @need_to_update = true if removed
       removed
@@ -1737,7 +1730,7 @@ module JSS
     #
     def apply_encryption_configuration(identifier)
 
-      id = JSS::DiskEncryptionConfiguration.valid_id identifier
+      id = Jamf::DiskEncryptionConfiguration.valid_id identifier
 
       return if id.nil?
 
@@ -1777,20 +1770,20 @@ module JSS
     #
     def set_management_account(action, **opts)
       # TODO: Add proper error handling
-      raise JSS::InvalidDataError, "Action must be one of: :#{MGMT_ACCOUNT_ACTIONS.keys.join ', :'}" unless MGMT_ACCOUNT_ACTIONS.include? action
+      raise Jamf::InvalidDataError, "Action must be one of: :#{MGMT_ACCOUNT_ACTIONS.keys.join ', :'}" unless MGMT_ACCOUNT_ACTIONS.include? action
 
       management_data = {}
 
       if action == :change_pw || action == :reset_pw
-        raise JSS::MissingDataError, ":password must be provided when changing management account password" if opts[:password].nil?
+        raise Jamf::MissingDataError, ":password must be provided when changing management account password" if opts[:password].nil?
 
         management_data = {
           action: MGMT_ACCOUNT_ACTIONS[action],
           managed_password: opts[:password]
         }
       elsif action == :reset_random || action == :generate_pw
-        raise JSS::MissingDataError, ":password_length must be provided when setting a random password" if opts[:password_length].nil?
-        raise JSS::InvalidDataError, ":password_length must be an Integer" unless opts[:password_length].is_a? Integer
+        raise Jamf::MissingDataError, ":password_length must be provided when setting a random password" if opts[:password_length].nil?
+        raise Jamf::InvalidDataError, ":password_length must be an Integer" unless opts[:password_length].is_a? Integer
 
         management_data = {
           action: MGMT_ACCOUNT_ACTIONS[action],
@@ -1817,9 +1810,9 @@ module JSS
     # @return [Boolean] The result of the comparison of the management password and provided text.
     #
     def verify_management_password(password)
-      raise JSS::InvalidDataError, "Management password must be a string." unless password.is_a? String
+      raise Jamf::InvalidDataError, "Management password must be a string." unless password.is_a? String
 
-      raise JSS::UnsupportedError, "'#{@management_account[:action].to_s}' does not support management passwords." unless @management_account[:action] == MGMT_ACCOUNT_ACTIONS[:change_pw] || @management_account[:action] == MGMT_ACCOUNT_ACTIONS[:reset_pw]
+      raise Jamf::UnsupportedError, "'#{@management_account[:action].to_s}' does not support management passwords." unless @management_account[:action] == MGMT_ACCOUNT_ACTIONS[:change_pw] || @management_account[:action] == MGMT_ACCOUNT_ACTIONS[:reset_pw]
 
       return Digest::SHA256.hexdigest(password).to_s == @management_account[:managed_password_sha256].to_s
     end
@@ -1836,7 +1829,7 @@ module JSS
     #
     def run(show_output = false)
       return nil unless enabled?
-      output = JSS::Client.run_jamf('policy', "-id #{id}", show_output)
+      output = Jamf::Client.run_jamf('policy', "-id #{id}", show_output)
       return nil if output.include? 'No policies were found for the ID'
       $CHILD_STATUS.exitstatus.zero? ? true : false
     end
@@ -1864,14 +1857,13 @@ module JSS
     # @return [void]
     #
     def flush_logs(older_than: 0, period: :days, computers: [])
-      raise JSS::NoSuchItemError, "Policy doesn't exist in the JSS. Use #create first." unless @in_jss
+      raise Jamf::NoSuchItemError, "Policy doesn't exist in the JSS. Use #create first." unless @in_jss
 
-      JSS::Policy.flush_logs(
+      Jamf::Policy.flush_logs(
         @id,
         older_than: older_than,
         period: period,
-        computers: computers,
-        api: @api
+        computers: computers, cnx: @cnx
       )
     end
 
@@ -1888,7 +1880,7 @@ module JSS
     def validate_retry_opt
       return if FREQUENCIES[:once_per_computer] == @frequency
 
-      raise JSS::UnsupportedError, 'Policy retry is only available when frequency is set to :once_per_computer'
+      raise Jamf::UnsupportedError, 'Policy retry is only available when frequency is set to :once_per_computer'
     end
 
     # raise an error if a package being added isn't valid
@@ -1908,22 +1900,22 @@ module JSS
         case opts[:position]
         when :start then 0
         when :end then -1
-        else JSS::Validate.integer(opts[:position])
+        else Jamf::Validate.integer(opts[:position])
         end
 
       # if the given position is past the end, set it to -1 (the end)
       opts[:position] = -1 if opts[:position] > @packages.size
 
-      id = JSS::Package.valid_id identifier, api: @api
+      id = Jamf::Package.valid_id identifier, cnx: @cnx
 
-      raise JSS::NoSuchItemError, "No package matches '#{identifier}'" unless id
+      raise Jamf::NoSuchItemError, "No package matches '#{identifier}'" unless id
 
-      raise JSS::InvalidDataError, "action must be one of: :#{PACKAGE_ACTIONS.keys.join ', :'}" unless \
+      raise Jamf::InvalidDataError, "action must be one of: :#{PACKAGE_ACTIONS.keys.join ', :'}" unless \
         PACKAGE_ACTIONS.include? opts[:action]
 
-      opts[:feu] = JSS::Validate.boolean opts[:feu]
-      opts[:fut] = JSS::Validate.boolean opts[:fut]
-      opts[:update_autorun] = JSS::Validate.boolean opts[:update_autorun]
+      opts[:feu] = Jamf::Validate.boolean opts[:feu]
+      opts[:fut] = Jamf::Validate.boolean opts[:fut]
+      opts[:update_autorun] = Jamf::Validate.boolean opts[:update_autorun]
       id
     end
 
@@ -1937,21 +1929,21 @@ module JSS
       opts[:position] ||= -1
       opts[:priority] ||= :after
 
-      raise JSS::InvalidDataError, "priority must be one of: :#{SCRIPT_PRIORITIES.keys.join ', :'}" unless \
+      raise Jamf::InvalidDataError, "priority must be one of: :#{SCRIPT_PRIORITIES.keys.join ', :'}" unless \
         SCRIPT_PRIORITIES.include? opts[:priority]
 
       opts[:position] =
         case opts[:position]
         when :start then 0
         when :end then -1
-        else JSS::Validate.integer(opts[:position])
+        else Jamf::Validate.integer(opts[:position])
         end
 
       # if the given position is past the end, set it to -1 (the end)
       opts[:position] = -1 if opts[:position] > @packages.size
 
-      id = JSS::Script.valid_id identifier, api: @api
-      raise JSS::NoSuchItemError, "No script matches '#{identifier}'" unless id
+      id = Jamf::Script.valid_id identifier, cnx: @cnx
+      raise Jamf::NoSuchItemError, "No script matches '#{identifier}'" unless id
       id
     end
 
@@ -1968,14 +1960,14 @@ module JSS
         case opts[:position]
         when :start then 0
         when :end then -1
-        else JSS::Validate.integer(opts[:position])
+        else Jamf::Validate.integer(opts[:position])
         end
 
         # if the given position is past the end, set it to -1 (the end)
         opts[:position] = -1 if opts[:position] > @directory_bindings.size
 
-        id = JSS::DirectoryBinding.valid_id identifier, api: @api
-        raise JSS::NoSuchItemError, "No directory binding matches '#{identifier}'" unless id
+        id = Jamf::DirectoryBinding.valid_id identifier, cnx: @cnx
+        raise Jamf::NoSuchItemError, "No directory binding matches '#{identifier}'" unless id
         id
     end
 
@@ -1992,29 +1984,29 @@ module JSS
         case opts[:position]
         when :start then 0
         when :end then -1
-        else JSS::Validate.integer(opts[:position])
+        else Jamf::Validate.integer(opts[:position])
         end
 
       # If the given position is past the end, set it to -1 (the end)
       opts[:position] = -1 if opts[:position] > @printers.size
 
       # Checks if action to be done with the printer object is provided and valid.
-      raise JSS::MissingDataError, "action must be provided, must be one of :#{PRINTER_ACTIONS.keys.join(':,')}." if opts[:action].nil?
-      raise JSS::InvalidDataError, "action must be one of :#{PRINTER_ACTIONS.keys.join(',:')}." unless PRINTER_ACTIONS.keys.include? opts[:action]
+      raise Jamf::MissingDataError, "action must be provided, must be one of :#{PRINTER_ACTIONS.keys.join(':,')}." if opts[:action].nil?
+      raise Jamf::InvalidDataError, "action must be one of :#{PRINTER_ACTIONS.keys.join(',:')}." unless PRINTER_ACTIONS.keys.include? opts[:action]
 
 
       # Checks if the make_default option is valid, and sets the default if needed.
-      raise JSS::InvalidDataError, "make_default must be either true or false." unless opts[:make_default].is_a?(TrueClass) || opts[:make_default].is_a?(FalseClass) || opts[:make_default].nil?
+      raise Jamf::InvalidDataError, "make_default must be either true or false." unless opts[:make_default].is_a?(TrueClass) || opts[:make_default].is_a?(FalseClass) || opts[:make_default].nil?
 
       opts[:make_default] = false if opts[:make_default].nil?
 
-      id = JSS::Printer.valid_id identifier, api: @api
-      raise JSS::NoSuchItemError, "No printer matches '#{identifier}'" unless id
+      id = Jamf::Printer.valid_id identifier, cnx: @cnx
+      raise Jamf::NoSuchItemError, "No printer matches '#{identifier}'" unless id
       id
     end
 
     def rest_xml
-      doc = REXML::Document.new APIConnection::XML_HEADER
+      doc = REXML::Document.new Jamf::Connection::XML_HEADER
       obj = doc.add_element RSRC_OBJECT_KEY.to_s
 
       general = obj.add_element 'general'