oci 2.10.0 → 2.11.0

data/lib/oci/data_catalog/models/search_result.rb

@@ -118,6 +118,14 @@ module OCI
     # @return [String]
     attr_accessor :path
 
+    # Expression for logical entities against which names of dataObjects will be matched.
+    # @return [String]
+    attr_accessor :expression
+
+    # Custom properties defined by users.
+    # @return [Array<OCI::DataCatalog::Models::FacetedSearchCustomProperty>]
+    attr_accessor :custom_properties
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -147,7 +155,9 @@ module OCI
         'parent_term_name': :'parentTermName',
         'created_by_id': :'createdById',
         'updated_by_id': :'updatedById',
-        'path': :'path'
+        'path': :'path',
+        'expression': :'expression',
+        'custom_properties': :'customProperties'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -181,7 +191,9 @@ module OCI
         'parent_term_name': :'String',
         'created_by_id': :'String',
         'updated_by_id': :'String',
-        'path': :'String'
+        'path': :'String',
+        'expression': :'String',
+        'custom_properties': :'Array<OCI::DataCatalog::Models::FacetedSearchCustomProperty>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -218,6 +230,8 @@ module OCI
     # @option attributes [String] :created_by_id The value to assign to the {#created_by_id} property
     # @option attributes [String] :updated_by_id The value to assign to the {#updated_by_id} property
     # @option attributes [String] :path The value to assign to the {#path} property
+    # @option attributes [String] :expression The value to assign to the {#expression} property
+    # @option attributes [Array<OCI::DataCatalog::Models::FacetedSearchCustomProperty>] :custom_properties The value to assign to the {#custom_properties} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -359,6 +373,14 @@ module OCI
       self.updated_by_id = attributes[:'updated_by_id'] if attributes[:'updated_by_id']
 
       self.path = attributes[:'path'] if attributes[:'path']
+
+      self.expression = attributes[:'expression'] if attributes[:'expression']
+
+      self.custom_properties = attributes[:'customProperties'] if attributes[:'customProperties']
+
+      raise 'You cannot provide both :customProperties and :custom_properties' if attributes.key?(:'customProperties') && attributes.key?(:'custom_properties')
+
+      self.custom_properties = attributes[:'custom_properties'] if attributes[:'custom_properties']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -397,7 +419,9 @@ module OCI
         parent_term_name == other.parent_term_name &&
         created_by_id == other.created_by_id &&
         updated_by_id == other.updated_by_id &&
-        path == other.path
+        path == other.path &&
+        expression == other.expression &&
+        custom_properties == other.custom_properties
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -413,7 +437,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [key, name, description, time_created, time_updated, tag_summary, term_summary, type_name, external_type_name, external_data_type, data_asset_key, data_asset_type, data_asset_name, folder_key, folder_type, folder_name, entitykey, entity_type, entity_name, glossary_key, glossary_name, parent_term_key, parent_term_name, created_by_id, updated_by_id, path].hash
+      [key, name, description, time_created, time_updated, tag_summary, term_summary, type_name, external_type_name, external_data_type, data_asset_key, data_asset_type, data_asset_name, folder_key, folder_type, folder_name, entitykey, entity_type, entity_name, glossary_key, glossary_name, parent_term_key, parent_term_name, created_by_id, updated_by_id, path, expression, custom_properties].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

data/lib/oci/data_catalog/models/search_result_collection.rb

@@ -17,12 +17,22 @@ module OCI
     # @return [Array<OCI::DataCatalog::Models::SearchResult>]
     attr_accessor :items
 
+    # String that data objects are to be searched with.
+    # @return [String]
+    attr_accessor :query
+
+    # Aggregations/facets on properties of data objects.
+    # @return [Array<OCI::DataCatalog::Models::FacetedSearchAggregation>]
+    attr_accessor :faceted_search_aggregation
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
         'count': :'count',
-        'items': :'items'
+        'items': :'items',
+        'query': :'query',
+        'faceted_search_aggregation': :'facetedSearchAggregation'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -32,7 +42,9 @@ module OCI
       {
         # rubocop:disable Style/SymbolLiteral
         'count': :'Integer',
-        'items': :'Array<OCI::DataCatalog::Models::SearchResult>'
+        'items': :'Array<OCI::DataCatalog::Models::SearchResult>',
+        'query': :'String',
+        'faceted_search_aggregation': :'Array<OCI::DataCatalog::Models::FacetedSearchAggregation>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -45,6 +57,8 @@ module OCI
     # @param [Hash] attributes Model attributes in the form of hash
     # @option attributes [Integer] :count The value to assign to the {#count} property
     # @option attributes [Array<OCI::DataCatalog::Models::SearchResult>] :items The value to assign to the {#items} property
+    # @option attributes [String] :query The value to assign to the {#query} property
+    # @option attributes [Array<OCI::DataCatalog::Models::FacetedSearchAggregation>] :faceted_search_aggregation The value to assign to the {#faceted_search_aggregation} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -54,6 +68,14 @@ module OCI
       self.count = attributes[:'count'] if attributes[:'count']
 
       self.items = attributes[:'items'] if attributes[:'items']
+
+      self.query = attributes[:'query'] if attributes[:'query']
+
+      self.faceted_search_aggregation = attributes[:'facetedSearchAggregation'] if attributes[:'facetedSearchAggregation']
+
+      raise 'You cannot provide both :facetedSearchAggregation and :faceted_search_aggregation' if attributes.key?(:'facetedSearchAggregation') && attributes.key?(:'faceted_search_aggregation')
+
+      self.faceted_search_aggregation = attributes[:'faceted_search_aggregation'] if attributes[:'faceted_search_aggregation']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -68,7 +90,9 @@ module OCI
 
       self.class == other.class &&
         count == other.count &&
-        items == other.items
+        items == other.items &&
+        query == other.query &&
+        faceted_search_aggregation == other.faceted_search_aggregation
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -84,7 +108,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [count, items].hash
+      [count, items, query, faceted_search_aggregation].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

data/lib/oci/data_catalog/models/term.rb

@@ -104,6 +104,10 @@ module OCI
     # @return [Array<OCI::DataCatalog::Models::TermAssociatedObject>]
     attr_accessor :associated_objects
 
+    # The list of customized properties along with the values for this object
+    # @return [Array<OCI::DataCatalog::Models::CustomPropertyGetUsage>]
+    attr_accessor :custom_property_members
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -124,7 +128,8 @@ module OCI
         'workflow_status': :'workflowStatus',
         'uri': :'uri',
         'associated_object_count': :'associatedObjectCount',
-        'associated_objects': :'associatedObjects'
+        'associated_objects': :'associatedObjects',
+        'custom_property_members': :'customPropertyMembers'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -149,7 +154,8 @@ module OCI
         'workflow_status': :'String',
         'uri': :'String',
         'associated_object_count': :'Integer',
-        'associated_objects': :'Array<OCI::DataCatalog::Models::TermAssociatedObject>'
+        'associated_objects': :'Array<OCI::DataCatalog::Models::TermAssociatedObject>',
+        'custom_property_members': :'Array<OCI::DataCatalog::Models::CustomPropertyGetUsage>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -177,6 +183,7 @@ module OCI
     # @option attributes [String] :uri The value to assign to the {#uri} property
     # @option attributes [Integer] :associated_object_count The value to assign to the {#associated_object_count} property
     # @option attributes [Array<OCI::DataCatalog::Models::TermAssociatedObject>] :associated_objects The value to assign to the {#associated_objects} property
+    # @option attributes [Array<OCI::DataCatalog::Models::CustomPropertyGetUsage>] :custom_property_members The value to assign to the {#custom_property_members} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -266,6 +273,12 @@ module OCI
       raise 'You cannot provide both :associatedObjects and :associated_objects' if attributes.key?(:'associatedObjects') && attributes.key?(:'associated_objects')
 
       self.associated_objects = attributes[:'associated_objects'] if attributes[:'associated_objects']
+
+      self.custom_property_members = attributes[:'customPropertyMembers'] if attributes[:'customPropertyMembers']
+
+      raise 'You cannot provide both :customPropertyMembers and :custom_property_members' if attributes.key?(:'customPropertyMembers') && attributes.key?(:'custom_property_members')
+
+      self.custom_property_members = attributes[:'custom_property_members'] if attributes[:'custom_property_members']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -321,7 +334,8 @@ module OCI
         workflow_status == other.workflow_status &&
         uri == other.uri &&
         associated_object_count == other.associated_object_count &&
-        associated_objects == other.associated_objects
+        associated_objects == other.associated_objects &&
+        custom_property_members == other.custom_property_members
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -337,7 +351,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [key, display_name, description, glossary_key, parent_term_key, is_allowed_to_have_child_terms, path, lifecycle_state, time_created, time_updated, created_by_id, updated_by_id, owner, workflow_status, uri, associated_object_count, associated_objects].hash
+      [key, display_name, description, glossary_key, parent_term_key, is_allowed_to_have_child_terms, path, lifecycle_state, time_created, time_updated, created_by_id, updated_by_id, owner, workflow_status, uri, associated_object_count, associated_objects, custom_property_members].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

data/lib/oci/data_catalog/models/type.rb

@@ -89,6 +89,10 @@ module OCI
     # @return [String]
     attr_accessor :uri
 
+    # Custom properties associated with this Type.
+    # @return [Array<OCI::DataCatalog::Models::CustomPropertySummary>]
+    attr_accessor :custom_properties
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -104,7 +108,8 @@ module OCI
         'is_approved': :'isApproved',
         'type_category': :'typeCategory',
         'external_type_name': :'externalTypeName',
-        'uri': :'uri'
+        'uri': :'uri',
+        'custom_properties': :'customProperties'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -124,7 +129,8 @@ module OCI
         'is_approved': :'BOOLEAN',
         'type_category': :'String',
         'external_type_name': :'String',
-        'uri': :'String'
+        'uri': :'String',
+        'custom_properties': :'Array<OCI::DataCatalog::Models::CustomPropertySummary>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -147,6 +153,7 @@ module OCI
     # @option attributes [String] :type_category The value to assign to the {#type_category} property
     # @option attributes [String] :external_type_name The value to assign to the {#external_type_name} property
     # @option attributes [String] :uri The value to assign to the {#uri} property
+    # @option attributes [Array<OCI::DataCatalog::Models::CustomPropertySummary>] :custom_properties The value to assign to the {#custom_properties} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -204,6 +211,12 @@ module OCI
       self.external_type_name = attributes[:'external_type_name'] if attributes[:'external_type_name']
 
       self.uri = attributes[:'uri'] if attributes[:'uri']
+
+      self.custom_properties = attributes[:'customProperties'] if attributes[:'customProperties']
+
+      raise 'You cannot provide both :customProperties and :custom_properties' if attributes.key?(:'customProperties') && attributes.key?(:'custom_properties')
+
+      self.custom_properties = attributes[:'custom_properties'] if attributes[:'custom_properties']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -241,7 +254,8 @@ module OCI
         is_approved == other.is_approved &&
         type_category == other.type_category &&
         external_type_name == other.external_type_name &&
-        uri == other.uri
+        uri == other.uri &&
+        custom_properties == other.custom_properties
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -257,7 +271,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [key, name, description, catalog_id, properties, lifecycle_state, is_internal, is_tag, is_approved, type_category, external_type_name, uri].hash
+      [key, name, description, catalog_id, properties, lifecycle_state, is_internal, is_tag, is_approved, type_category, external_type_name, uri, custom_properties].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

data/lib/oci/{log_analytics/models/register_entity_types_details.rb → data_catalog/models/type_custom_property_details.rb}

@@ -5,17 +5,17 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # Entity Types Definition
-  class LogAnalytics::Models::RegisterEntityTypesDetails
-    # **[Required]** New Entity Type Create Definition
-    # @return [Array<OCI::LogAnalytics::Models::OutOfBoxEntityTypeDetails>]
-    attr_accessor :entity_types
+  # Array of custom property IDs for which we have to associate the custom property to the type
+  class DataCatalog::Models::TypeCustomPropertyDetails
+    # array of custom property Ids
+    # @return [Array<String>]
+    attr_accessor :custom_property_ids
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'entity_types': :'entityTypes'
+        'custom_property_ids': :'customPropertyIds'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -24,7 +24,7 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'entity_types': :'Array<OCI::LogAnalytics::Models::OutOfBoxEntityTypeDetails>'
+        'custom_property_ids': :'Array<String>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -35,18 +35,18 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [Array<OCI::LogAnalytics::Models::OutOfBoxEntityTypeDetails>] :entity_types The value to assign to the {#entity_types} property
+    # @option attributes [Array<String>] :custom_property_ids The value to assign to the {#custom_property_ids} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      self.entity_types = attributes[:'entityTypes'] if attributes[:'entityTypes']
+      self.custom_property_ids = attributes[:'customPropertyIds'] if attributes[:'customPropertyIds']
 
-      raise 'You cannot provide both :entityTypes and :entity_types' if attributes.key?(:'entityTypes') && attributes.key?(:'entity_types')
+      raise 'You cannot provide both :customPropertyIds and :custom_property_ids' if attributes.key?(:'customPropertyIds') && attributes.key?(:'custom_property_ids')
 
-      self.entity_types = attributes[:'entity_types'] if attributes[:'entity_types']
+      self.custom_property_ids = attributes[:'custom_property_ids'] if attributes[:'custom_property_ids']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -60,7 +60,7 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        entity_types == other.entity_types
+        custom_property_ids == other.custom_property_ids
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -76,7 +76,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [entity_types].hash
+      [custom_property_ids].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

data/lib/oci/data_catalog/models/update_attribute_details.rb

@@ -68,6 +68,10 @@ module OCI
     # @return [String]
     attr_accessor :external_parent_attribute_key
 
+    # The list of customized properties along with the values for this object
+    # @return [Array<OCI::DataCatalog::Models::CustomPropertySetUsage>]
+    attr_accessor :custom_property_members
+
     # A map of maps that contains the properties which are specific to the attribute type. Each attribute type
     # definition defines it's set of required and optional properties. The map keys are category names and the
     # values are maps of property name to property value. Every property is contained inside of a category. Most
@@ -98,6 +102,7 @@ module OCI
         'max_collection_count': :'maxCollectionCount',
         'external_datatype_entity_key': :'externalDatatypeEntityKey',
         'external_parent_attribute_key': :'externalParentAttributeKey',
+        'custom_property_members': :'customPropertyMembers',
         'properties': :'properties'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -121,6 +126,7 @@ module OCI
         'max_collection_count': :'Integer',
         'external_datatype_entity_key': :'String',
         'external_parent_attribute_key': :'String',
+        'custom_property_members': :'Array<OCI::DataCatalog::Models::CustomPropertySetUsage>',
         'properties': :'Hash<String, Hash<String, String>>'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -146,6 +152,7 @@ module OCI
     # @option attributes [Integer] :max_collection_count The value to assign to the {#max_collection_count} property
     # @option attributes [String] :external_datatype_entity_key The value to assign to the {#external_datatype_entity_key} property
     # @option attributes [String] :external_parent_attribute_key The value to assign to the {#external_parent_attribute_key} property
+    # @option attributes [Array<OCI::DataCatalog::Models::CustomPropertySetUsage>] :custom_property_members The value to assign to the {#custom_property_members} property
     # @option attributes [Hash<String, Hash<String, String>>] :properties The value to assign to the {#properties} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
@@ -217,6 +224,12 @@ module OCI
 
       self.external_parent_attribute_key = attributes[:'external_parent_attribute_key'] if attributes[:'external_parent_attribute_key']
 
+      self.custom_property_members = attributes[:'customPropertyMembers'] if attributes[:'customPropertyMembers']
+
+      raise 'You cannot provide both :customPropertyMembers and :custom_property_members' if attributes.key?(:'customPropertyMembers') && attributes.key?(:'custom_property_members')
+
+      self.custom_property_members = attributes[:'custom_property_members'] if attributes[:'custom_property_members']
+
       self.properties = attributes[:'properties'] if attributes[:'properties']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
@@ -245,6 +258,7 @@ module OCI
         max_collection_count == other.max_collection_count &&
         external_datatype_entity_key == other.external_datatype_entity_key &&
         external_parent_attribute_key == other.external_parent_attribute_key &&
+        custom_property_members == other.custom_property_members &&
         properties == other.properties
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
@@ -261,7 +275,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [display_name, description, external_data_type, is_incremental_data, is_nullable, length, position, precision, scale, time_external, min_collection_count, max_collection_count, external_datatype_entity_key, external_parent_attribute_key, properties].hash
+      [display_name, description, external_data_type, is_incremental_data, is_nullable, length, position, precision, scale, time_external, min_collection_count, max_collection_count, external_datatype_entity_key, external_parent_attribute_key, custom_property_members, properties].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

data/lib/oci/data_catalog/models/update_connection_details.rb

@@ -17,6 +17,10 @@ module OCI
     # @return [String]
     attr_accessor :display_name
 
+    # The list of customized properties along with the values for this object
+    # @return [Array<OCI::DataCatalog::Models::CustomPropertySetUsage>]
+    attr_accessor :custom_property_members
+
     # A map of maps that contains the properties which are specific to the connection type. Each connection type
     # definition defines it's set of required and optional properties. The map keys are category names and the
     # values are maps of property name to property value. Every property is contained inside of a category. Most
@@ -51,6 +55,7 @@ module OCI
         # rubocop:disable Style/SymbolLiteral
         'description': :'description',
         'display_name': :'displayName',
+        'custom_property_members': :'customPropertyMembers',
         'properties': :'properties',
         'enc_properties': :'encProperties',
         'is_default': :'isDefault'
@@ -64,6 +69,7 @@ module OCI
         # rubocop:disable Style/SymbolLiteral
         'description': :'String',
         'display_name': :'String',
+        'custom_property_members': :'Array<OCI::DataCatalog::Models::CustomPropertySetUsage>',
         'properties': :'Hash<String, Hash<String, String>>',
         'enc_properties': :'Hash<String, Hash<String, String>>',
         'is_default': :'BOOLEAN'
@@ -79,6 +85,7 @@ module OCI
     # @param [Hash] attributes Model attributes in the form of hash
     # @option attributes [String] :description The value to assign to the {#description} property
     # @option attributes [String] :display_name The value to assign to the {#display_name} property
+    # @option attributes [Array<OCI::DataCatalog::Models::CustomPropertySetUsage>] :custom_property_members The value to assign to the {#custom_property_members} property
     # @option attributes [Hash<String, Hash<String, String>>] :properties The value to assign to the {#properties} property
     # @option attributes [Hash<String, Hash<String, String>>] :enc_properties The value to assign to the {#enc_properties} property
     # @option attributes [BOOLEAN] :is_default The value to assign to the {#is_default} property
@@ -96,6 +103,12 @@ module OCI
 
       self.display_name = attributes[:'display_name'] if attributes[:'display_name']
 
+      self.custom_property_members = attributes[:'customPropertyMembers'] if attributes[:'customPropertyMembers']
+
+      raise 'You cannot provide both :customPropertyMembers and :custom_property_members' if attributes.key?(:'customPropertyMembers') && attributes.key?(:'custom_property_members')
+
+      self.custom_property_members = attributes[:'custom_property_members'] if attributes[:'custom_property_members']
+
       self.properties = attributes[:'properties'] if attributes[:'properties']
 
       self.enc_properties = attributes[:'encProperties'] if attributes[:'encProperties']
@@ -124,6 +137,7 @@ module OCI
       self.class == other.class &&
         description == other.description &&
         display_name == other.display_name &&
+        custom_property_members == other.custom_property_members &&
         properties == other.properties &&
         enc_properties == other.enc_properties &&
         is_default == other.is_default
@@ -142,7 +156,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [description, display_name, properties, enc_properties, is_default].hash
+      [description, display_name, custom_property_members, properties, enc_properties, is_default].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines