oci 2.5.10 → 2.9.0

data/lib/oci/key_management/kms_management_client_composite_operations.rb

@@ -1,4 +1,5 @@
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates.  All rights reserved.
+# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
@@ -24,6 +25,45 @@ module OCI
     # rubocop:disable Layout/EmptyLines
 
 
+    # Calls {OCI::KeyManagement::KmsManagementClient#backup_key} and then waits for the {OCI::KeyManagement::Models::Key} acted upon
+    # to enter the given state(s).
+    #
+    # @param [String] key_id The OCID of the key.
+    # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::KeyManagement::Models::Key#lifecycle_state}
+    # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::KeyManagement::KmsManagementClient#backup_key}
+    # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
+    #   * max_interval_seconds: The maximum interval between queries, in seconds.
+    #   * max_wait_seconds The maximum time to wait, in seconds
+    #
+    # @return [OCI::Response] A {OCI::Response} object with data of type {OCI::KeyManagement::Models::Key}
+    def backup_key_and_wait_for_state(key_id, wait_for_states = [], base_operation_opts = {}, waiter_opts = {})
+      operation_result = @service_client.backup_key(key_id, base_operation_opts)
+
+      return operation_result if wait_for_states.empty?
+
+      lowered_wait_for_states = wait_for_states.map(&:downcase)
+      wait_for_resource_id = operation_result.data.id
+
+      begin
+        waiter_result = @service_client.get_key(wait_for_resource_id).wait_until(
+          eval_proc: ->(response) { response.data.respond_to?(:lifecycle_state) && lowered_wait_for_states.include?(response.data.lifecycle_state.downcase) },
+          max_interval_seconds: waiter_opts.key?(:max_interval_seconds) ? waiter_opts[:max_interval_seconds] : 30,
+          max_wait_seconds: waiter_opts.key?(:max_wait_seconds) ? waiter_opts[:max_wait_seconds] : 1200
+        )
+        result_to_return = waiter_result
+
+        return result_to_return
+      rescue StandardError
+        raise OCI::Errors::CompositeOperationError.new(partial_results: [operation_result])
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:enable Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:disable Layout/EmptyLines
+
+
     # Calls {OCI::KeyManagement::KmsManagementClient#cancel_key_deletion} and then waits for the {OCI::KeyManagement::Models::Key} acted upon
     # to enter the given state(s).
     #
@@ -63,6 +103,46 @@ module OCI
     # rubocop:disable Layout/EmptyLines
 
 
+    # Calls {OCI::KeyManagement::KmsManagementClient#cancel_key_version_deletion} and then waits for the {OCI::KeyManagement::Models::KeyVersion} acted upon
+    # to enter the given state(s).
+    #
+    # @param [String] key_id The OCID of the key.
+    # @param [String] key_version_id The OCID of the key version.
+    # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::KeyManagement::Models::KeyVersion#lifecycle_state}
+    # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::KeyManagement::KmsManagementClient#cancel_key_version_deletion}
+    # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
+    #   * max_interval_seconds: The maximum interval between queries, in seconds.
+    #   * max_wait_seconds The maximum time to wait, in seconds
+    #
+    # @return [OCI::Response] A {OCI::Response} object with data of type {OCI::KeyManagement::Models::KeyVersion}
+    def cancel_key_version_deletion_and_wait_for_state(key_id, key_version_id, wait_for_states = [], base_operation_opts = {}, waiter_opts = {})
+      operation_result = @service_client.cancel_key_version_deletion(key_id, key_version_id, base_operation_opts)
+
+      return operation_result if wait_for_states.empty?
+
+      lowered_wait_for_states = wait_for_states.map(&:downcase)
+      wait_for_resource_id = operation_result.data.id
+
+      begin
+        waiter_result = @service_client.get_key_version(wait_for_resource_id).wait_until(
+          eval_proc: ->(response) { response.data.respond_to?(:lifecycle_state) && lowered_wait_for_states.include?(response.data.lifecycle_state.downcase) },
+          max_interval_seconds: waiter_opts.key?(:max_interval_seconds) ? waiter_opts[:max_interval_seconds] : 30,
+          max_wait_seconds: waiter_opts.key?(:max_wait_seconds) ? waiter_opts[:max_wait_seconds] : 1200
+        )
+        result_to_return = waiter_result
+
+        return result_to_return
+      rescue StandardError
+        raise OCI::Errors::CompositeOperationError.new(partial_results: [operation_result])
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:enable Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:disable Layout/EmptyLines
+
+
     # Calls {OCI::KeyManagement::KmsManagementClient#create_key} and then waits for the {OCI::KeyManagement::Models::Key} acted upon
     # to enter the given state(s).
     #
@@ -102,6 +182,45 @@ module OCI
     # rubocop:disable Layout/EmptyLines
 
 
+    # Calls {OCI::KeyManagement::KmsManagementClient#create_key_version} and then waits for the {OCI::KeyManagement::Models::KeyVersion} acted upon
+    # to enter the given state(s).
+    #
+    # @param [String] key_id The OCID of the key.
+    # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::KeyManagement::Models::KeyVersion#lifecycle_state}
+    # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::KeyManagement::KmsManagementClient#create_key_version}
+    # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
+    #   * max_interval_seconds: The maximum interval between queries, in seconds.
+    #   * max_wait_seconds The maximum time to wait, in seconds
+    #
+    # @return [OCI::Response] A {OCI::Response} object with data of type {OCI::KeyManagement::Models::KeyVersion}
+    def create_key_version_and_wait_for_state(key_id, wait_for_states = [], base_operation_opts = {}, waiter_opts = {})
+      operation_result = @service_client.create_key_version(key_id, base_operation_opts)
+
+      return operation_result if wait_for_states.empty?
+
+      lowered_wait_for_states = wait_for_states.map(&:downcase)
+      wait_for_resource_id = operation_result.data.id
+
+      begin
+        waiter_result = @service_client.get_key_version(wait_for_resource_id).wait_until(
+          eval_proc: ->(response) { response.data.respond_to?(:lifecycle_state) && lowered_wait_for_states.include?(response.data.lifecycle_state.downcase) },
+          max_interval_seconds: waiter_opts.key?(:max_interval_seconds) ? waiter_opts[:max_interval_seconds] : 30,
+          max_wait_seconds: waiter_opts.key?(:max_wait_seconds) ? waiter_opts[:max_wait_seconds] : 1200
+        )
+        result_to_return = waiter_result
+
+        return result_to_return
+      rescue StandardError
+        raise OCI::Errors::CompositeOperationError.new(partial_results: [operation_result])
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:enable Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:disable Layout/EmptyLines
+
+
     # Calls {OCI::KeyManagement::KmsManagementClient#disable_key} and then waits for the {OCI::KeyManagement::Models::Key} acted upon
     # to enter the given state(s).
     #
@@ -220,6 +339,47 @@ module OCI
     # rubocop:disable Layout/EmptyLines
 
 
+    # Calls {OCI::KeyManagement::KmsManagementClient#schedule_key_version_deletion} and then waits for the {OCI::KeyManagement::Models::KeyVersion} acted upon
+    # to enter the given state(s).
+    #
+    # @param [String] key_id The OCID of the key.
+    # @param [String] key_version_id The OCID of the key version.
+    # @param [OCI::KeyManagement::Models::ScheduleKeyVersionDeletionDetails] schedule_key_version_deletion_details ScheduleKeyVersionDeletionDetails
+    # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::KeyManagement::Models::KeyVersion#lifecycle_state}
+    # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::KeyManagement::KmsManagementClient#schedule_key_version_deletion}
+    # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
+    #   * max_interval_seconds: The maximum interval between queries, in seconds.
+    #   * max_wait_seconds The maximum time to wait, in seconds
+    #
+    # @return [OCI::Response] A {OCI::Response} object with data of type {OCI::KeyManagement::Models::KeyVersion}
+    def schedule_key_version_deletion_and_wait_for_state(key_id, key_version_id, schedule_key_version_deletion_details, wait_for_states = [], base_operation_opts = {}, waiter_opts = {})
+      operation_result = @service_client.schedule_key_version_deletion(key_id, key_version_id, schedule_key_version_deletion_details, base_operation_opts)
+
+      return operation_result if wait_for_states.empty?
+
+      lowered_wait_for_states = wait_for_states.map(&:downcase)
+      wait_for_resource_id = operation_result.data.id
+
+      begin
+        waiter_result = @service_client.get_key_version(wait_for_resource_id).wait_until(
+          eval_proc: ->(response) { response.data.respond_to?(:lifecycle_state) && lowered_wait_for_states.include?(response.data.lifecycle_state.downcase) },
+          max_interval_seconds: waiter_opts.key?(:max_interval_seconds) ? waiter_opts[:max_interval_seconds] : 30,
+          max_wait_seconds: waiter_opts.key?(:max_wait_seconds) ? waiter_opts[:max_wait_seconds] : 1200
+        )
+        result_to_return = waiter_result
+
+        return result_to_return
+      rescue StandardError
+        raise OCI::Errors::CompositeOperationError.new(partial_results: [operation_result])
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:enable Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:disable Layout/EmptyLines
+
+
     # Calls {OCI::KeyManagement::KmsManagementClient#update_key} and then waits for the {OCI::KeyManagement::Models::Key} acted upon
     # to enter the given state(s).
     #

data/lib/oci/key_management/kms_vault_client.rb

@@ -1,4 +1,5 @@
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates.  All rights reserved.
+# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
 
 require 'uri'
 require 'logger'
@@ -50,16 +51,14 @@ module OCI
     #   apply across all operations. This can be overridden on a per-operation basis. The default retry configuration value is `nil`, which means that an operation
     #   will not perform any retries
     def initialize(config: nil, region: nil, endpoint: nil, signer: nil, proxy_settings: nil, retry_config: nil)
-      # If the signer is an InstancePrincipalsSecurityTokenSigner and no config was supplied (which is valid for instance principals)
+      # If the signer is an InstancePrincipalsSecurityTokenSigner or SecurityTokenSigner and no config was supplied (they are self-sufficient signers)
       # then create a dummy config to pass to the ApiClient constructor. If customers wish to create a client which uses instance principals
       # and has config (either populated programmatically or loaded from a file), they must construct that config themselves and then
       # pass it to this constructor.
       #
       # If there is no signer (or the signer is not an instance principals signer) and no config was supplied, this is not valid
       # so try and load the config from the default file.
-      config ||= OCI.config unless signer.is_a?(OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner)
-      config ||= OCI::Config.new if signer.is_a?(OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner)
-      config.validate unless signer.is_a?(OCI::Auth::Signers::InstancePrincipalsSecurityTokenSigner)
+      config = OCI::Config.validate_and_build_config_with_signer(config, signer)
 
       if signer.nil?
         signer = OCI::Signer.new(
@@ -94,7 +93,7 @@ module OCI
 
       raise 'A region must be specified.' unless @region
 
-      @endpoint = OCI::Regions.get_service_endpoint(@region, :KmsVaultClient) + '/'
+      @endpoint = OCI::Regions.get_service_endpoint_for_template(@region, 'https://kms.{region}.{secondLevelDomain}') + '/'
       logger.info "KmsVaultClient endpoint set to '#{@endpoint} from region #{@region}'." if logger
     end
 
@@ -108,10 +107,91 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
+    # Backs up an encrypted file that contains all the metadata of a vault so that you can restore the vault later.
+    # You can backup a vault whether or not it contains keys. This operation only backs up the
+    # metadata of the vault, and does not include key metadata.
+    #
+    # @param [String] vault_id The OCID of the vault.
+    # @param [Hash] opts the optional parameters
+    # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
+    #   retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
+    # @option opts [String] :if_match For optimistic concurrency control. In the PUT or DELETE call for a
+    #   resource, set the `if-match` parameter to the value of the etag from a
+    #   previous GET or POST response for that resource. The resource will be
+    #   updated or deleted only if the etag you provide matches the resource's
+    #   current etag value.
+    #
+    # @option opts [String] :opc_request_id Unique identifier for the request. If provided, the returned request ID
+    #   will include this value. Otherwise, a random request ID will be
+    #   generated by the service.
+    #
+    # @option opts [String] :opc_retry_token A token that uniquely identifies a request so it can be retried in case
+    #   of a timeout or server error without risk of executing that same action
+    #   again. Retry tokens expire after 24 hours, but can be invalidated
+    #   before then due to conflicting operations (e.g., if a resource has been
+    #   deleted and purged from the system, then a retry of the original
+    #   creation request may be rejected).
+    #
+    # @option opts [OCI::KeyManagement::Models::BackupVaultDetails] :backup_vault_details BackupVaultDetails
+    # @return [Response] A Response object with data of type {OCI::KeyManagement::Models::Vault Vault}
+    def backup_vault(vault_id, opts = {})
+      logger.debug 'Calling operation KmsVaultClient#backup_vault.' if logger
+
+      raise "Missing the required parameter 'vault_id' when calling backup_vault." if vault_id.nil?
+      raise "Parameter value for 'vault_id' must not be blank" if OCI::Internal::Util.blank_string?(vault_id)
+
+      path = '/20180608/vaults/{vaultId}/actions/backup'.sub('{vaultId}', vault_id.to_s)
+      operation_signing_strategy = :standard
+
+      # rubocop:disable Style/NegatedIf
+      # Query Params
+      query_params = {}
+
+      # Header Params
+      header_params = {}
+      header_params[:accept] = 'application/json'
+      header_params[:'content-type'] = 'application/json'
+      header_params[:'if-match'] = opts[:if_match] if opts[:if_match]
+      header_params[:'opc-request-id'] = opts[:opc_request_id] if opts[:opc_request_id]
+      header_params[:'opc-retry-token'] = opts[:opc_retry_token] if opts[:opc_retry_token]
+      # rubocop:enable Style/NegatedIf
+      header_params[:'opc-retry-token'] ||= OCI::Retry.generate_opc_retry_token
+
+      post_body = @api_client.object_to_http_body(opts[:backup_vault_details])
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsVaultClient#backup_vault') do
+        @api_client.call_api(
+          :POST,
+          path,
+          endpoint,
+          header_params: header_params,
+          query_params: query_params,
+          operation_signing_strategy: operation_signing_strategy,
+          body: post_body,
+          return_type: 'OCI::KeyManagement::Models::Vault'
+        )
+      end
+      # rubocop:enable Metrics/BlockLength
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
+
+
     # Cancels the scheduled deletion of the specified vault. Canceling a scheduled deletion
-    # restores the vault and all keys in it to the respective states they were in before
-    # the deletion was scheduled. All the keys that have already been scheduled deletion before the
-    # scheduled deletion of the vault will also remain in their state and timeOfDeletion.
+    # restores the vault and all keys in it to their respective states from before their
+    # scheduled deletion. All keys that were scheduled for deletion prior to vault
+    # deletion retain their lifecycle state and time of deletion.
+    #
+    # As a provisioning operation, this call is subject to a Key Management limit that applies to
+    # the total number of requests across all provisioning write operations. Key Management might
+    # throttle this call to reject an otherwise valid request when the total rate of provisioning
+    # write operations exceeds 10 requests per second for a given tenancy.
     #
     # @param [String] vault_id The OCID of the vault.
     # @param [Hash] opts the optional parameters
@@ -184,10 +264,97 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Creates a new vault. The type of vault you create determines key
-    # placement, pricing, and available options. Options include storage
-    # isolation, a dedicated service endpoint instead of a shared service
-    # endpoint for API calls, and a dedicated hardware security module (HSM) or a multitenant HSM.
+    # Moves a vault into a different compartment within the same tenancy. For information about
+    # moving resources between compartments, see [Moving Resources to a Different Compartment](https://docs.cloud.oracle.com/iaas/Content/Identity/Tasks/managingcompartments.htm#moveRes).
+    #
+    # When provided, if-match is checked against the ETag values of the resource.
+    #
+    # As a provisioning operation, this call is subject to a Key Management limit that applies to
+    # the total number of requests across all provisioning write operations. Key Management might
+    # throttle this call to reject an otherwise valid request when the total rate of provisioning
+    # write operations exceeds 10 requests per second for a given tenancy.
+    #
+    # @param [String] vault_id The OCID of the vault.
+    # @param [OCI::KeyManagement::Models::ChangeVaultCompartmentDetails] change_vault_compartment_details
+    # @param [Hash] opts the optional parameters
+    # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
+    #   retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
+    # @option opts [String] :if_match For optimistic concurrency control. In the PUT or DELETE call for a
+    #   resource, set the `if-match` parameter to the value of the etag from a
+    #   previous GET or POST response for that resource. The resource will be
+    #   updated or deleted only if the etag you provide matches the resource's
+    #   current etag value.
+    #
+    # @option opts [String] :opc_request_id Unique identifier for the request. If provided, the returned request ID
+    #   will include this value. Otherwise, a random request ID will be
+    #   generated by the service.
+    #
+    # @option opts [String] :opc_retry_token A token that uniquely identifies a request so it can be retried in case
+    #   of a timeout or server error without risk of executing that same action
+    #   again. Retry tokens expire after 24 hours, but can be invalidated
+    #   before then due to conflicting operations (e.g., if a resource has been
+    #   deleted and purged from the system, then a retry of the original
+    #   creation request may be rejected).
+    #
+    # @return [Response] A Response object with data of type nil
+    def change_vault_compartment(vault_id, change_vault_compartment_details, opts = {})
+      logger.debug 'Calling operation KmsVaultClient#change_vault_compartment.' if logger
+
+      raise "Missing the required parameter 'vault_id' when calling change_vault_compartment." if vault_id.nil?
+      raise "Missing the required parameter 'change_vault_compartment_details' when calling change_vault_compartment." if change_vault_compartment_details.nil?
+      raise "Parameter value for 'vault_id' must not be blank" if OCI::Internal::Util.blank_string?(vault_id)
+
+      path = '/20180608/vaults/{vaultId}/actions/changeCompartment'.sub('{vaultId}', vault_id.to_s)
+      operation_signing_strategy = :standard
+
+      # rubocop:disable Style/NegatedIf
+      # Query Params
+      query_params = {}
+
+      # Header Params
+      header_params = {}
+      header_params[:accept] = 'application/json'
+      header_params[:'content-type'] = 'application/json'
+      header_params[:'if-match'] = opts[:if_match] if opts[:if_match]
+      header_params[:'opc-request-id'] = opts[:opc_request_id] if opts[:opc_request_id]
+      header_params[:'opc-retry-token'] = opts[:opc_retry_token] if opts[:opc_retry_token]
+      # rubocop:enable Style/NegatedIf
+      header_params[:'opc-retry-token'] ||= OCI::Retry.generate_opc_retry_token
+
+      post_body = @api_client.object_to_http_body(change_vault_compartment_details)
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsVaultClient#change_vault_compartment') do
+        @api_client.call_api(
+          :POST,
+          path,
+          endpoint,
+          header_params: header_params,
+          query_params: query_params,
+          operation_signing_strategy: operation_signing_strategy,
+          body: post_body
+        )
+      end
+      # rubocop:enable Metrics/BlockLength
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
+
+
+    # Creates a new vault. The type of vault you create determines key placement, pricing, and
+    # available options. Options include storage isolation, a dedicated service endpoint instead
+    # of a shared service endpoint for API calls, and either a dedicated hardware security module
+    # (HSM) or a multitenant HSM.
+    #
+    # As a provisioning operation, this call is subject to a Key Management limit that applies to
+    # the total number of requests across all provisioning write operations. Key Management might
+    # throttle this call to reject an otherwise valid request when the total rate of provisioning
+    # write operations exceeds 10 requests per second for a given tenancy.
     #
     # @param [OCI::KeyManagement::Models::CreateVaultDetails] create_vault_details CreateVaultDetails
     # @param [Hash] opts the optional parameters
@@ -254,6 +421,11 @@ module OCI
 
     # Gets the specified vault's configuration information.
     #
+    # As a provisioning operation, this call is subject to a Key Management limit that applies to
+    # the total number of requests across all provisioning read operations. Key Management might
+    # throttle this call to reject an otherwise valid request when the total rate of provisioning
+    # read operations exceeds 10 requests per second for a given tenancy.
+    #
     # @param [String] vault_id The OCID of the vault.
     # @param [Hash] opts the optional parameters
     # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
@@ -309,8 +481,70 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
+    # Gets the count of keys and key versions in the specified vault to calculate usage against service limits.
+    #
+    # @param [String] vault_id The OCID of the vault.
+    # @param [Hash] opts the optional parameters
+    # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
+    #   retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
+    # @option opts [String] :opc_request_id Unique identifier for the request. If provided, the returned request ID
+    #   will include this value. Otherwise, a random request ID will be
+    #   generated by the service.
+    #
+    # @return [Response] A Response object with data of type {OCI::KeyManagement::Models::VaultUsage VaultUsage}
+    def get_vault_usage(vault_id, opts = {})
+      logger.debug 'Calling operation KmsVaultClient#get_vault_usage.' if logger
+
+      raise "Missing the required parameter 'vault_id' when calling get_vault_usage." if vault_id.nil?
+      raise "Parameter value for 'vault_id' must not be blank" if OCI::Internal::Util.blank_string?(vault_id)
+
+      path = '/20180608/vaults/{vaultId}/usage'.sub('{vaultId}', vault_id.to_s)
+      operation_signing_strategy = :standard
+
+      # rubocop:disable Style/NegatedIf
+      # Query Params
+      query_params = {}
+
+      # Header Params
+      header_params = {}
+      header_params[:accept] = 'application/json'
+      header_params[:'content-type'] = 'application/json'
+      header_params[:'opc-request-id'] = opts[:opc_request_id] if opts[:opc_request_id]
+      # rubocop:enable Style/NegatedIf
+
+      post_body = nil
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsVaultClient#get_vault_usage') do
+        @api_client.call_api(
+          :GET,
+          path,
+          endpoint,
+          header_params: header_params,
+          query_params: query_params,
+          operation_signing_strategy: operation_signing_strategy,
+          body: post_body,
+          return_type: 'OCI::KeyManagement::Models::VaultUsage'
+        )
+      end
+      # rubocop:enable Metrics/BlockLength
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
+
+
     # Lists the vaults in the specified compartment.
     #
+    # As a provisioning operation, this call is subject to a Key Management limit that applies to
+    # the total number of requests across all provisioning read operations. Key Management might
+    # throttle this call to reject an otherwise valid request when the total rate of provisioning
+    # read operations exceeds 10 requests per second for a given tenancy.
+    #
     # @param [String] compartment_id The OCID of the compartment.
     # @param [Hash] opts the optional parameters
     # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
@@ -325,7 +559,7 @@ module OCI
     #   generated by the service.
     #
     # @option opts [String] :sort_by The field to sort by. You can specify only one sort order. The default
-    #   order for TIMECREATED is descending. The default order for DISPLAYNAME
+    #   order for `TIMECREATED` is descending. The default order for `DISPLAYNAME`
     #   is ascending.
     #
     #   Allowed values are: TIMECREATED, DISPLAYNAME
@@ -391,12 +625,178 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Schedules the deletion of the specified vault. This sets the state of the vault and
-    # keys that are not scheduled deletion in it to `PENDING_DELETION` and then deletes them
-    # after the retention period ends.
-    # The state and the timeOfDeletion of the keys that have already been scheduled for deletion
-    # will not change. If any keys in it are scheduled for deletion after the specified timeOfDeletion
-    # for the vault, the call will be rejected with status code 409.
+    # Restores a vault from an encrypted backup file. If a vault
+    # with the same OCID already exists, this operation returns a response with a
+    # 409 HTTP status error code.
+    #
+    # @param [String] compartment_id The OCID of the compartment.
+    # @param [String, IO] restore_vault_from_file_details The encrypted backup file to upload to restore the vault.
+    # @param [Hash] opts the optional parameters
+    # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
+    #   retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
+    # @option opts [Integer] :content_length The content length of the body.
+    # @option opts [String] :if_match For optimistic concurrency control. In the PUT or DELETE call for a
+    #   resource, set the `if-match` parameter to the value of the etag from a
+    #   previous GET or POST response for that resource. The resource will be
+    #   updated or deleted only if the etag you provide matches the resource's
+    #   current etag value.
+    #
+    # @option opts [String] :content_md5 The base64-encoded MD5 hash value of the body, as described in [RFC 2616](https://tools.ietf.org/rfc/rfc2616), section 14.15.
+    #   If the Content-MD5 header is present, Key Management performs an integrity check on the body of the HTTP request by computing the MD5
+    #   hash for the body and comparing it to the MD5 hash supplied in the header. If the two hashes don't match, the object is rejected and
+    #   a response with 400 Unmatched Content MD5 error is returned, along with the message: \"The computed MD5 of the request body (ACTUAL_MD5)
+    #   does not match the Content-MD5 header (HEADER_MD5).\"
+    #
+    # @option opts [String] :opc_request_id Unique identifier for the request. If provided, the returned request ID
+    #   will include this value. Otherwise, a random request ID will be
+    #   generated by the service.
+    #
+    # @option opts [String] :opc_retry_token A token that uniquely identifies a request so it can be retried in case
+    #   of a timeout or server error without risk of executing that same action
+    #   again. Retry tokens expire after 24 hours, but can be invalidated
+    #   before then due to conflicting operations (e.g., if a resource has been
+    #   deleted and purged from the system, then a retry of the original
+    #   creation request may be rejected).
+    #
+    # @return [Response] A Response object with data of type {OCI::KeyManagement::Models::Vault Vault}
+    def restore_vault_from_file(compartment_id, restore_vault_from_file_details, opts = {})
+      logger.debug 'Calling operation KmsVaultClient#restore_vault_from_file.' if logger
+
+      raise "Missing the required parameter 'compartment_id' when calling restore_vault_from_file." if compartment_id.nil?
+      raise "Missing the required parameter 'restore_vault_from_file_details' when calling restore_vault_from_file." if restore_vault_from_file_details.nil?
+
+      path = '/20180608/vaults/actions/restoreFromFile'
+      operation_signing_strategy = :standard
+
+      # rubocop:disable Style/NegatedIf
+      # Query Params
+      query_params = {}
+      query_params[:compartmentId] = compartment_id
+
+      # Header Params
+      header_params = {}
+      header_params[:accept] = 'application/json'
+      header_params[:'content-length'] = opts[:content_length] if opts[:content_length]
+      header_params[:'if-match'] = opts[:if_match] if opts[:if_match]
+      header_params[:'content-md5'] = opts[:content_md5] if opts[:content_md5]
+      header_params[:'opc-request-id'] = opts[:opc_request_id] if opts[:opc_request_id]
+      header_params[:'opc-retry-token'] = opts[:opc_retry_token] if opts[:opc_retry_token]
+      # rubocop:enable Style/NegatedIf
+      header_params[:'content-type'] ||= 'application/octet-stream'
+      header_params[:'opc-retry-token'] ||= OCI::Retry.generate_opc_retry_token
+
+      post_body = @api_client.object_to_http_body(restore_vault_from_file_details)
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsVaultClient#restore_vault_from_file') do
+        @api_client.call_api(
+          :POST,
+          path,
+          endpoint,
+          header_params: header_params,
+          query_params: query_params,
+          operation_signing_strategy: operation_signing_strategy,
+          body: post_body,
+          return_type: 'OCI::KeyManagement::Models::Vault'
+        )
+      end
+      # rubocop:enable Metrics/BlockLength
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
+
+
+    # Restores a vault from an encrypted backup file stored in Oracle Cloud Infrastructure Object
+    # Storage. If a vault with the same OCID already exists, this operation returns
+    # a response with a 409 HTTP status error code.
+    #
+    # @param [String] compartment_id The OCID of the compartment.
+    # @param [Hash] opts the optional parameters
+    # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
+    #   retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
+    # @option opts [String] :if_match For optimistic concurrency control. In the PUT or DELETE call for a
+    #   resource, set the `if-match` parameter to the value of the etag from a
+    #   previous GET or POST response for that resource. The resource will be
+    #   updated or deleted only if the etag you provide matches the resource's
+    #   current etag value.
+    #
+    # @option opts [String] :opc_request_id Unique identifier for the request. If provided, the returned request ID
+    #   will include this value. Otherwise, a random request ID will be
+    #   generated by the service.
+    #
+    # @option opts [String] :opc_retry_token A token that uniquely identifies a request so it can be retried in case
+    #   of a timeout or server error without risk of executing that same action
+    #   again. Retry tokens expire after 24 hours, but can be invalidated
+    #   before then due to conflicting operations (e.g., if a resource has been
+    #   deleted and purged from the system, then a retry of the original
+    #   creation request may be rejected).
+    #
+    # @option opts [OCI::KeyManagement::Models::RestoreVaultFromObjectStoreDetails] :restore_vault_from_object_store_details RestoreVaultFromObjectStoreDetails
+    # @return [Response] A Response object with data of type {OCI::KeyManagement::Models::Vault Vault}
+    def restore_vault_from_object_store(compartment_id, opts = {})
+      logger.debug 'Calling operation KmsVaultClient#restore_vault_from_object_store.' if logger
+
+      raise "Missing the required parameter 'compartment_id' when calling restore_vault_from_object_store." if compartment_id.nil?
+
+      path = '/20180608/vaults/actions/restoreFromObjectStore'
+      operation_signing_strategy = :standard
+
+      # rubocop:disable Style/NegatedIf
+      # Query Params
+      query_params = {}
+      query_params[:compartmentId] = compartment_id
+
+      # Header Params
+      header_params = {}
+      header_params[:accept] = 'application/json'
+      header_params[:'content-type'] = 'application/json'
+      header_params[:'if-match'] = opts[:if_match] if opts[:if_match]
+      header_params[:'opc-request-id'] = opts[:opc_request_id] if opts[:opc_request_id]
+      header_params[:'opc-retry-token'] = opts[:opc_retry_token] if opts[:opc_retry_token]
+      # rubocop:enable Style/NegatedIf
+      header_params[:'opc-retry-token'] ||= OCI::Retry.generate_opc_retry_token
+
+      post_body = @api_client.object_to_http_body(opts[:restore_vault_from_object_store_details])
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsVaultClient#restore_vault_from_object_store') do
+        @api_client.call_api(
+          :POST,
+          path,
+          endpoint,
+          header_params: header_params,
+          query_params: query_params,
+          operation_signing_strategy: operation_signing_strategy,
+          body: post_body,
+          return_type: 'OCI::KeyManagement::Models::Vault'
+        )
+      end
+      # rubocop:enable Metrics/BlockLength
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
+
+
+    # Schedules the deletion of the specified vault. This sets the lifecycle state of the vault and all keys in it
+    # that are not already scheduled for deletion to `PENDING_DELETION` and then deletes them after the
+    # retention period ends. The lifecycle state and time of deletion for keys already scheduled for deletion won't
+    # change. If any keys in the vault are scheduled to be deleted after the specified time of
+    # deletion for the vault, the call is rejected with the error code 409.
+    #
+    # As a provisioning operation, this call is subject to a Key Management limit that applies to
+    # the total number of requests across all provisioning write operations. Key Management might
+    # throttle this call to reject an otherwise valid request when the total rate of provisioning
+    # write operations exceeds 10 requests per second for a given tenancy.
     #
     # @param [String] vault_id The OCID of the vault.
     # @param [OCI::KeyManagement::Models::ScheduleVaultDeletionDetails] schedule_vault_deletion_details ScheduleVaultDeletionDetails
@@ -473,7 +873,12 @@ module OCI
 
     # Updates the properties of a vault. Specifically, you can update the
     # `displayName`, `freeformTags`, and `definedTags` properties. Furthermore,
-    # the vault must be in an `ACTIVE` or `CREATING` state to be updated.
+    # the vault must be in an ACTIVE or CREATING state to be updated.
+    #
+    # As a provisioning operation, this call is subject to a Key Management limit that applies to
+    # the total number of requests across all provisioning write operations. Key Management might
+    # throttle this call to reject an otherwise valid request when the total rate of provisioning
+    # write operations exceeds 10 requests per second for a given tenancy.
     #
     # @param [String] vault_id The OCID of the vault.
     # @param [OCI::KeyManagement::Models::UpdateVaultDetails] update_vault_details UpdateVaultDetails