oci 2.5.10 → 2.9.0

data/lib/oci/file_storage/file_storage_client.rb

@@ -1,11 +1,12 @@
-# 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'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # The API for the File Storage Service.
+  # API for the File Storage service. Use this API to manage file systems, mount targets, and snapshots. For more information, see [Overview of File Storage](/iaas/Content/File/Concepts/filestorageoverview.htm).
   class FileStorage::FileStorageClient
     # Client used to make HTTP requests.
     # @return [OCI::ApiClient]
@@ -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(
@@ -120,7 +119,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -184,7 +183,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -248,7 +247,7 @@ module OCI
     #   hours, but can be invalidated before then due to conflicting operations. For example, if a resource
     #   has been deleted and purged from the system, then a retry of the original creation request
     #   might be rejected.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -314,6 +313,9 @@ module OCI
     # For information about access control and compartments, see
     # [Overview of the IAM Service](https://docs.cloud.oracle.com/Content/Identity/Concepts/overview.htm).
     #
+    # For information about Network Security Groups access control, see
+    # [Network Security Groups](https://docs.cloud.oracle.com/Content/Network/Concepts/networksecuritygroups.htm).
+    #
     # For information about availability domains, see [Regions and
     # Availability Domains](https://docs.cloud.oracle.com/Content/General/Concepts/regions.htm).
     # To get a list of availability domains, use the
@@ -336,7 +338,7 @@ module OCI
     #   hours, but can be invalidated before then due to conflicting operations. For example, if a resource
     #   has been deleted and purged from the system, then a retry of the original creation request
     #   might be rejected.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -430,7 +432,7 @@ module OCI
     #   hours, but can be invalidated before then due to conflicting operations. For example, if a resource
     #   has been deleted and purged from the system, then a retry of the original creation request
     #   might be rejected.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -494,7 +496,7 @@ module OCI
     #   hours, but can be invalidated before then due to conflicting operations. For example, if a resource
     #   has been deleted and purged from the system, then a retry of the original creation request
     #   might be rejected.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -557,7 +559,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -621,7 +623,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -684,7 +686,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -746,7 +748,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -1090,33 +1092,34 @@ module OCI
     #   see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
     #
     #   Example: `500`
-    #
+    #    (default to 1000)
     # @option opts [String] :page For list pagination. The value of the `opc-next-page` response
     #   header from the previous \"List\" call.
     #
     #   For important details about how pagination works,
     #   see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
-    #
+    #    (default to none)
     # @option opts [String] :display_name A user-friendly name. It does not have to be unique, and it is changeable.
     #
     #   Example: `My resource`
-    #
+    #    (default to none)
     # @option opts [String] :lifecycle_state Filter results by the specified lifecycle state. Must be a valid
     #   state for the resource type.
-    #
+    #    (default to none)
     #   Allowed values are: CREATING, ACTIVE, DELETING, DELETED, FAILED
     # @option opts [String] :id Filter results by OCID. Must be an OCID of the correct type for
     #   the resouce type.
-    #
+    #    (default to none)
     # @option opts [String] :sort_by The field to sort by. You can provide either value, but not both.
     #   By default, when you sort by time created, results are shown
     #   in descending order. When you sort by display name, results are
     #   shown in ascending order.
-    #
+    #    (default to TIMECREATED)
     #   Allowed values are: TIMECREATED, DISPLAYNAME
     # @option opts [String] :sort_order The sort order to use, either 'asc' or 'desc', where 'asc' is
-    #   ascending and 'desc' is descending.
-    #
+    #   ascending and 'desc' is descending. The default order is 'desc'
+    #   except for numeric values.
+    #    (default to DESC)
     #   Allowed values are: ASC, DESC
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
@@ -1196,7 +1199,7 @@ module OCI
     # @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] :compartment_id The OCID of the compartment.
+    # @option opts [String] :compartment_id The OCID of the compartment. (default to none)
     # @option opts [Integer] :limit For list pagination. The maximum number of results per page,
     #   or items to return in a paginated \"List\" call.
     #   1 is the minimum, 1000 is the maximum.
@@ -1205,31 +1208,32 @@ module OCI
     #   see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
     #
     #   Example: `500`
-    #
+    #    (default to 1000)
     # @option opts [String] :page For list pagination. The value of the `opc-next-page` response
     #   header from the previous \"List\" call.
     #
     #   For important details about how pagination works,
     #   see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
-    #
-    # @option opts [String] :export_set_id The OCID of the export set.
-    # @option opts [String] :file_system_id The OCID of the file system.
+    #    (default to none)
+    # @option opts [String] :export_set_id The OCID of the export set. (default to none)
+    # @option opts [String] :file_system_id The OCID of the file system. (default to none)
     # @option opts [String] :lifecycle_state Filter results by the specified lifecycle state. Must be a valid
     #   state for the resource type.
-    #
+    #    (default to none)
     #   Allowed values are: CREATING, ACTIVE, DELETING, DELETED, FAILED
     # @option opts [String] :id Filter results by OCID. Must be an OCID of the correct type for
     #   the resouce type.
-    #
+    #    (default to none)
     # @option opts [String] :sort_by The field to sort by. You can provide either value, but not both.
     #   By default, when you sort by time created, results are shown
     #   in descending order. When you sort by path, results are
     #   shown in ascending alphanumeric order.
-    #
+    #    (default to TIMECREATED)
     #   Allowed values are: TIMECREATED, PATH
     # @option opts [String] :sort_order The sort order to use, either 'asc' or 'desc', where 'asc' is
-    #   ascending and 'desc' is descending.
-    #
+    #   ascending and 'desc' is descending. The default order is 'desc'
+    #   except for numeric values.
+    #    (default to DESC)
     #   Allowed values are: ASC, DESC
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
@@ -1318,33 +1322,34 @@ module OCI
     #   see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
     #
     #   Example: `500`
-    #
+    #    (default to 1000)
     # @option opts [String] :page For list pagination. The value of the `opc-next-page` response
     #   header from the previous \"List\" call.
     #
     #   For important details about how pagination works,
     #   see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
-    #
+    #    (default to none)
     # @option opts [String] :display_name A user-friendly name. It does not have to be unique, and it is changeable.
     #
     #   Example: `My resource`
-    #
+    #    (default to none)
     # @option opts [String] :lifecycle_state Filter results by the specified lifecycle state. Must be a valid
     #   state for the resource type.
-    #
+    #    (default to none)
     #   Allowed values are: CREATING, ACTIVE, DELETING, DELETED, FAILED
     # @option opts [String] :id Filter results by OCID. Must be an OCID of the correct type for
     #   the resouce type.
-    #
+    #    (default to none)
     # @option opts [String] :sort_by The field to sort by. You can provide either value, but not both.
     #   By default, when you sort by time created, results are shown
     #   in descending order. When you sort by display name, results are
     #   shown in ascending order.
-    #
+    #    (default to TIMECREATED)
     #   Allowed values are: TIMECREATED, DISPLAYNAME
     # @option opts [String] :sort_order The sort order to use, either 'asc' or 'desc', where 'asc' is
-    #   ascending and 'desc' is descending.
-    #
+    #   ascending and 'desc' is descending. The default order is 'desc'
+    #   except for numeric values.
+    #    (default to DESC)
     #   Allowed values are: ASC, DESC
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
@@ -1435,34 +1440,35 @@ module OCI
     #   see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
     #
     #   Example: `500`
-    #
+    #    (default to 1000)
     # @option opts [String] :page For list pagination. The value of the `opc-next-page` response
     #   header from the previous \"List\" call.
     #
     #   For important details about how pagination works,
     #   see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
-    #
+    #    (default to none)
     # @option opts [String] :display_name A user-friendly name. It does not have to be unique, and it is changeable.
     #
     #   Example: `My resource`
-    #
-    # @option opts [String] :export_set_id The OCID of the export set.
+    #    (default to none)
+    # @option opts [String] :export_set_id The OCID of the export set. (default to none)
     # @option opts [String] :lifecycle_state Filter results by the specified lifecycle state. Must be a valid
     #   state for the resource type.
-    #
+    #    (default to none)
     #   Allowed values are: CREATING, ACTIVE, DELETING, DELETED, FAILED
     # @option opts [String] :id Filter results by OCID. Must be an OCID of the correct type for
     #   the resouce type.
-    #
+    #    (default to none)
     # @option opts [String] :sort_by The field to sort by. You can choose either value, but not both.
     #   By default, when you sort by time created, results are shown
     #   in descending order. When you sort by display name, results are
     #   shown in ascending order.
-    #
+    #    (default to TIMECREATED)
     #   Allowed values are: TIMECREATED, DISPLAYNAME
     # @option opts [String] :sort_order The sort order to use, either 'asc' or 'desc', where 'asc' is
-    #   ascending and 'desc' is descending.
-    #
+    #   ascending and 'desc' is descending. The default order is 'desc'
+    #   except for numeric values.
+    #    (default to DESC)
     #   Allowed values are: ASC, DESC
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
@@ -1544,29 +1550,30 @@ module OCI
     #   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 For list pagination. The maximum number of results per page,
     #   or items to return in a paginated \"List\" call.
-    #   1 is the minimum, 1000 is the maximum.
+    #   1 is the minimum, 100 is the maximum.
     #
     #   For important details about how pagination works,
     #   see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
     #
-    #   Example: `500`
-    #
+    #   Example: `100`
+    #    (default to 100)
     # @option opts [String] :page For list pagination. The value of the `opc-next-page` response
     #   header from the previous \"List\" call.
     #
     #   For important details about how pagination works,
     #   see [List Pagination](https://docs.cloud.oracle.com/iaas/Content/API/Concepts/usingapi.htm#nine).
-    #
+    #    (default to none)
     # @option opts [String] :lifecycle_state Filter results by the specified lifecycle state. Must be a valid
     #   state for the resource type.
-    #
+    #    (default to none)
     #   Allowed values are: CREATING, ACTIVE, DELETING, DELETED, FAILED
     # @option opts [String] :id Filter results by OCID. Must be an OCID of the correct type for
     #   the resouce type.
-    #
+    #    (default to none)
     # @option opts [String] :sort_order The sort order to use, either 'asc' or 'desc', where 'asc' is
-    #   ascending and 'desc' is descending.
-    #
+    #   ascending and 'desc' is descending. The default order is 'desc'
+    #   except for numeric values.
+    #    (default to DESC)
     #   Allowed values are: ASC, DESC
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
@@ -1642,7 +1649,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -1706,7 +1713,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -1772,7 +1779,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -1836,7 +1843,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #
@@ -1900,7 +1907,7 @@ module OCI
     #   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.
-    #
+    #    (default to none)
     # @option opts [String] :opc_request_id Unique identifier for the request.
     #   If you need to contact Oracle about a particular request, please provide the request ID.
     #

data/lib/oci/file_storage/file_storage_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/file_storage/models/change_file_system_compartment_details.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 'date'
 

data/lib/oci/file_storage/models/change_mount_target_compartment_details.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 'date'
 

data/lib/oci/file_storage/models/client_options.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 'date'
 require 'logger'

data/lib/oci/file_storage/models/create_export_details.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 'date'
 

data/lib/oci/file_storage/models/create_file_system_details.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 'date'
 
@@ -40,6 +41,11 @@ module OCI
     # @return [Hash<String, Hash<String, Object>>]
     attr_accessor :defined_tags
 
+    # The OCID of KMS key used to encrypt the encryption keys associated with this file system.
+    #
+    # @return [String]
+    attr_accessor :kms_key_id
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -48,7 +54,8 @@ module OCI
         'compartment_id': :'compartmentId',
         'display_name': :'displayName',
         'freeform_tags': :'freeformTags',
-        'defined_tags': :'definedTags'
+        'defined_tags': :'definedTags',
+        'kms_key_id': :'kmsKeyId'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -61,7 +68,8 @@ module OCI
         'compartment_id': :'String',
         'display_name': :'String',
         'freeform_tags': :'Hash<String, String>',
-        'defined_tags': :'Hash<String, Hash<String, Object>>'
+        'defined_tags': :'Hash<String, Hash<String, Object>>',
+        'kms_key_id': :'String'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -77,6 +85,7 @@ module OCI
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
     # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
     # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
+    # @option attributes [String] :kms_key_id The value to assign to the {#kms_key_id} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -112,6 +121,12 @@ module OCI
       raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
 
       self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
+
+      self.kms_key_id = attributes[:'kmsKeyId'] if attributes[:'kmsKeyId']
+
+      raise 'You cannot provide both :kmsKeyId and :kms_key_id' if attributes.key?(:'kmsKeyId') && attributes.key?(:'kms_key_id')
+
+      self.kms_key_id = attributes[:'kms_key_id'] if attributes[:'kms_key_id']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -129,7 +144,8 @@ module OCI
         compartment_id == other.compartment_id &&
         display_name == other.display_name &&
         freeform_tags == other.freeform_tags &&
-        defined_tags == other.defined_tags
+        defined_tags == other.defined_tags &&
+        kms_key_id == other.kms_key_id
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -145,7 +161,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [availability_domain, compartment_id, display_name, freeform_tags, defined_tags].hash
+      [availability_domain, compartment_id, display_name, freeform_tags, defined_tags, kms_key_id].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines