ruby-jss 1.2.4a2 → 1.2.4a3

data/lib/jamf/api/connection.rb

@@ -183,7 +183,12 @@ module Jamf
     def initialize(url = nil, **params)
       @name = params.delete :name
       @name ||= NOT_CONNECTED
-      connect(url, params) unless params[:at_load]
+
+      @singleton_cache = {}
+      @collection_cache = {}
+      @ext_attr_cache = {}
+
+      connect(url, params) unless params[:do_not_connect]
     end
 
     # Public Instance Methods
@@ -512,17 +517,23 @@ module Jamf
 
     # Apply defaults from the Jamf.config,
     # then from the Jamf::Client,
-    # then from the module defaults
-    # to the params for the #connect method
+    # then from the Jamf module defaults
+    # to the unset params for the #connect method
     #
     # @param params[Hash] The params for #connect
     #
     # @return [Hash] The params with defaults applied
     #
     def apply_connection_defaults(params)
+      # if no port given, either directly or via URL, and the host
+      # is a jamfcloud host, always set the port to 443
+      # This should happen before the config is applied, so
+      # on-prem users can still get to jamfcoud without specifying the port
+      params[:port] = JAMFCLOUD_PORT if params[:port].nil? && params[:host].to_s.end_with?(JAMFCLOUD_DOMAIN)
+
       apply_defaults_from_config(params)
 
-      # TODO: when clients are moved over
+      # TODO: when clients are moved over to Jamf module
       # apply_defaults_from_client(params)
 
       apply_module_defaults(params)
@@ -572,7 +583,8 @@ module Jamf
     # @return [Hash] The params with defaults applied
     #
     def apply_module_defaults(params)
-      params[:port] ||= params[:host].to_s.end_with?(JAMFCLOUD_DOMAIN) ? JAMFCLOUD_PORT : ON_PREM_SSL_PORT
+      # if we have no port set by this point, assume on-prem
+      params[:port] ||= ON_PREM_SSL_PORT
       params[:timeout] ||= DFT_TIMEOUT
       params[:open_timeout] ||= DFT_OPEN_TIMEOUT
       params[:ssl_version] ||= DFT_SSL_VERSION
@@ -712,11 +724,12 @@ module Jamf
   end # class Connection
 
   # Jamf module methods dealing with the active connection
+  ########################################################
 
   # @return [Jamf::Connection] the active connection
   #
   def self.cnx
-    @active_connection ||= Connection.new
+    @active_connection ||= Connection.new do_not_connect: true
   end
 
   # Create a new Connection object and use it as the active_connection,
@@ -750,7 +763,4 @@ module Jamf
     @active_connection = connection
   end
 
-  # create the default connection
-  connect(at_load: true) unless @active_connection
-
 end # module Jamf

data/lib/jamf/api/json_objects/criterion.rb

@@ -0,0 +1,152 @@
+# Copyright 2019 Pixar
+
+#
+#    Licensed under the Apache License, Version 2.0 (the "Apache License")
+#    with the following modification; you may not use this file except in
+#    compliance with the Apache License and the following modification to it:
+#    Section 6. Trademarks. is deleted and replaced with:
+#
+#    6. Trademarks. This License does not grant permission to use the trade
+#       names, trademarks, service marks, or product names of the Licensor
+#       and its affiliates, except as required to comply with Section 4(c) of
+#       the License and to reproduce the content of the NOTICE file.
+#
+#    You may obtain a copy of the Apache License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the Apache License with the above modification is
+#    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the Apache License for the specific
+#    language governing permissions and limitations under the Apache License.
+#
+#
+
+# The module
+module Jamf
+
+  # A 'location' for a computer prestage in Jamf Pro
+  class Criterion < Jamf::JSONObject
+
+    # the acceptable strings for and/or
+    AND = 'and'.freeze
+    OR = 'or'.freeze
+
+    AND_OR = [
+      AND,
+      OR
+    ].freeze
+
+    # These are the available search-types for building criteria
+    IS = 'is'.freeze
+    IS_NOT = 'is not'.freeze
+    LIKE = 'like'.freeze
+    NOT_LIKE = 'not like'.freeze
+    HAS = 'has'.freeze
+    HAS_NOT = 'does not have'.freeze
+    MORE_THAN = 'more than'.freeze
+    GREATER_THAN = 'greater than'.freeze
+    LESS_THAN = 'less than'.freeze
+    GREATER_OR_EQUAL = 'greater than or equal'.freeze
+    LESS_OR_EQUAL = 'less than or equal'.freeze
+    BEFORE_DATE = 'before (yyyy-mm-dd)'.freeze
+    AFTER_DATE = 'after (yyyy-mm-dd)'.freeze
+    MORE_THAN_DAYS_AGO = 'more than x days ago'.freeze
+    LESS_THAN_DAYS_AGO = 'less than x days ago'.freeze
+    IN_MORE_THAN_DAYS = 'in more than x days'.freeze
+    IN_LESS_THAN_DAYS = 'in less than x days'.freeze
+    MEMBER = 'member of'.freeze
+    NOT_MEMBER = 'not member of'.freeze
+    CURRENT = 'current'.freeze
+    NOT_CURRENT = 'not current'.freeze
+    REGEX = 'matches regex'.freeze
+    NOT_REGEX = 'does not match regex'.freeze
+
+    SEARCH_TYPES = [
+      IS,
+      IS_NOT,
+      LIKE,
+      NOT_LIKE,
+      HAS,
+      HAS_NOT,
+      MORE_THAN,
+      GREATER_THAN,
+      LESS_THAN,
+      GREATER_OR_EQUAL,
+      LESS_OR_EQUAL,
+      BEFORE_DATE,
+      AFTER_DATE,
+      MORE_THAN_DAYS_AGO,
+      LESS_THAN_DAYS_AGO,
+      IN_MORE_THAN_DAYS,
+      IN_LESS_THAN_DAYS,
+      MEMBER,
+      NOT_MEMBER,
+      CURRENT,
+      NOT_CURRENT,
+      REGEX,
+      NOT_REGEX
+    ].freeze
+
+    OBJECT_MODEL = {
+
+      # @!attribute name - the attribute name for this criterion
+      #   @return [String]
+      name: {
+        class: :string,
+        required: true
+      },
+
+      # @!attribute priority - Not used? Seems to always be zero.
+      #   Order is determined by array index, so not really sure,
+      #   possibly a holdover from classic API/XML
+      #   @return [Integer]
+      priority: {
+        class: :integer
+      },
+
+      # @!attribute andOr - How this criterion is joined to the previous:
+      #   'and' or 'or', defaults to 'and'.
+      #   meaningless for the first criterion in an array
+      #   @return [String]
+      andOr: {
+        class: :string,
+        enum: Jamf::Criterion::AND_OR
+      },
+
+      # @!attribute searchType - How to compare the attribute value to
+      #   the search value
+      #   @return [String]
+      searchType: {
+        class: :string,
+        enum: Jamf::Criterion::SEARCH_TYPES,
+        required: true
+      },
+
+      # @!attribute value - the value to compare to the attribute
+      #   @return [String]
+      value: {
+        class: :string,
+        required: true
+      },
+
+      # @!attribute isOpeningParen - does this criterion start with an openParen?
+      #   @return [Boolean]
+      isOpeningParen: {
+        class: :boolean
+      },
+
+      # @!attribute isClosingParen - does this criterion end with a closeParen?
+      #   @return [Boolean]
+      isClosingParen: {
+        class: :boolean
+      }
+
+    }.freeze
+
+    parse_object_model
+
+  end # class location
+
+end # module

data/lib/jamf/api/json_objects/device_enrollment_device.rb

@@ -0,0 +1,156 @@
+# Copyright 2019 Pixar
+
+#
+#    Licensed under the Apache License, Version 2.0 (the "Apache License")
+#    with the following modification; you may not use this file except in
+#    compliance with the Apache License and the following modification to it:
+#    Section 6. Trademarks. is deleted and replaced with:
+#
+#    6. Trademarks. This License does not grant permission to use the trade
+#       names, trademarks, service marks, or product names of the Licensor
+#       and its affiliates, except as required to comply with Section 4(c) of
+#       the License and to reproduce the content of the NOTICE file.
+#
+#    You may obtain a copy of the Apache License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the Apache License with the above modification is
+#    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the Apache License for the specific
+#    language governing permissions and limitations under the Apache License.
+#
+#
+
+# The Module
+module Jamf
+
+  # Classes
+  #####################################
+
+  # A decvice enrollment defined in the JSS
+  # This is a connection to Apple's Device Enrollment Program.
+  # A single Jamf server may have many of them, and they can belong to
+  # different sites.
+  #
+  # These objects can be used to find the details of all the devices
+  # connected to them, including the device serial numbers.
+  # To see how or if those devices are assigned to prestages, see
+  # Jamf::Prestage and its subclasses ComputerPrestage and MobileDevicePrestage
+  #
+  class DeviceEnrollmentDevice < Jamf::JSONObject
+
+    # Mix-Ins
+    #####################################
+
+    extend Jamf::Immutable
+
+    # Constants
+    #####################################
+
+    PROFILE_STATUS_EMPTY = 'EMPTY'.freeze
+    PROFILE_STATUS_ASSIGNED = 'ASSIGNED'.freeze
+    PROFILE_STATUS_PUSHED = 'PUSHED'.freeze
+    PROFILE_STATUS_REMOVED = 'REMOVED'.freeze
+
+    PROFILE_STATUSES = [
+      PROFILE_STATUS_EMPTY,
+      PROFILE_STATUS_ASSIGNED,
+      PROFILE_STATUS_PUSHED,
+      PROFILE_STATUS_REMOVED
+    ].freeze
+
+    # Object Model / Attributes
+    # See APIObject class documentation for details
+    # of how the OBJECT_MODEL hash works.
+    #####################################
+    OBJECT_MODEL = {
+
+      # @!attribute id
+      #   @return [Integer]
+      id: {
+        class: :integer,
+        identifier: true
+      },
+
+      # @!attribute deviceEnrollmentProgramInstanceId
+      #   @return [Integer]
+      deviceEnrollmentProgramInstanceId: {
+        class: :integer
+      },
+
+      # @!attribute prestageId
+      #   @return [Integer]
+      prestageId: {
+        class: :integer
+      },
+
+      # @!attribute serialNumber
+      #   @return [String]
+      serialNumber: {
+        class: :string
+      },
+
+      # @!attribute description
+      #   @return [String]
+      description: {
+        class: :string
+      },
+
+      # @!attribute model
+      #   @return [String]
+      model: {
+        class: :string
+      },
+
+      # @!attribute color
+      #   @return [String]
+      color: {
+        class: :string
+      },
+
+      # @!attribute assetTag
+      #   @return [String]
+      assetTag: {
+        class: :string
+      },
+
+      # @!attribute profileStatus
+      #   @return [String]
+      profileStatus: {
+        class: :string
+      },
+
+      # @!attribute profileAssignTime
+      #   @return [Jamf::Timestamp]
+      profileAssignTime: {
+        class: Jamf::Timestamp
+      },
+
+      # @!attribute profilePushTime
+      #   @return [Jamf::Timestamp]
+      profilePushTime: {
+        class: Jamf::Timestamp
+      },
+
+      # @!attribute deviceAssignedDate
+      #   @return [Jamf::Timestamp]
+      deviceAssignedDate: {
+        class: Jamf::Timestamp
+      }
+    }.freeze
+
+    parse_object_model
+
+    # Class Methods
+    #########################################
+
+
+
+    # Instance Methods
+    #########################################
+
+  end # class
+
+end # module

data/lib/jamf/api/json_objects/device_enrollment_sync_status.rb

@@ -0,0 +1,71 @@
+# Copyright 2019 Pixar
+
+#
+#    Licensed under the Apache License, Version 2.0 (the "Apache License")
+#    with the following modification; you may not use this file except in
+#    compliance with the Apache License and the following modification to it:
+#    Section 6. Trademarks. is deleted and replaced with:
+#
+#    6. Trademarks. This License does not grant permission to use the trade
+#       names, trademarks, service marks, or product names of the Licensor
+#       and its affiliates, except as required to comply with Section 4(c) of
+#       the License and to reproduce the content of the NOTICE file.
+#
+#    You may obtain a copy of the Apache License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the Apache License with the above modification is
+#    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the Apache License for the specific
+#    language governing permissions and limitations under the Apache License.
+#
+#
+
+# The module
+module Jamf
+
+  # A 'location' for a managed object in Jamf Pro
+  class DeviceEnrollmentSyncStatus < Jamf::JSONObject
+
+    extend Jamf::Immutable
+
+    OBJECT_MODEL = {
+
+      # @!attribute syncState
+      #   @return [String]
+      syncState: {
+        class: :string
+      },
+
+      # @!attribute instanceId
+      #   @return [Integer]
+      instanceId: {
+        class: :integer
+      },
+
+      # @!attribute timestamp
+      #   @return [Jamf::Timestamp]
+      timestamp: {
+        class: Jamf::Timestamp
+      }
+    }.freeze
+
+    parse_object_model
+
+    # TEMPORARY timestamps are in UTC, but
+    # the iso8601 string isn't marked as such, so
+    # they are interpreted as localtime.
+    # i.e. the string comes as "2019-12-06T18:32:47.218"
+    # but is should be "2019-12-06T18:32:47.218Z"
+    #
+    # This resets them to the correct time
+    def initialize(*args)
+      super
+      @timestamp += @timestamp.utc_offset
+    end
+
+  end # class Country
+
+end # module