comet_backup_ruby_sdk 1.12.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69a41caa98a2a94326271b4b1ee4f2d7f61e98b0d62c1964ac1707e1984dca72
-  data.tar.gz: 3dce1759fcc473dcd64b592cfab33633ae31fe619ea07b0a9e13719c7981e5da
+  metadata.gz: 856c001592ef3dad994ed3d321f8fa68e9f01829770a33117f688a4d22312801
+  data.tar.gz: b31ac9bbebfd4b3696d079b15ede4fcab8c7a927e087f84651861714a38a8172
 SHA512:
-  metadata.gz: b3f505381b2cd44a90667f1de2f8fa6d4b99cffeb106e271eac055545ea7f51c57c948077baabb52025b120ded6efe0bd1bbbcf3df5b3dceabc84960b5040a3f
-  data.tar.gz: 4a3588488fb2a2da49662460438c0e8d85f7f57cb7fdd654199c30fe6c4bfd820e418872a8f0f751c1a7094d0d6b0754809c4fcb94cf98846cbbe3810eb341a0
+  metadata.gz: 1cf63478b5051ef36b844cbc82c8f20344e27a12e73898aec44e7f31f09a1cbd07e9d17ab58c0d1685de10716467d4643d90662208a331c0a3ec99eb0c96cfa2
+  data.tar.gz: ee74bad01ce9338fa8536c02a38a66e9d8838b1dfe5560b1180163f978a81a75a8c438b885a95f6c4049d15cf26908ca60146b9b51689da4e5ef12f18454c24b

data/CHANGELOG.md

@@ -1,8 +1,30 @@
 # CHANGELOG
 
+## 2022-06-03 v1.15.0
+- Based on 22.5.0
+- Add `COMPRESS_*` compression settings for Self-Backups
+- Add `RESTOREARCHIVEFORMAT_TARZSTD` for using the tar.zst archive restore format
+- Add `target_organization` parameter to support cross-tenant operations in some API methods
+
+## 2022-05-25 v1.14.0
+- Based on 22.3.7
+- Add new `REMOTESERVER_S3_GENERIC` `RemoteServerType`
+- add new `S3GenericVirtualStorageRole` support to the `RemoteServerAddress`
+
+## 2022-05-10 v1.13.0
+- Based on 22.3.5
+- Add new `RestrictRuntime`, `FromTime`, `ToTime`, `RestrictDays`, `DaysSelect` types to ScheduleConfig to add time and day restrictions in a hourly schedule.
+- Add new `TotalVmCount` to `BackupJobDetail` API.
+- Add new fields to `MacOSCodeSignProperties` to support code signing.
+- Add new `ForceUpgradeRunning`, `ApplyDeviceFilter`, and `DeviceFilter` fields to `UpdateCampaign` types to support sending a bulk upgrade to a custom query of users
+- Add new `AdminBrandingGenerateClientSpkDsm6` and `AdminBrandingGenerateClientSpkDsm7` APIs and associated types for generating and downloading Synology SPKs
+- Add new `PathAppIconImage` field to branding options types to support branding of the app icon when installed in Synology's Package Center (and other software managers)
+- Add new constants for VMDK single file restore
+
 ## 2022-01-28 v1.12.0
 - Based on 21.12.4
 - Add `AdminStoragePingDestination` API to perform a server-side Test Connections action when configuring Storage Role
+- Add `DestinationSize*` on `BackupJobDetail` struct, to track Storage Vault size measurements taken as part of jobs
 - Add `HasLicense` on `Office365MixedVirtualAccount` struct, and add `TotalLicensedMailsCount` and `TotalUnlicensedMailsCount` on `BackupJobDetail` struct, to track Office 365 license usage
 - Add `AdminWebAuthnRegistration` new `Type` field and `WEBAUTHN_DEVICE_TYPE` constants, to determine the type of hardware WebAuthn device
 - Add deprecation comments to U2F types (use WebAuthn instead), to `B2DestinationLocation.MaxConnections`, and to `Office365CustomSetting` (use Office365CustomSettingV2 instead)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    comet_backup_ruby_sdk (1.12.0)
+    comet_backup_ruby_sdk (1.14.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -81,8 +81,9 @@ end
 
 ### Running SDK test suite
 
-```ruby
-bundle exec rake rubocop
+```bash
+# safe formatting/fixing and linting
+bundle exec rake rubocop -a
 
   COMETSERVER_ADDRESS='http://127.0.0.1:8060' \
 	COMETSERVER_ADMINUSER=admin \

data/comet_backup_ruby_sdk.gemspec

@@ -12,7 +12,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'comet_backup_ruby_sdk'
-  spec.version       = '1.12.0'
+  spec.version       = '1.15.0'
   spec.authors       = ['Comet Licensing Ltd.']
   spec.email         = ['hello@cometbackup.com']
 

data/lib/comet/comet_server.rb

@@ -314,8 +314,9 @@ module Comet
     # @param [String] target_password New account password
     # @param [Number] store_recovery_code (Optional) If set to 1, store and keep a password recovery code for the generated user (>= 18.3.9)
     # @param [Number] require_password_change (Optional) If set to 1, require to reset password at the first login for the generated user (>= 20.3.4)
+    # @param [String] target_organization (Optional) If present, create the user account on behalf of another organization. Only allowed for administrator accounts in the top-level organization. (>= 22.3.7)
     # @return [Comet::CometAPIResponseMessage]
-    def admin_add_user(target_user, target_password, store_recovery_code = nil, require_password_change = nil)
+    def admin_add_user(target_user, target_password, store_recovery_code = nil, require_password_change = nil, target_organization = nil)
       submit_params = {}
       raise TypeError, "'target_user' expected String, got #{target_user.class}" unless target_user.is_a? String
 
@@ -333,6 +334,11 @@ module Comet
 
         submit_params['RequirePasswordChange'] = require_password_change
       end
+      unless target_organization.nil?
+        raise TypeError, "'target_organization' expected String, got #{target_organization.class}" unless target_organization.is_a? String
+
+        submit_params['TargetOrganization'] = target_organization
+      end
 
       body = perform_request('api/v1/admin/add-user', submit_params)
       json_body = JSON.parse body
@@ -352,8 +358,9 @@ module Comet
     #
     # @param [String] target_user New account username
     # @param [Comet::UserProfileConfig] profile_data New account profile
+    # @param [String] target_organization (Optional) If present, create the user account on behalf of another organization. Only allowed for administrator accounts in the top-level organization. (>= 22.3.7)
     # @return [Comet::CometAPIResponseMessage]
-    def admin_add_user_from_profile(target_user, profile_data)
+    def admin_add_user_from_profile(target_user, profile_data, target_organization = nil)
       submit_params = {}
       raise TypeError, "'target_user' expected String, got #{target_user.class}" unless target_user.is_a? String
 
@@ -361,6 +368,11 @@ module Comet
       raise TypeError, "'profile_data' expected Comet::UserProfileConfig, got #{profile_data.class}" unless profile_data.is_a? Comet::UserProfileConfig
 
       submit_params['ProfileData'] = profile_data.to_json
+      unless target_organization.nil?
+        raise TypeError, "'target_organization' expected String, got #{target_organization.class}" unless target_organization.is_a? String
+
+        submit_params['TargetOrganization'] = target_organization
+      end
 
       body = perform_request('api/v1/admin/add-user-from-profile', submit_params)
       json_body = JSON.parse body
@@ -551,6 +563,52 @@ module Comet
       perform_request('api/v1/admin/branding/generate-client/macos-x86_64', submit_params)
     end
 
+    # AdminBrandingGenerateClientSpkDsm6
+    #
+    # Download software (Synology SPK for DSM 6).
+    #
+    # This API requires administrator authentication credentials, unless the server is configured to allow unauthenticated software downloads.
+    # This API requires the Software Build Role to be enabled.
+    # This API requires the Auth Role to be enabled.
+    #
+    # @param [String] self_address (Optional) The external URL of this server, used to resolve conflicts
+    # @return [String]
+    def admin_branding_generate_client_spk_dsm_6(self_address = nil)
+      submit_params = {}
+      if self_address.nil?
+        submit_params['SelfAddress'] = @server_address
+      else
+        raise TypeError, "'self_address' expected String, got #{self_address.class}" unless self_address.is_a? String
+
+        submit_params['SelfAddress'] = self_address
+      end
+
+      perform_request('api/v1/admin/branding/generate-client/spk-dsm6', submit_params)
+    end
+
+    # AdminBrandingGenerateClientSpkDsm7
+    #
+    # Download software (Synology SPK for DSM 7).
+    #
+    # This API requires administrator authentication credentials, unless the server is configured to allow unauthenticated software downloads.
+    # This API requires the Software Build Role to be enabled.
+    # This API requires the Auth Role to be enabled.
+    #
+    # @param [String] self_address (Optional) The external URL of this server, used to resolve conflicts
+    # @return [String]
+    def admin_branding_generate_client_spk_dsm_7(self_address = nil)
+      submit_params = {}
+      if self_address.nil?
+        submit_params['SelfAddress'] = @server_address
+      else
+        raise TypeError, "'self_address' expected String, got #{self_address.class}" unless self_address.is_a? String
+
+        submit_params['SelfAddress'] = self_address
+      end
+
+      perform_request('api/v1/admin/branding/generate-client/spk-dsm7', submit_params)
+    end
+
     # AdminBrandingGenerateClientTest
     #
     # Check if a software download is available.
@@ -828,8 +886,10 @@ module Comet
 
     # AdminCreateInstallToken
     #
-    # Create token for silent installation (Windows only).
+    # Create token for silent installation.
+    # Currently only supported for Windows & macOS only
     # Provide the installation token to silently install the client on windows `install.exe /TOKEN=<installtoken>`
+    # Provide the installation token to silently install the client on Mac OS `sudo launchctl setenv BACKUP_APP_TOKEN "installtoken" && sudo /usr/sbin/installer -allowUntrusted -pkg "Comet Backup.pkg" -target /`
     #
     # You must supply administrator authentication credentials to use this API.
     # This API requires the Auth Role to be enabled.
@@ -1631,9 +1691,10 @@ module Comet
     # @param [String] target_id The live connection GUID
     # @param [String] destination The Storage Vault ID
     # @param [String] snapshot_id The selected backup job snapshot
-    # @param [String] tree_id (Optional) Browse objects inside subdirectory of backup snapshot
+    # @param [String] tree_id (Optional) Browse objects inside subdirectory of backup snapshot. If it is for VMDK single file restore, it should be the disk image's subtree ID.
+    # @param [Comet::VMDKSnapshotViewOptions] options (Optional) Request a list of stored objects in vmdk file
     # @return [Comet::DispatcherStoredObjectsResponse]
-    def admin_dispatcher_request_stored_objects(target_id, destination, snapshot_id, tree_id = nil)
+    def admin_dispatcher_request_stored_objects(target_id, destination, snapshot_id, tree_id = nil, options = nil)
       submit_params = {}
       raise TypeError, "'target_id' expected String, got #{target_id.class}" unless target_id.is_a? String
 
@@ -1649,6 +1710,11 @@ module Comet
 
         submit_params['TreeID'] = tree_id
       end
+      unless options.nil?
+        raise TypeError, "'options' expected Comet::VMDKSnapshotViewOptions, got #{options.class}" unless options.is_a? Comet::VMDKSnapshotViewOptions
+
+        submit_params['Options'] = options.to_json
+      end
 
       body = perform_request('api/v1/admin/dispatcher/request-stored-objects', submit_params)
       json_body = JSON.parse body
@@ -3052,13 +3118,22 @@ module Comet
     # AdminPoliciesList
     #
     # List all policy object names.
+    # For the top-level organization, the API result includes all policies for all organizations, unless the TargetOrganization parameter is present.
     #
     # You must supply administrator authentication credentials to use this API.
     # This API requires the Auth Role to be enabled.
     #
+    # @param [String] target_organization (Optional) If present, list the policies belonging to another organization. Only allowed for administrator accounts in the top-level organization. (>= 22.3.7)
     # @return [Hash{String => String}]
-    def admin_policies_list
-      body = perform_request('api/v1/admin/policies/list')
+    def admin_policies_list(target_organization = nil)
+      submit_params = {}
+      unless target_organization.nil?
+        raise TypeError, "'target_organization' expected String, got #{target_organization.class}" unless target_organization.is_a? String
+
+        submit_params['TargetOrganization'] = target_organization
+      end
+
+      body = perform_request('api/v1/admin/policies/list', submit_params)
       json_body = JSON.parse body
       check_status json_body
       ret = {}
@@ -3077,13 +3152,22 @@ module Comet
     # AdminPoliciesListFull
     #
     # Get all policy objects.
+    # For the top-level organization, the API result includes all policies for all organizations, unless the TargetOrganization parameter is present.
     #
     # You must supply administrator authentication credentials to use this API.
     # This API requires the Auth Role to be enabled.
     #
+    # @param [String] target_organization (Optional) If present, list the policies belonging to another organization. Only allowed for administrator accounts in the top-level organization. (>= 22.3.7)
     # @return [Hash{String => Comet::GroupPolicy}]
-    def admin_policies_list_full
-      body = perform_request('api/v1/admin/policies/list-full')
+    def admin_policies_list_full(target_organization = nil)
+      submit_params = {}
+      unless target_organization.nil?
+        raise TypeError, "'target_organization' expected String, got #{target_organization.class}" unless target_organization.is_a? String
+
+        submit_params['TargetOrganization'] = target_organization
+      end
+
+      body = perform_request('api/v1/admin/policies/list-full', submit_params)
       json_body = JSON.parse body
       check_status json_body
       ret = {}
@@ -3218,6 +3302,7 @@ module Comet
     # Request a new Storage Vault on behalf of a user.
     # This action does not respect the "Prevent creating new Storage Vaults (via Request)" policy setting. New Storage Vaults can be requested regardless of the policy setting.
     # Prior to Comet 19.8.0, the response type was CometAPIResponseMessage (i.e. no DestinationID field in response).
+    # The StorageProvider must exist for the target user account's organization.
     #
     # You must supply administrator authentication credentials to use this API.
     # This API requires the Auth Role to be enabled.
@@ -3257,9 +3342,17 @@ module Comet
     # You must supply administrator authentication credentials to use this API.
     # This API requires the Auth Role to be enabled.
     #
+    # @param [String] target_organization (Optional) If present, list the requestable Storage Vault options belonging to another organization. Only allowed for administrator accounts in the top-level organization. (>= 22.3.7)
     # @return [Hash{String => String}]
-    def admin_request_storage_vault_providers
-      body = perform_request('api/v1/admin/request-storage-vault-providers')
+    def admin_request_storage_vault_providers(target_organization = nil)
+      submit_params = {}
+      unless target_organization.nil?
+        raise TypeError, "'target_organization' expected String, got #{target_organization.class}" unless target_organization.is_a? String
+
+        submit_params['TargetOrganization'] = target_organization
+      end
+
+      body = perform_request('api/v1/admin/request-storage-vault-providers', submit_params)
       json_body = JSON.parse body
       check_status json_body
       ret = {}

data/lib/comet/definitions.rb

@@ -9,6 +9,18 @@
 
 module Comet
 
+  # AutoRetentionLevel: The system will automatically choose how often to run an automatic Retention Pass after each backup job.
+  BACKUPJOBAUTORETENTION_AUTOMATIC = 0
+
+  # AutoRetentionLevel: The system will run a Retention Pass after every single backup job. This is more system-intensive, but is the most responsive at freeing storage space.
+  BACKUPJOBAUTORETENTION_IMMEDIATE = 1
+
+  # AutoRetentionLevel: The system will follow the automatic ruleset for a 'High Power' device.
+  BACKUPJOBAUTORETENTION_MORE_OFTEN = 2
+
+  # AutoRetentionLevel: The system will follow the automatic ruleset for a 'Low Power' device.
+  BACKUPJOBAUTORETENTION_LESS_OFTEN = 3
+
   # JobClassification:
   JOB_CLASSIFICATION__MIN = 4000
 
@@ -144,6 +156,8 @@ module Comet
   # FtpsModeType:
   FTPS_MODE_EXPLICIT = 2
 
+  INSTALLER_METADATA_FILE = 'installer.json'
+
   # Severity:
   SEVERITY_INFO = 'I'
 
@@ -197,6 +211,15 @@ module Comet
   # RestoreType:
   RESTORETYPE_OFFICE365_CLOUD = 6
 
+  # RestoreType:
+  RESTORETYPE_VMDK_FILE = 7
+
+  # RestoreType:
+  RESTORETYPE_VMDK_FILE_NULL = 8
+
+  # RestoreType:
+  RESTORETYPE_VMDK_FILE_ARCHIVE = 9
+
   # RestoreType: RESTORETYPE_PROCESS_ARCHIVE
   RESTORETYPE_PROCESS_TARBALL = 3
 
@@ -212,6 +235,9 @@ module Comet
   # RestoreArchiveFormat: SquashFS container
   RESTOREARCHIVEFORMAT_SQFS = 3
 
+  # RestoreArchiveFormat:
+  RESTOREARCHIVEFORMAT_TARZSTD = 4
+
   # RetentionMode: If this mode is set in a RetentionPolicy, then RetentionPolicy.Ranges should be ignored.
   RETENTIONMODE_KEEP_EVERYTHING = 801
 
@@ -392,6 +418,18 @@ module Comet
   # StoredObjectType:
   STOREDOBJECTTYPE_MSSITELISTDRIVEENTITY = 'mssitelistdriveentity'
 
+  # StoredObjectType:
+  STOREDOBJECTTYPE_VMDK_FILE = 'vmdkfile'
+
+  # StoredObjectType:
+  STOREDOBJECTTYPE_VMDK_DIRECTORY = 'vmdkdir'
+
+  # StoredObjectType:
+  STOREDOBJECTTYPE_VMDK_WINEFS = 'vmdkwinefs'
+
+  # StoredObjectType:
+  STOREDOBJECTTYPE_VMDK_SYMLINK = 'vmdksymlink'
+
   # ExtraFileExclusionOSRestriction:
   OS_ANY = 0
 
@@ -430,15 +468,15 @@ module Comet
 
   DEFAULT_TIMEZONE = 'UTC'
 
-  APPLICATION_VERSION = '21.12.4'
+  APPLICATION_VERSION = '22.5.0'
 
-  APPLICATION_VERSION_MAJOR = 21
+  APPLICATION_VERSION_MAJOR = 22
 
-  APPLICATION_VERSION_MINOR = 12
+  APPLICATION_VERSION_MINOR = 5
 
-  APPLICATION_VERSION_REVISION = 4
+  APPLICATION_VERSION_REVISION = 0
 
-  RELEASE_CODENAME = 'Voyager'
+  RELEASE_CODENAME = 'Lysithea'
 
   ENCRYPTIONMETHOD_UNCONFIGURED = 0
 
@@ -448,6 +486,8 @@ module Comet
 
   TOTPREQUIRED_ERROR = 'ERR_TOTP_REQUIRED'
 
+  UNSUPPORT_VMDK_FILE_SYSTEM = 'ERR_UNSUPPORT_VMDK_FILE_SYSTEM'
+
   EMAIL_WORKER_STATE_NOT_STARTED = 0
 
   EMAIL_WORKER_STATE_STARTED = 1
@@ -615,6 +655,12 @@ module Comet
   # RemoteServerType:
   REMOTESERVER_CUSTOM = 'custom'
 
+  # RemoteServerType:
+  REMOTESERVER_S3_GENERIC = 's3'
+
+  # RemoteServerType:
+  REMOTESERVER_AWS = 'aws'
+
   LDAPSECURITYMETHOD_PLAIN = 'plain'
 
   LDAPSECURITYMETHOD_LDAPS = 'ldaps'
@@ -657,6 +703,30 @@ module Comet
   # StreamableEventType:
   SEVT__MAX = 4999
 
+  # CompressMode:
+  COMPRESS_INVALID = 0
+
+  # CompressMode:
+  COMPRESS_LVL_1 = 1
+
+  # CompressMode:
+  COMPRESS_LVL_2 = 2
+
+  # CompressMode:
+  COMPRESS_LVL_3 = 3
+
+  # CompressMode:
+  COMPRESS_LVL_4 = 4
+
+  # CompressMode:
+  COMPRESS_LVL_5 = 5
+
+  # CompressMode:
+  COMPRESS_MAX = COMPRESS_LVL_5
+
+  # CompressMode:
+  COMPRESS_DEFAULT = COMPRESS_LVL_4
+
   OFFICE365_REGION_PUBLIC = 'GlobalPublicCloud'
 
   OFFICE365_REGION_CHINA = 'ChinaCloud'

data/lib/comet/models/amazon_awsvirtual_storage_role_settings.rb

@@ -0,0 +1,93 @@
+#!/usr/bin/env ruby --enable-frozen-string-literal
+#
+# Copyright (c) 2020-2022 Comet Licensing Ltd.
+# Please see the LICENSE file for usage information.
+#
+# SPDX-License-Identifier: MIT
+#
+# frozen_string_literal: true
+
+require 'json'
+
+module Comet
+
+  # AmazonAWSVirtualStorageRoleSettings is a typed class wrapper around the underlying Comet Server API data structure.
+  class AmazonAWSVirtualStorageRoleSettings
+
+    # @type [String] master_bucket
+    attr_accessor :master_bucket
+
+    # @type [String] access_key
+    attr_accessor :access_key
+
+    # @type [String] secret_key
+    attr_accessor :secret_key
+
+    # @type [Hash] Hidden storage to preserve future properties for non-destructive roundtrip operations
+    attr_accessor :unknown_json_fields
+
+    def initialize
+      clear
+    end
+
+    def clear
+      @master_bucket = ''
+      @access_key = ''
+      @secret_key = ''
+      @unknown_json_fields = {}
+    end
+
+    # @param [String] json_string The complete object in JSON format
+    def from_json(json_string)
+      raise TypeError, "'json_string' expected String, got #{json_string.class}" unless json_string.is_a? String
+
+      from_hash(JSON.parse(json_string))
+    end
+
+    # @param [Hash] obj The complete object as a Ruby hash
+    def from_hash(obj)
+      raise TypeError, "'obj' expected Hash, got #{obj.class}" unless obj.is_a? Hash
+
+      obj.each do |k, v|
+        case k
+        when 'MasterBucket'
+          raise TypeError, "'v' expected String, got #{v.class}" unless v.is_a? String
+
+          @master_bucket = v
+        when 'AccessKey'
+          raise TypeError, "'v' expected String, got #{v.class}" unless v.is_a? String
+
+          @access_key = v
+        when 'SecretKey'
+          raise TypeError, "'v' expected String, got #{v.class}" unless v.is_a? String
+
+          @secret_key = v
+        else
+          @unknown_json_fields[k] = v
+        end
+      end
+    end
+
+    # @return [Hash] The complete object as a Ruby hash
+    def to_hash
+      ret = {}
+      ret['MasterBucket'] = @master_bucket
+      ret['AccessKey'] = @access_key
+      ret['SecretKey'] = @secret_key
+      @unknown_json_fields.each do |k, v|
+        ret[k] = v
+      end
+      ret
+    end
+
+    # @return [Hash] The complete object as a Ruby hash
+    def to_h
+      to_hash
+    end
+
+    # @return [String] The complete object as a JSON string
+    def to_json(options = {})
+      to_hash.to_json(options)
+    end
+  end
+end

data/lib/comet/models/backup_job_advanced_options.rb

@@ -32,6 +32,9 @@ module Comet
     # @type [Boolean] allow_zero_files_success
     attr_accessor :allow_zero_files_success
 
+    # @type [Number] auto_retention_level
+    attr_accessor :auto_retention_level
+
     # @type [Hash] Hidden storage to preserve future properties for non-destructive roundtrip operations
     attr_accessor :unknown_json_fields
 
@@ -42,6 +45,7 @@ module Comet
     def clear
       @stop_after = 0
       @limit_vault_speed_bps = 0
+      @auto_retention_level = 0
       @unknown_json_fields = {}
     end
 
@@ -74,6 +78,10 @@ module Comet
           @use_on_disk_indexes = v
         when 'AllowZeroFilesSuccess'
           @allow_zero_files_success = v
+        when 'AutoRetentionLevel'
+          raise TypeError, "'v' expected Numeric, got #{v.class}" unless v.is_a? Numeric
+
+          @auto_retention_level = v
         else
           @unknown_json_fields[k] = v
         end
@@ -89,6 +97,7 @@ module Comet
       ret['ReduceDiskConcurrency'] = @reduce_disk_concurrency
       ret['UseOnDiskIndexes'] = @use_on_disk_indexes
       ret['AllowZeroFilesSuccess'] = @allow_zero_files_success
+      ret['AutoRetentionLevel'] = @auto_retention_level
       @unknown_json_fields.each do |k, v|
         ret[k] = v
       end

data/lib/comet/models/backup_job_detail.rb

@@ -65,6 +65,9 @@ module Comet
     # @type [Number] download_size
     attr_accessor :download_size
 
+    # @type [Number] total_vm_count
+    attr_accessor :total_vm_count
+
     # @type [Number] total_mails_count
     attr_accessor :total_mails_count
 
@@ -117,6 +120,7 @@ module Comet
       @total_chunks = 0
       @upload_size = 0
       @download_size = 0
+      @total_vm_count = 0
       @total_mails_count = 0
       @total_sites_count = 0
       @total_accounts_count = 0
@@ -210,6 +214,10 @@ module Comet
           raise TypeError, "'v' expected Numeric, got #{v.class}" unless v.is_a? Numeric
 
           @download_size = v
+        when 'TotalVmCount'
+          raise TypeError, "'v' expected Numeric, got #{v.class}" unless v.is_a? Numeric
+
+          @total_vm_count = v
         when 'TotalMailsCount'
           raise TypeError, "'v' expected Numeric, got #{v.class}" unless v.is_a? Numeric
 
@@ -271,6 +279,9 @@ module Comet
       ret['TotalChunks'] = @total_chunks
       ret['UploadSize'] = @upload_size
       ret['DownloadSize'] = @download_size
+      unless @total_vm_count.nil?
+        ret['TotalVmCount'] = @total_vm_count
+      end
       unless @total_mails_count.nil?
         ret['TotalMailsCount'] = @total_mails_count
       end

data/lib/comet/models/backup_rule_config.rb

@@ -56,6 +56,9 @@ module Comet
     # @type [Boolean] allow_zero_files_success
     attr_accessor :allow_zero_files_success
 
+    # @type [Number] auto_retention_level
+    attr_accessor :auto_retention_level
+
     # @type [Array<Comet::ScheduleConfig>] schedules
     attr_accessor :schedules
 
@@ -80,6 +83,7 @@ module Comet
       @destination = ''
       @stop_after = 0
       @limit_vault_speed_bps = 0
+      @auto_retention_level = 0
       @schedules = []
       @event_triggers = Comet::BackupRuleEventTriggers.new
       @unknown_json_fields = {}
@@ -167,6 +171,10 @@ module Comet
           @use_on_disk_indexes = v
         when 'AllowZeroFilesSuccess'
           @allow_zero_files_success = v
+        when 'AutoRetentionLevel'
+          raise TypeError, "'v' expected Numeric, got #{v.class}" unless v.is_a? Numeric
+
+          @auto_retention_level = v
         when 'Schedules'
           if v.nil?
             @schedules = []
@@ -203,6 +211,7 @@ module Comet
       ret['ReduceDiskConcurrency'] = @reduce_disk_concurrency
       ret['UseOnDiskIndexes'] = @use_on_disk_indexes
       ret['AllowZeroFilesSuccess'] = @allow_zero_files_success
+      ret['AutoRetentionLevel'] = @auto_retention_level
       ret['Schedules'] = @schedules
       ret['EventTriggers'] = @event_triggers
       @unknown_json_fields.each do |k, v|

data/lib/comet/models/branding_options.rb

@@ -71,6 +71,9 @@ module Comet
     # @type [String] path_header_image
     attr_accessor :path_header_image
 
+    # @type [String] path_app_icon_image
+    attr_accessor :path_app_icon_image
+
     # @type [String] package_identifier
     attr_accessor :package_identifier
 
@@ -128,6 +131,7 @@ module Comet
       @path_eula_rtf = ''
       @path_tile_png = ''
       @path_header_image = ''
+      @path_app_icon_image = ''
       @package_identifier = ''
       @windows_code_sign_pkcs12file_path = ''
       @windows_code_sign_pkcs12password_format = 0
@@ -225,6 +229,10 @@ module Comet
           raise TypeError, "'v' expected String, got #{v.class}" unless v.is_a? String
 
           @path_header_image = v
+        when 'PathAppIconImage'
+          raise TypeError, "'v' expected String, got #{v.class}" unless v.is_a? String
+
+          @path_app_icon_image = v
         when 'PackageIdentifier'
           raise TypeError, "'v' expected String, got #{v.class}" unless v.is_a? String
 
@@ -296,6 +304,7 @@ module Comet
       ret['PathEulaRtf'] = @path_eula_rtf
       ret['PathTilePng'] = @path_tile_png
       ret['PathHeaderImage'] = @path_header_image
+      ret['PathAppIconImage'] = @path_app_icon_image
       ret['PackageIdentifier'] = @package_identifier
       ret['WindowsCodeSignPKCS12FilePath'] = @windows_code_sign_pkcs12file_path
       ret['WindowsCodeSignPKCS12PasswordFormat'] = @windows_code_sign_pkcs12password_format