bin/d3admin in depot3-3.0.22 vs bin/d3admin in depot3-3.0.26

@@ -459,11 +459,11 @@
 
     if pkg_id.nil?
       puts 'No edition given to make live or no matching package found'
       return
     end
-    pkg = D3::Package.new id: pkg_id
+    pkg = D3::Package.fetch id: pkg_id
 
     if pkg.status == :live
       puts "Doh, '#{pkg.edition}' is already live"
       return
     end
@@ -477,11 +477,11 @@
 
     # is the prev. live pkg in use in any policies?
     policy_warning = ''
     pkg_id_being_deprecated = D3::Package.basenames_to_live_ids[pkg.basename]
     if pkg_id_being_deprecated
-      outgoing_pkg = D3::Package.new(id: pkg_id_being_deprecated)
+      outgoing_pkg = D3::Package.fetch(id: pkg_id_being_deprecated)
       pols_used_by_old_pkg = outgoing_pkg.policy_ids
       unless pols_used_by_old_pkg.empty?
         names = pols_used_by_old_pkg.map { |pid| JSS::Policy.map_all_ids_to(:name)[pid] }.join(', ')
         policy_warning = "\n\nWARNING: the current live package is in use by these Jamf Pro Policies:\n"
         policy_warning += " #{names}\n"
@@ -506,11 +506,11 @@
   ### @return [void]
   ###
   def edit_package(pkg = nil)
     unless pkg
       pkg_id = get_pkg_from_cli_or_prompt
-      pkg = pkg_id ? D3::Package.new(id: pkg_id) : nil
+      pkg = pkg_id ? D3::Package.fetch(id: pkg_id) : nil
     end
     if pkg.nil?
       puts 'No targets given to edit or no matching package found'
       return
     end
@@ -581,11 +581,11 @@
     # check to see if the pkg is missing
     if D3::Package.package_data[pkg_id][:status] == :missing || (!JSS::Package.all_ids.include? pkg_id)
       delete_missing_package pkg_id
       return
     else
-      pkg = D3::Package.new id: pkg_id
+      pkg = D3::Package.fetch id: pkg_id
     end
 
     got_scripts = !pkg.script_ids.values.empty?
 
     if got_scripts
@@ -669,11 +669,11 @@
           end
         end # policy scripts.each
         d3_users = (D3::Package.packages_for_script(victim_script_id) - [pkgid])
         d3_users.each { |pid| puts "Script '#{victim_script_name}' in use by d3 edition '#{D3::Package.ids_to_editions[pid]}'" }
         if pol_users.empty? && d3_users.empty?
-          JSS::Script.new(id: victim_script_id).delete
+          JSS::Script.fetch(id: victim_script_id).delete
           puts "Deleted script '#{victim_script_name}'"
         end
       end # do script id
     end # if @options.keep_scripts && (not script_ids.empty?)
   end # delete_missing_package(pkgid)
@@ -732,10 +732,10 @@
     if pkg_id.nil?
       puts 'No targets given or no matching package found'
       return
     end
 
-    pkg = D3::Package.new id: pkg_id
+    pkg = D3::Package.fetch id: pkg_id
 
     pkg_deets = <<-ENDDEETS
 *****************************************
 Details about #{pkg.edition}
 JSS id: #{pkg.id}, Status: #{pkg.status}