cloudsmith-api 2.0.16 → 2.0.18

data/lib/cloudsmith-api/models/user_auth_token.rb

@@ -17,17 +17,27 @@ class UserAuthToken
   # API token for the authenticated user
   attr_accessor :token
 
+  # Flag indicating whether a 2FA code is required to complete authentication
+  attr_accessor :two_factor_required
+
+  # Token to use when providing 2FA code
+  attr_accessor :two_factor_token
+
   # Attribute mapping from ruby-style variable name to JSON key.
   def self.attribute_map
     {
-      :'token' => :'token'
+      :'token' => :'token',
+      :'two_factor_required' => :'two_factor_required',
+      :'two_factor_token' => :'two_factor_token'
     }
   end
 
   # Attribute type mapping.
   def self.swagger_types
     {
-      :'token' => :'String'
+      :'token' => :'String',
+      :'two_factor_required' => :'BOOLEAN',
+      :'two_factor_token' => :'String'
     }
   end
 
@@ -42,6 +52,14 @@ class UserAuthToken
     if attributes.has_key?(:'token')
       self.token = attributes[:'token']
     end
+
+    if attributes.has_key?(:'two_factor_required')
+      self.two_factor_required = attributes[:'two_factor_required']
+    end
+
+    if attributes.has_key?(:'two_factor_token')
+      self.two_factor_token = attributes[:'two_factor_token']
+    end
   end
 
   # Show invalid properties with the reasons. Usually used together with valid?
@@ -62,7 +80,9 @@ class UserAuthToken
   def ==(o)
     return true if self.equal?(o)
     self.class == o.class &&
-        token == o.token
+        token == o.token &&
+        two_factor_required == o.two_factor_required &&
+        two_factor_token == o.two_factor_token
   end
 
   # @see the `==` method
@@ -74,7 +94,7 @@ class UserAuthToken
   # Calculates hash code according to all attributes.
   # @return [Fixnum] Hash code
   def hash
-    [token].hash
+    [token, two_factor_required, two_factor_token].hash
   end
 
     # Builds the object from hash

data/lib/cloudsmith-api/models/user_auth_token_request.rb

@@ -20,11 +20,15 @@ class UserAuthTokenRequest
   # Password to authenticate with
   attr_accessor :password
 
+  # Two-factor authentication code
+  attr_accessor :totp_token
+
   # Attribute mapping from ruby-style variable name to JSON key.
   def self.attribute_map
     {
       :'email' => :'email',
-      :'password' => :'password'
+      :'password' => :'password',
+      :'totp_token' => :'totp_token'
     }
   end
 
@@ -32,7 +36,8 @@ class UserAuthTokenRequest
   def self.swagger_types
     {
       :'email' => :'String',
-      :'password' => :'String'
+      :'password' => :'String',
+      :'totp_token' => :'String'
     }
   end
 
@@ -51,6 +56,10 @@ class UserAuthTokenRequest
     if attributes.has_key?(:'password')
       self.password = attributes[:'password']
     end
+
+    if attributes.has_key?(:'totp_token')
+      self.totp_token = attributes[:'totp_token']
+    end
   end
 
   # Show invalid properties with the reasons. Usually used together with valid?
@@ -72,7 +81,8 @@ class UserAuthTokenRequest
     return true if self.equal?(o)
     self.class == o.class &&
         email == o.email &&
-        password == o.password
+        password == o.password &&
+        totp_token == o.totp_token
   end
 
   # @see the `==` method
@@ -84,7 +94,7 @@ class UserAuthTokenRequest
   # Calculates hash code according to all attributes.
   # @return [Fixnum] Hash code
   def hash
-    [email, password].hash
+    [email, password, totp_token].hash
   end
 
     # Builds the object from hash

data/lib/cloudsmith-api/models/user_authentication_token.rb

@@ -0,0 +1,205 @@
+=begin
+#Cloudsmith API (v1)
+
+#The API to the Cloudsmith Service
+
+OpenAPI spec version: v1
+Contact: support@cloudsmith.io
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.4.43
+
+=end
+
+require 'date'
+
+module CloudsmithApi
+class UserAuthenticationToken
+  # The time at which the API key was created.
+  attr_accessor :created
+
+  # The unique API key used for authentication. This will be obfuscated on read-only HTTP methods.
+  attr_accessor :key
+
+  # The slug_perm for token.
+  attr_accessor :slug_perm
+
+  # Attribute mapping from ruby-style variable name to JSON key.
+  def self.attribute_map
+    {
+      :'created' => :'created',
+      :'key' => :'key',
+      :'slug_perm' => :'slug_perm'
+    }
+  end
+
+  # Attribute type mapping.
+  def self.swagger_types
+    {
+      :'created' => :'DateTime',
+      :'key' => :'String',
+      :'slug_perm' => :'String'
+    }
+  end
+
+  # Initializes the object
+  # @param [Hash] attributes Model attributes in the form of hash
+  def initialize(attributes = {})
+    return unless attributes.is_a?(Hash)
+
+    # convert string to symbol for hash key
+    attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+    if attributes.has_key?(:'created')
+      self.created = attributes[:'created']
+    end
+
+    if attributes.has_key?(:'key')
+      self.key = attributes[:'key']
+    end
+
+    if attributes.has_key?(:'slug_perm')
+      self.slug_perm = attributes[:'slug_perm']
+    end
+  end
+
+  # Show invalid properties with the reasons. Usually used together with valid?
+  # @return Array for valid properties with the reasons
+  def list_invalid_properties
+    invalid_properties = Array.new
+    invalid_properties
+  end
+
+  # Check to see if the all the properties in the model are valid
+  # @return true if the model is valid
+  def valid?
+    true
+  end
+
+  # Checks equality by comparing each attribute.
+  # @param [Object] Object to be compared
+  def ==(o)
+    return true if self.equal?(o)
+    self.class == o.class &&
+        created == o.created &&
+        key == o.key &&
+        slug_perm == o.slug_perm
+  end
+
+  # @see the `==` method
+  # @param [Object] Object to be compared
+  def eql?(o)
+    self == o
+  end
+
+  # Calculates hash code according to all attributes.
+  # @return [Fixnum] Hash code
+  def hash
+    [created, key, slug_perm].hash
+  end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        temp_model = CloudsmithApi.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+end
+end

data/lib/cloudsmith-api/models/vagrant_package_upload.rb

@@ -55,9 +55,17 @@ class VagrantPackageUpload
 
   attr_accessor :format_url
 
+  # Amount of storage that will be freed if this package is deleted
+  attr_accessor :freeable_storage
+
+  attr_accessor :fully_qualified_name
+
   # Unique and permanent identifier for the package.
   attr_accessor :identifier_perm
 
+  # Return a map of identifier field names and their values.
+  attr_accessor :identifiers
+
   attr_accessor :indexed
 
   attr_accessor :is_cancellable
@@ -239,7 +247,10 @@ class VagrantPackageUpload
       :'files' => :'files',
       :'format' => :'format',
       :'format_url' => :'format_url',
+      :'freeable_storage' => :'freeable_storage',
+      :'fully_qualified_name' => :'fully_qualified_name',
       :'identifier_perm' => :'identifier_perm',
+      :'identifiers' => :'identifiers',
       :'indexed' => :'indexed',
       :'is_cancellable' => :'is_cancellable',
       :'is_copyable' => :'is_copyable',
@@ -323,7 +334,10 @@ class VagrantPackageUpload
       :'files' => :'Array<PackageFile>',
       :'format' => :'String',
       :'format_url' => :'String',
+      :'freeable_storage' => :'Integer',
+      :'fully_qualified_name' => :'String',
       :'identifier_perm' => :'String',
+      :'identifiers' => :'Hash<String, String>',
       :'indexed' => :'BOOLEAN',
       :'is_cancellable' => :'BOOLEAN',
       :'is_copyable' => :'BOOLEAN',
@@ -473,10 +487,24 @@ class VagrantPackageUpload
       self.format_url = attributes[:'format_url']
     end
 
+    if attributes.has_key?(:'freeable_storage')
+      self.freeable_storage = attributes[:'freeable_storage']
+    end
+
+    if attributes.has_key?(:'fully_qualified_name')
+      self.fully_qualified_name = attributes[:'fully_qualified_name']
+    end
+
     if attributes.has_key?(:'identifier_perm')
       self.identifier_perm = attributes[:'identifier_perm']
     end
 
+    if attributes.has_key?(:'identifiers')
+      if (value = attributes[:'identifiers']).is_a?(Hash)
+        self.identifiers = value
+      end
+    end
+
     if attributes.has_key?(:'indexed')
       self.indexed = attributes[:'indexed']
     end
@@ -776,7 +804,10 @@ class VagrantPackageUpload
         files == o.files &&
         format == o.format &&
         format_url == o.format_url &&
+        freeable_storage == o.freeable_storage &&
+        fully_qualified_name == o.fully_qualified_name &&
         identifier_perm == o.identifier_perm &&
+        identifiers == o.identifiers &&
         indexed == o.indexed &&
         is_cancellable == o.is_cancellable &&
         is_copyable == o.is_copyable &&
@@ -846,7 +877,7 @@ class VagrantPackageUpload
   # Calculates hash code according to all attributes.
   # @return [Fixnum] Hash code
   def hash
-    [architectures, cdn_url, checksum_md5, checksum_sha1, checksum_sha256, checksum_sha512, dependencies_checksum_md5, dependencies_url, description, display_name, distro, distro_version, downloads, epoch, extension, filename, files, format, format_url, identifier_perm, indexed, is_cancellable, is_copyable, is_deleteable, is_downloadable, is_moveable, is_quarantinable, is_quarantined, is_resyncable, is_security_scannable, is_sync_awaiting, is_sync_completed, is_sync_failed, is_sync_in_flight, is_sync_in_progress, license, name, namespace, namespace_url, num_files, origin_repository, origin_repository_url, package_type, policy_violated, provider, release, repository, repository_url, security_scan_completed_at, security_scan_started_at, security_scan_status, security_scan_status_updated_at, self_html_url, self_url, signature_url, size, slug, slug_perm, stage, stage_str, stage_updated_at, status, status_reason, status_str, status_updated_at, status_url, subtype, summary, sync_finished_at, sync_progress, tags_immutable, type_display, uploaded_at, uploader, uploader_url, version, version_orig, vulnerability_scan_results_url].hash
+    [architectures, cdn_url, checksum_md5, checksum_sha1, checksum_sha256, checksum_sha512, dependencies_checksum_md5, dependencies_url, description, display_name, distro, distro_version, downloads, epoch, extension, filename, files, format, format_url, freeable_storage, fully_qualified_name, identifier_perm, identifiers, indexed, is_cancellable, is_copyable, is_deleteable, is_downloadable, is_moveable, is_quarantinable, is_quarantined, is_resyncable, is_security_scannable, is_sync_awaiting, is_sync_completed, is_sync_failed, is_sync_in_flight, is_sync_in_progress, license, name, namespace, namespace_url, num_files, origin_repository, origin_repository_url, package_type, policy_violated, provider, release, repository, repository_url, security_scan_completed_at, security_scan_started_at, security_scan_status, security_scan_status_updated_at, self_html_url, self_url, signature_url, size, slug, slug_perm, stage, stage_str, stage_updated_at, status, status_reason, status_str, status_updated_at, status_url, subtype, summary, sync_finished_at, sync_progress, tags_immutable, type_display, uploaded_at, uploader, uploader_url, version, version_orig, vulnerability_scan_results_url].hash
   end
 
     # Builds the object from hash

data/lib/cloudsmith-api/models/vulnerability_scan_results.rb

@@ -28,11 +28,11 @@ class VulnerabilityScanResults
 
   attr_accessor :package
 
-  attr_accessor :scan
-
   # Deprecated (23-05-15): Please use 'identifier' instead. Previously: A monotonically increasing number that identified a scan within a repository.
   attr_accessor :scan_id
 
+  attr_accessor :scans
+
   class EnumAttributeValidator
     attr_reader :datatype
     attr_reader :allowable_values
@@ -64,8 +64,8 @@ class VulnerabilityScanResults
       :'max_severity' => :'max_severity',
       :'num_vulnerabilities' => :'num_vulnerabilities',
       :'package' => :'package',
-      :'scan' => :'scan',
-      :'scan_id' => :'scan_id'
+      :'scan_id' => :'scan_id',
+      :'scans' => :'scans'
     }
   end
 
@@ -78,8 +78,8 @@ class VulnerabilityScanResults
       :'max_severity' => :'String',
       :'num_vulnerabilities' => :'Integer',
       :'package' => :'PackageVulnerability',
-      :'scan' => :'VulnerabilityScan',
-      :'scan_id' => :'Integer'
+      :'scan_id' => :'Integer',
+      :'scans' => :'Array<VulnerabilityScan>'
     }
   end
 
@@ -117,13 +117,15 @@ class VulnerabilityScanResults
       self.package = attributes[:'package']
     end
 
-    if attributes.has_key?(:'scan')
-      self.scan = attributes[:'scan']
-    end
-
     if attributes.has_key?(:'scan_id')
       self.scan_id = attributes[:'scan_id']
     end
+
+    if attributes.has_key?(:'scans')
+      if (value = attributes[:'scans']).is_a?(Array)
+        self.scans = value
+      end
+    end
   end
 
   # Show invalid properties with the reasons. Usually used together with valid?
@@ -138,14 +140,14 @@ class VulnerabilityScanResults
       invalid_properties.push('invalid value for "package", package cannot be nil.')
     end
 
-    if @scan.nil?
-      invalid_properties.push('invalid value for "scan", scan cannot be nil.')
-    end
-
     if @scan_id.nil?
       invalid_properties.push('invalid value for "scan_id", scan_id cannot be nil.')
     end
 
+    if @scans.nil?
+      invalid_properties.push('invalid value for "scans", scans cannot be nil.')
+    end
+
     invalid_properties
   end
 
@@ -156,8 +158,8 @@ class VulnerabilityScanResults
     max_severity_validator = EnumAttributeValidator.new('String', ['Unknown', 'Low', 'Medium', 'High', 'Critical'])
     return false unless max_severity_validator.valid?(@max_severity)
     return false if @package.nil?
-    return false if @scan.nil?
     return false if @scan_id.nil?
+    return false if @scans.nil?
     true
   end
 
@@ -182,8 +184,8 @@ class VulnerabilityScanResults
         max_severity == o.max_severity &&
         num_vulnerabilities == o.num_vulnerabilities &&
         package == o.package &&
-        scan == o.scan &&
-        scan_id == o.scan_id
+        scan_id == o.scan_id &&
+        scans == o.scans
   end
 
   # @see the `==` method
@@ -195,7 +197,7 @@ class VulnerabilityScanResults
   # Calculates hash code according to all attributes.
   # @return [Fixnum] Hash code
   def hash
-    [created_at, has_vulnerabilities, identifier, max_severity, num_vulnerabilities, package, scan, scan_id].hash
+    [created_at, has_vulnerabilities, identifier, max_severity, num_vulnerabilities, package, scan_id, scans].hash
   end
 
     # Builds the object from hash

data/lib/cloudsmith-api/version.rb

@@ -11,5 +11,5 @@ Swagger Codegen version: 2.4.43
 =end
 
 module CloudsmithApi
-  VERSION = '2.0.16'
+  VERSION = '2.0.18'
 end

data/lib/cloudsmith-api.rb

@@ -85,6 +85,7 @@ require 'cloudsmith-api/models/hex_upstream_request_patch'
 require 'cloudsmith-api/models/history'
 require 'cloudsmith-api/models/history_fieldset'
 require 'cloudsmith-api/models/history_fieldset_raw'
+require 'cloudsmith-api/models/inline_response_200'
 require 'cloudsmith-api/models/luarocks_package_upload'
 require 'cloudsmith-api/models/luarocks_package_upload_request'
 require 'cloudsmith-api/models/maven_package_upload'
@@ -117,12 +118,19 @@ require 'cloudsmith-api/models/organization_invite_request'
 require 'cloudsmith-api/models/organization_invite_update'
 require 'cloudsmith-api/models/organization_invite_update_request_patch'
 require 'cloudsmith-api/models/organization_membership'
+require 'cloudsmith-api/models/organization_membership_request_patch'
+require 'cloudsmith-api/models/organization_membership_role_update'
+require 'cloudsmith-api/models/organization_membership_role_update_request_patch'
+require 'cloudsmith-api/models/organization_membership_visibility_update'
+require 'cloudsmith-api/models/organization_membership_visibility_update_request_patch'
 require 'cloudsmith-api/models/organization_package_license_policy'
 require 'cloudsmith-api/models/organization_package_license_policy_request'
 require 'cloudsmith-api/models/organization_package_license_policy_request_patch'
 require 'cloudsmith-api/models/organization_package_vulnerability_policy'
 require 'cloudsmith-api/models/organization_package_vulnerability_policy_request'
 require 'cloudsmith-api/models/organization_package_vulnerability_policy_request_patch'
+require 'cloudsmith-api/models/organization_saml_auth'
+require 'cloudsmith-api/models/organization_saml_auth_request_patch'
 require 'cloudsmith-api/models/organization_team'
 require 'cloudsmith-api/models/organization_team_invite'
 require 'cloudsmith-api/models/organization_team_members'
@@ -214,6 +222,8 @@ require 'cloudsmith-api/models/repository_transfer_region_request'
 require 'cloudsmith-api/models/repository_webhook'
 require 'cloudsmith-api/models/repository_webhook_request'
 require 'cloudsmith-api/models/repository_webhook_request_patch'
+require 'cloudsmith-api/models/repository_x509_ecdsa_certificate'
+require 'cloudsmith-api/models/repository_x509_rsa_certificate'
 require 'cloudsmith-api/models/resources_rate_check'
 require 'cloudsmith-api/models/respository_geo_ip_enable_disable'
 require 'cloudsmith-api/models/respository_geo_ip_enable_disable_request'
@@ -252,6 +262,7 @@ require 'cloudsmith-api/models/usage_limits_raw'
 require 'cloudsmith-api/models/usage_raw'
 require 'cloudsmith-api/models/user_auth_token'
 require 'cloudsmith-api/models/user_auth_token_request'
+require 'cloudsmith-api/models/user_authentication_token'
 require 'cloudsmith-api/models/user_brief'
 require 'cloudsmith-api/models/user_profile'
 require 'cloudsmith-api/models/vagrant_package_upload'

data/spec/api/entitlements_api_spec.rb

@@ -100,6 +100,7 @@ describe 'EntitlementsApi' do
   # @option opts [BOOLEAN] :show_tokens Show entitlement token strings in results
   # @option opts [String] :query A search term for querying names of entitlements.
   # @option opts [BOOLEAN] :active If true, only include active tokens
+  # @option opts [String] :sort A field for sorting objects in ascending or descending order. Use `-` prefix for descending order (e.g., `-name`). Available options: name.
   # @return [Array<RepositoryToken>]
   describe 'entitlements_list test' do
     it 'should work' do