oci 2.5.10 → 2.9.0

data/lib/oci/integration/util.rb

@@ -0,0 +1,3 @@
+# 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.
+

data/lib/oci/internal/internal.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.
 
 module OCI
   # Contains internal modules and class that are not meant for public use.

data/lib/oci/internal/util.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.
 
 module OCI
   module Internal

data/lib/oci/key_management/key_management.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.
 
 module OCI
   module KeyManagement
@@ -10,6 +11,13 @@ module OCI
 end
 
 # Require models
+require 'oci/key_management/models/backup_key_details'
+require 'oci/key_management/models/backup_location'
+require 'oci/key_management/models/backup_location_bucket'
+require 'oci/key_management/models/backup_location_uri'
+require 'oci/key_management/models/backup_vault_details'
+require 'oci/key_management/models/change_key_compartment_details'
+require 'oci/key_management/models/change_vault_compartment_details'
 require 'oci/key_management/models/create_key_details'
 require 'oci/key_management/models/create_vault_details'
 require 'oci/key_management/models/decrypt_data_details'
@@ -18,17 +26,25 @@ require 'oci/key_management/models/encrypt_data_details'
 require 'oci/key_management/models/encrypted_data'
 require 'oci/key_management/models/generate_key_details'
 require 'oci/key_management/models/generated_key'
+require 'oci/key_management/models/import_key_details'
+require 'oci/key_management/models/import_key_version_details'
 require 'oci/key_management/models/key'
 require 'oci/key_management/models/key_shape'
 require 'oci/key_management/models/key_summary'
 require 'oci/key_management/models/key_version'
 require 'oci/key_management/models/key_version_summary'
+require 'oci/key_management/models/restore_key_from_object_store_details'
+require 'oci/key_management/models/restore_vault_from_object_store_details'
 require 'oci/key_management/models/schedule_key_deletion_details'
+require 'oci/key_management/models/schedule_key_version_deletion_details'
 require 'oci/key_management/models/schedule_vault_deletion_details'
 require 'oci/key_management/models/update_key_details'
 require 'oci/key_management/models/update_vault_details'
 require 'oci/key_management/models/vault'
 require 'oci/key_management/models/vault_summary'
+require 'oci/key_management/models/vault_usage'
+require 'oci/key_management/models/wrapped_import_key'
+require 'oci/key_management/models/wrapping_key'
 
 # Require generated clients
 require 'oci/key_management/kms_crypto_client'

data/lib/oci/key_management/kms_crypto_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'
@@ -44,16 +45,14 @@ module OCI
 
       @endpoint = endpoint + '/'
 
-      # 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(
@@ -82,7 +81,7 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Decrypts data using the given DecryptDataDetails resource.
+    # Decrypts data using the given [DecryptDataDetails](https://docs.cloud.oracle.com/api/#/en/key/release/datatypes/DecryptDataDetails) resource.
     #
     # @param [OCI::KeyManagement::Models::DecryptDataDetails] decrypt_data_details DecryptDataDetails
     # @param [Hash] opts the optional parameters
@@ -138,9 +137,8 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Encrypts data using the given EncryptDataDetails resource.
-    # Plaintext included in the example request is a base64-encoded value
-    # of a UTF-8 string.
+    # Encrypts data using the given [EncryptDataDetails](https://docs.cloud.oracle.com/api/#/en/key/release/datatypes/EncryptDataDetails) resource.
+    # Plaintext included in the example request is a base64-encoded value of a UTF-8 string.
     #
     # @param [OCI::KeyManagement::Models::EncryptDataDetails] encrypt_data_details EncryptDataDetails
     # @param [Hash] opts the optional parameters

data/lib/oci/key_management/kms_crypto_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

data/lib/oci/key_management/kms_management_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'
@@ -44,16 +45,14 @@ module OCI
 
       @endpoint = endpoint + '/'
 
-      # 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(
@@ -82,9 +81,89 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
+    # Backs up an encrypted file that contains all key versions and metadata of the specified key so that you can restore
+    # the key later. The file also contains the metadata of the vault that the key belonged to.
+    #
+    # @param [String] key_id The OCID of the key.
+    # @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::BackupKeyDetails] :backup_key_details BackupKeyDetails
+    # @return [Response] A Response object with data of type {OCI::KeyManagement::Models::Key Key}
+    def backup_key(key_id, opts = {})
+      logger.debug 'Calling operation KmsManagementClient#backup_key.' if logger
+
+      raise "Missing the required parameter 'key_id' when calling backup_key." if key_id.nil?
+      raise "Parameter value for 'key_id' must not be blank" if OCI::Internal::Util.blank_string?(key_id)
+
+      path = '/20180608/keys/{keyId}/actions/backup'.sub('{keyId}', key_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_key_details])
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsManagementClient#backup_key') 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::Key'
+        )
+      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 key. Canceling
-    # a scheduled deletion restores the key to the respective
-    # states they were in before the deletion was scheduled.
+    # a scheduled deletion restores the key's lifecycle state to what
+    # it was before its scheduled 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] key_id The OCID of the key.
     # @param [Hash] opts the optional parameters
@@ -157,7 +236,178 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Creates a new key.
+    # Cancels the scheduled deletion of the specified key version. Canceling
+    # a scheduled deletion restores the key version to its lifecycle state from
+    # before its scheduled 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] key_id The OCID of the key.
+    # @param [String] key_version_id The OCID of the key version.
+    # @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 {OCI::KeyManagement::Models::KeyVersion KeyVersion}
+    def cancel_key_version_deletion(key_id, key_version_id, opts = {})
+      logger.debug 'Calling operation KmsManagementClient#cancel_key_version_deletion.' if logger
+
+      raise "Missing the required parameter 'key_id' when calling cancel_key_version_deletion." if key_id.nil?
+      raise "Missing the required parameter 'key_version_id' when calling cancel_key_version_deletion." if key_version_id.nil?
+      raise "Parameter value for 'key_id' must not be blank" if OCI::Internal::Util.blank_string?(key_id)
+      raise "Parameter value for 'key_version_id' must not be blank" if OCI::Internal::Util.blank_string?(key_version_id)
+
+      path = '/20180608/keys/{keyId}/keyVersions/{keyVersionId}/actions/cancelDeletion'.sub('{keyId}', key_id.to_s).sub('{keyVersionId}', key_version_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 = nil
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsManagementClient#cancel_key_version_deletion') 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::KeyVersion'
+        )
+      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
+
+
+    # Moves a key 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 key.
+    #
+    # 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] key_id The OCID of the key.
+    # @param [OCI::KeyManagement::Models::ChangeKeyCompartmentDetails] change_key_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_key_compartment(key_id, change_key_compartment_details, opts = {})
+      logger.debug 'Calling operation KmsManagementClient#change_key_compartment.' if logger
+
+      raise "Missing the required parameter 'key_id' when calling change_key_compartment." if key_id.nil?
+      raise "Missing the required parameter 'change_key_compartment_details' when calling change_key_compartment." if change_key_compartment_details.nil?
+      raise "Parameter value for 'key_id' must not be blank" if OCI::Internal::Util.blank_string?(key_id)
+
+      path = '/20180608/keys/{keyId}/actions/changeCompartment'.sub('{keyId}', key_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_key_compartment_details)
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsManagementClient#change_key_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 master encryption key.
+    #
+    # As a management operation, this call is subject to a Key Management limit that applies to the total
+    # number of requests across all management write operations. Key Management might throttle this call
+    # to reject an otherwise valid request when the total rate of management write operations exceeds 10
+    # requests per second for a given tenancy.
+    #
     # @param [OCI::KeyManagement::Models::CreateKeyDetails] create_key_details CreateKeyDetails
     # @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
@@ -221,8 +471,13 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Generates new cryptographic material for a key. The key must be in an `ENABLED` state to be
-    # rotated.
+    # Generates a new [KeyVersion](https://docs.cloud.oracle.com/api/#/en/key/release/KeyVersion/) resource that provides new cryptographic
+    # material for a master encryption key. The key must be in an `ENABLED` state to be rotated.
+    #
+    # As a management operation, this call is subject to a Key Management limit that applies to the total number
+    # of requests across all  management write operations. Key Management might throttle this call to reject an
+    # otherwise valid request when the total rate of management write operations exceeds 10 requests per second
+    # for a given tenancy.
     #
     # @param [String] key_id The OCID of the key.
     # @param [Hash] opts the optional parameters
@@ -288,8 +543,13 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Disables a key to make it unavailable for encryption
-    # or decryption.
+    # Disables a master encryption key so it can no longer be used for encryption, decryption, or
+    # generating new data encryption keys.
+    #
+    # As a management operation, this call is subject to a Key Management limit that applies to the total number
+    # of requests across all management write operations. Key Management might throttle this call to reject an
+    # otherwise valid request when the total rate of management write operations exceeds 10 requests per second
+    # for a given tenancy.
     #
     # @param [String] key_id The OCID of the key.
     # @param [Hash] opts the optional parameters
@@ -362,8 +622,13 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Enables a key to make it available for encryption or
-    # decryption.
+    # Enables a master encryption key so it can be used for encryption, decryption, or
+    # generating new data encryption keys.
+    #
+    # As a management operation, this call is subject to a Key Management limit that applies to the total number
+    # of requests across all management write operations. Key Management might throttle this call to reject an
+    # otherwise valid request when the total rate of management write operations exceeds 10 requests per second
+    # for a given tenancy.
     #
     # @param [String] key_id The OCID of the key.
     # @param [Hash] opts the optional parameters
@@ -436,7 +701,12 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Gets information about the specified key.
+    # Gets information about the specified master encryption key.
+    #
+    # As a management operation, this call is subject to a Key Management limit that applies to the total number
+    # of requests across all management read operations. Key Management might throttle this call to reject an
+    # otherwise valid request when the total rate of management read operations exceeds 10 requests per second for
+    # a given tenancy.
     #
     # @param [String] key_id The OCID of the key.
     # @param [Hash] opts the optional parameters
@@ -495,6 +765,11 @@ module OCI
 
     # Gets information about the specified key version.
     #
+    # As a management operation, this call is subject to a Key Management limit that applies to the total number
+    # of requests across all management read operations. Key Management might throttle this call to reject an
+    # otherwise valid request when the total rate of management read operations exceeds 10 requests per second
+    # for a given tenancy.
+    #
     # @param [String] key_id The OCID of the key.
     # @param [String] key_version_id The OCID of the key version.
     # @param [Hash] opts the optional parameters
@@ -553,54 +828,27 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Lists all key versions for the specified key.
+    # Gets details about the public RSA wrapping key associated with the vault in the endpoint. Each vault has an RSA key-pair that wraps and
+    # unwraps AES key material for import into Key Management.
     #
-    # @param [String] key_id The OCID of the key.
     # @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] :limit The maximum number of items to return in a paginated \"List\" call.
-    #
-    # @option opts [String] :page The value of the `opc-next-page` response header
-    #   from the previous \"List\" call.
-    #
     # @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] :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
-    #   is ascending.
-    #
-    #   Allowed values are: TIMECREATED, DISPLAYNAME
-    # @option opts [String] :sort_order The sort order to use, either ascending (`ASC`) or descending (`DESC`).
-    #
-    #   Allowed values are: ASC, DESC
-    # @return [Response] A Response object with data of type Array<{OCI::KeyManagement::Models::KeyVersionSummary KeyVersionSummary}>
-    def list_key_versions(key_id, opts = {})
-      logger.debug 'Calling operation KmsManagementClient#list_key_versions.' if logger
-
-      raise "Missing the required parameter 'key_id' when calling list_key_versions." if key_id.nil?
-
-      if opts[:sort_by] && !%w[TIMECREATED DISPLAYNAME].include?(opts[:sort_by])
-        raise 'Invalid value for "sort_by", must be one of TIMECREATED, DISPLAYNAME.'
-      end
+    # @return [Response] A Response object with data of type {OCI::KeyManagement::Models::WrappingKey WrappingKey}
+    def get_wrapping_key(opts = {})
+      logger.debug 'Calling operation KmsManagementClient#get_wrapping_key.' if logger
 
-      if opts[:sort_order] && !%w[ASC DESC].include?(opts[:sort_order])
-        raise 'Invalid value for "sort_order", must be one of ASC, DESC.'
-      end
-      raise "Parameter value for 'key_id' must not be blank" if OCI::Internal::Util.blank_string?(key_id)
 
-      path = '/20180608/keys/{keyId}/keyVersions'.sub('{keyId}', key_id.to_s)
+      path = '/20180608/wrappingKeys'
       operation_signing_strategy = :standard
 
       # rubocop:disable Style/NegatedIf
       # Query Params
       query_params = {}
-      query_params[:limit] = opts[:limit] if opts[:limit]
-      query_params[:page] = opts[:page] if opts[:page]
-      query_params[:sortBy] = opts[:sort_by] if opts[:sort_by]
-      query_params[:sortOrder] = opts[:sort_order] if opts[:sort_order]
 
       # Header Params
       header_params = {}
@@ -612,7 +860,7 @@ module OCI
       post_body = nil
 
       # rubocop:disable Metrics/BlockLength
-      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsManagementClient#list_key_versions') do
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsManagementClient#get_wrapping_key') do
         @api_client.call_api(
           :GET,
           path,
@@ -621,7 +869,7 @@ module OCI
           query_params: query_params,
           operation_signing_strategy: operation_signing_strategy,
           body: post_body,
-          return_type: 'Array<OCI::KeyManagement::Models::KeyVersionSummary>'
+          return_type: 'OCI::KeyManagement::Models::WrappingKey'
         )
       end
       # rubocop:enable Metrics/BlockLength
@@ -635,24 +883,256 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Lists the keys in the specified vault and compartment.
+    # Imports AES key material to create a new key with. The key material must be base64-encoded and
+    # wrapped by the vault's public RSA wrapping key before you can import it. Key Management supports AES symmetric keys
+    # that are exactly 16, 24, or 32 bytes. Furthermore, the key length must match what you specify at the time of import.
     #
-    # @param [String] compartment_id The OCID of the compartment.
+    # @param [OCI::KeyManagement::Models::ImportKeyDetails] import_key_details ImportKeyDetails
     # @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] :limit The maximum number of items to return in a paginated \"List\" call.
-    #
-    # @option opts [String] :page The value of the `opc-next-page` response header
-    #   from the previous \"List\" call.
-    #
     # @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] :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
-    #   is ascending.
+    # @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::Key Key}
+    def import_key(import_key_details, opts = {})
+      logger.debug 'Calling operation KmsManagementClient#import_key.' if logger
+
+      raise "Missing the required parameter 'import_key_details' when calling import_key." if import_key_details.nil?
+
+      path = '/20180608/keys/import'
+      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]
+      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(import_key_details)
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsManagementClient#import_key') 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::Key'
+        )
+      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
+
+
+    # Imports AES key material to create a new key version with, and then rotates the key to begin using the new
+    # key version. The key material must be base64-encoded and wrapped by the vault's public RSA wrapping key
+    # before you can import it. Key Management supports AES symmetric keys that are exactly 16, 24, or 32 bytes.
+    # Furthermore, the key length must match the length of the specified key and what you specify as the length
+    # at the time of import.
+    #
+    # @param [String] key_id The OCID of the key.
+    # @param [OCI::KeyManagement::Models::ImportKeyVersionDetails] import_key_version_details ImportKeyVersionDetails
+    # @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.
+    #
+    # @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::KeyVersion KeyVersion}
+    def import_key_version(key_id, import_key_version_details, opts = {})
+      logger.debug 'Calling operation KmsManagementClient#import_key_version.' if logger
+
+      raise "Missing the required parameter 'key_id' when calling import_key_version." if key_id.nil?
+      raise "Missing the required parameter 'import_key_version_details' when calling import_key_version." if import_key_version_details.nil?
+      raise "Parameter value for 'key_id' must not be blank" if OCI::Internal::Util.blank_string?(key_id)
+
+      path = '/20180608/keys/{keyId}/keyVersions/import'.sub('{keyId}', key_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]
+      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(import_key_version_details)
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsManagementClient#import_key_version') 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::KeyVersion'
+        )
+      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 all [KeyVersion](https://docs.cloud.oracle.com/api/#/en/key/release/KeyVersion/) resources for the specified
+    # master encryption key.
+    #
+    # As a management operation, this call is subject to a Key Management limit that applies to the total number
+    # of requests across all management read operations. Key Management might throttle this call to reject an
+    # otherwise valid request when the total rate of management read operations exceeds 10 requests per second
+    # for a given tenancy.
+    #
+    # @param [String] key_id The OCID of the key.
+    # @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] :limit The maximum number of items to return in a paginated \"List\" call.
+    #
+    # @option opts [String] :page The value of the `opc-next-page` response header
+    #   from the previous \"List\" call.
+    #
+    # @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] :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`
+    #   is ascending.
+    #
+    #   Allowed values are: TIMECREATED, DISPLAYNAME
+    # @option opts [String] :sort_order The sort order to use, either ascending (`ASC`) or descending (`DESC`).
+    #
+    #   Allowed values are: ASC, DESC
+    # @return [Response] A Response object with data of type Array<{OCI::KeyManagement::Models::KeyVersionSummary KeyVersionSummary}>
+    def list_key_versions(key_id, opts = {})
+      logger.debug 'Calling operation KmsManagementClient#list_key_versions.' if logger
+
+      raise "Missing the required parameter 'key_id' when calling list_key_versions." if key_id.nil?
+
+      if opts[:sort_by] && !%w[TIMECREATED DISPLAYNAME].include?(opts[:sort_by])
+        raise 'Invalid value for "sort_by", must be one of TIMECREATED, DISPLAYNAME.'
+      end
+
+      if opts[:sort_order] && !%w[ASC DESC].include?(opts[:sort_order])
+        raise 'Invalid value for "sort_order", must be one of ASC, DESC.'
+      end
+      raise "Parameter value for 'key_id' must not be blank" if OCI::Internal::Util.blank_string?(key_id)
+
+      path = '/20180608/keys/{keyId}/keyVersions'.sub('{keyId}', key_id.to_s)
+      operation_signing_strategy = :standard
+
+      # rubocop:disable Style/NegatedIf
+      # Query Params
+      query_params = {}
+      query_params[:limit] = opts[:limit] if opts[:limit]
+      query_params[:page] = opts[:page] if opts[:page]
+      query_params[:sortBy] = opts[:sort_by] if opts[:sort_by]
+      query_params[:sortOrder] = opts[:sort_order] if opts[:sort_order]
+
+      # 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: 'KmsManagementClient#list_key_versions') 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: 'Array<OCI::KeyManagement::Models::KeyVersionSummary>'
+        )
+      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 master encryption keys in the specified vault and compartment.
+    #
+    # As a management operation, this call is subject to a Key Management limit that applies to the total number
+    # of requests across all management read operations. Key Management might throttle this call to reject an
+    # otherwise valid request when the total rate of management 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
+    #   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] :limit The maximum number of items to return in a paginated \"List\" call.
+    #
+    # @option opts [String] :page The value of the `opc-next-page` response header
+    #   from the previous \"List\" call.
+    #
+    # @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] :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`
+    #   is ascending.
     #
     #   Allowed values are: TIMECREATED, DISPLAYNAME
     # @option opts [String] :sort_order The sort order to use, either ascending (`ASC`) or descending (`DESC`).
@@ -717,8 +1197,169 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Schedules the deletion of the specified key. This sets the state of the key
-    # to `PENDING_DELETION` and then deletes it after the retention period ends.
+    # Restores the specified key to the specified vault, based on information in the backup file provided.
+    # If the vault doesn't exist, the operation returns a response with a 404 HTTP status error code. You
+    # need to first restore the vault associated with the key.
+    #
+    # @param [String, IO] restore_key_from_file_details The encrypted backup file to upload to restore the key.
+    # @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::Key Key}
+    def restore_key_from_file(restore_key_from_file_details, opts = {})
+      logger.debug 'Calling operation KmsManagementClient#restore_key_from_file.' if logger
+
+      raise "Missing the required parameter 'restore_key_from_file_details' when calling restore_key_from_file." if restore_key_from_file_details.nil?
+
+      path = '/20180608/keys/actions/restoreFromFile'
+      operation_signing_strategy = :standard
+
+      # rubocop:disable Style/NegatedIf
+      # Query Params
+      query_params = {}
+
+      # 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_key_from_file_details)
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsManagementClient#restore_key_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::Key'
+        )
+      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 the specified key to the specified vault from an Oracle Cloud Infrastructure
+    # Object Storage location. If the vault doesn't exist, the operation returns a response with a
+    # 404 HTTP status error code. You need to first restore the vault associated with the key.
+    #
+    # @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::RestoreKeyFromObjectStoreDetails] :restore_key_from_object_store_details Location to restore the backup from
+    # @return [Response] A Response object with data of type {OCI::KeyManagement::Models::Key Key}
+    def restore_key_from_object_store(opts = {})
+      logger.debug 'Calling operation KmsManagementClient#restore_key_from_object_store.' if logger
+
+
+      path = '/20180608/keys/actions/restoreFromObjectStore'
+      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[:restore_key_from_object_store_details])
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsManagementClient#restore_key_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::Key'
+        )
+      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 key. This sets the lifecycle state of the key
+    # to `PENDING_DELETION` and then deletes it after the specified retention period ends.
+    #
+    # 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] key_id The OCID of the key.
     # @param [OCI::KeyManagement::Models::ScheduleKeyDeletionDetails] schedule_key_deletion_details ScheduleKeyDeletionDetails
@@ -793,9 +1434,98 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Updates the properties of a key. Specifically, you can update the
+    # Schedules the deletion of the specified key version. This sets the lifecycle state of the key version
+    # to `PENDING_DELETION` and then deletes it after the specified retention period ends.
+    #
+    # 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] 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 [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 {OCI::KeyManagement::Models::KeyVersion KeyVersion}
+    def schedule_key_version_deletion(key_id, key_version_id, schedule_key_version_deletion_details, opts = {})
+      logger.debug 'Calling operation KmsManagementClient#schedule_key_version_deletion.' if logger
+
+      raise "Missing the required parameter 'key_id' when calling schedule_key_version_deletion." if key_id.nil?
+      raise "Missing the required parameter 'key_version_id' when calling schedule_key_version_deletion." if key_version_id.nil?
+      raise "Missing the required parameter 'schedule_key_version_deletion_details' when calling schedule_key_version_deletion." if schedule_key_version_deletion_details.nil?
+      raise "Parameter value for 'key_id' must not be blank" if OCI::Internal::Util.blank_string?(key_id)
+      raise "Parameter value for 'key_version_id' must not be blank" if OCI::Internal::Util.blank_string?(key_version_id)
+
+      path = '/20180608/keys/{keyId}/keyVersions/{keyVersionId}/actions/scheduleDeletion'.sub('{keyId}', key_id.to_s).sub('{keyVersionId}', key_version_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(schedule_key_version_deletion_details)
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'KmsManagementClient#schedule_key_version_deletion') 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::KeyVersion'
+        )
+      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
+
+
+    # Updates the properties of a master encryption key. Specifically, you can update the
     # `displayName`, `freeformTags`, and `definedTags` properties. Furthermore,
-    # the key must in an `ACTIVE` or `CREATING` state to be updated.
+    # the key must in an ENABLED or CREATING state to be updated.
+    #
+    # As a management operation, this call is subject to a Key Management limit that applies to the total number
+    # of requests across all management write operations. Key Management might throttle this call to reject an
+    # otherwise valid request when the total rate of management write operations exceeds 10 requests per second
+    # for a given tenancy.
     #
     # @param [String] key_id The OCID of the key.
     # @param [OCI::KeyManagement::Models::UpdateKeyDetails] update_key_details UpdateKeyDetails