oci 2.10.0 → 2.11.0

data/lib/oci/log_analytics/log_analytics_client_composite_operations.rb

@@ -28,7 +28,7 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#create_log_analytics_entity} and then waits for the {OCI::LogAnalytics::Models::LogAnalyticsEntity} acted upon
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
     # @param [OCI::LogAnalytics::Models::CreateLogAnalyticsEntityDetails] create_log_analytics_entity_details Details for the new log analytics entity.
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::LogAnalyticsEntity#lifecycle_state}
@@ -69,7 +69,7 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#create_log_analytics_object_collection_rule} and then waits for the {OCI::LogAnalytics::Models::LogAnalyticsObjectCollectionRule} acted upon
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
     # @param [OCI::LogAnalytics::Models::CreateLogAnalyticsObjectCollectionRuleDetails] create_log_analytics_object_collection_rule_details Details of the rule to be created.
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::LogAnalyticsObjectCollectionRule#lifecycle_state}
@@ -110,7 +110,7 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#create_scheduled_task} and then waits for the {OCI::LogAnalytics::Models::ScheduledTask} acted upon
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
     # @param [OCI::LogAnalytics::Models::CreateScheduledTaskDetails] create_scheduled_task_details Scheduled task to be created.
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::ScheduledTask#lifecycle_state}
@@ -148,10 +148,61 @@ module OCI
     # rubocop:disable Layout/EmptyLines
 
 
+    # Calls {OCI::LogAnalytics::LogAnalyticsClient#delete_associations} and then waits for the {OCI::LogAnalytics::Models::WorkRequest}
+    # to enter the given state(s).
+    #
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
+    #
+    # @param [OCI::LogAnalytics::Models::DeleteLogAnalyticsAssociationDetails] delete_log_analytics_association_details details for association
+    # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::WorkRequest#status}
+    # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::LogAnalytics::LogAnalyticsClient#delete_associations}
+    # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
+    #   * max_interval_seconds: The maximum interval between queries, in seconds.
+    #   * max_wait_seconds The maximum time to wait, in seconds
+    #
+    # @return [OCI::Response] A {OCI::Response} object containing the completed {OCI::LogAnalytics::Models::WorkRequest}
+    def delete_associations_and_wait_for_state(namespace_name, delete_log_analytics_association_details, wait_for_states = [], base_operation_opts = {}, waiter_opts = {})
+      operation_result = @service_client.delete_associations(namespace_name, delete_log_analytics_association_details, base_operation_opts)
+      use_util = OCI::LogAnalytics::Util.respond_to?(:wait_on_work_request)
+
+      return operation_result if wait_for_states.empty? && !use_util
+
+      lowered_wait_for_states = wait_for_states.map(&:downcase)
+      wait_for_resource_id = operation_result.headers['opc-work-request-id']
+
+      begin
+        if use_util
+          waiter_result = OCI::LogAnalytics::Util.wait_on_work_request(
+            @service_client,
+            wait_for_resource_id,
+            max_interval_seconds: waiter_opts.key?(:max_interval_seconds) ? waiter_opts[:max_interval_seconds] : 30,
+            max_wait_seconds: waiter_opts.key?(:max_wait_seconds) ? waiter_opts[:max_wait_seconds] : 1200
+          )
+        else
+          waiter_result = @service_client.get_work_request(wait_for_resource_id).wait_until(
+            eval_proc: ->(response) { response.data.respond_to?(:status) && lowered_wait_for_states.include?(response.data.status.downcase) },
+            max_interval_seconds: waiter_opts.key?(:max_interval_seconds) ? waiter_opts[:max_interval_seconds] : 30,
+            max_wait_seconds: waiter_opts.key?(:max_wait_seconds) ? waiter_opts[:max_wait_seconds] : 1200
+          )
+        end
+        result_to_return = waiter_result
+
+        return result_to_return
+      rescue StandardError
+        raise OCI::Errors::CompositeOperationError.new(partial_results: [operation_result])
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:enable Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:disable Layout/EmptyLines
+
+
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#offboard_namespace} and then waits for the {OCI::LogAnalytics::Models::WorkRequest}
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::WorkRequest#status}
     # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::LogAnalytics::LogAnalyticsClient#offboard_namespace}
@@ -201,7 +252,7 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#onboard_namespace} and then waits for the {OCI::LogAnalytics::Models::WorkRequest}
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::WorkRequest#status}
     # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::LogAnalytics::LogAnalyticsClient#onboard_namespace}
@@ -251,9 +302,9 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#purge_storage_data} and then waits for the {OCI::LogAnalytics::Models::WorkRequest}
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
-    # @param [OCI::LogAnalytics::Models::PurgeStorageDataDetails] purge_storage_data_details purge old data request details
+    # @param [OCI::LogAnalytics::Models::PurgeStorageDataDetails] purge_storage_data_details This is the input to purge old data.
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::WorkRequest#status}
     # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::LogAnalytics::LogAnalyticsClient#purge_storage_data}
     # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
@@ -302,7 +353,7 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#query} and then waits for the {OCI::LogAnalytics::Models::WorkRequest}
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
     # @param [OCI::LogAnalytics::Models::QueryDetails] query_details Query to be executed.
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::WorkRequest#status}
@@ -353,9 +404,9 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#recall_archived_data} and then waits for the {OCI::LogAnalytics::Models::WorkRequest}
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
-    # @param [OCI::LogAnalytics::Models::RecallArchivedDataDetails] recall_archived_data_details recall archived data request details
+    # @param [OCI::LogAnalytics::Models::RecallArchivedDataDetails] recall_archived_data_details This is the input to recall archived data.
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::WorkRequest#status}
     # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::LogAnalytics::LogAnalyticsClient#recall_archived_data}
     # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
@@ -404,9 +455,9 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#release_recalled_data} and then waits for the {OCI::LogAnalytics::Models::WorkRequest}
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
-    # @param [OCI::LogAnalytics::Models::ReleaseRecalledDataDetails] release_recalled_data_details release recalled data request details
+    # @param [OCI::LogAnalytics::Models::ReleaseRecalledDataDetails] release_recalled_data_details This is the input to release recalled data
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::WorkRequest#status}
     # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::LogAnalytics::LogAnalyticsClient#release_recalled_data}
     # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
@@ -455,7 +506,7 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#update_log_analytics_entity} and then waits for the {OCI::LogAnalytics::Models::LogAnalyticsEntity} acted upon
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
     # @param [String] log_analytics_entity_id The log analytics entity OCID.
     #
@@ -498,9 +549,9 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#update_log_analytics_object_collection_rule} and then waits for the {OCI::LogAnalytics::Models::LogAnalyticsObjectCollectionRule} acted upon
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
-    # @param [String] log_analytics_object_collection_rule_id The log analytics os collection rule [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
+    # @param [String] log_analytics_object_collection_rule_id The Logging Analytics Object Collection Rule [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm)
     # @param [OCI::LogAnalytics::Models::UpdateLogAnalyticsObjectCollectionRuleDetails] update_log_analytics_object_collection_rule_details The rule config to be updated.
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::LogAnalyticsObjectCollectionRule#lifecycle_state}
     # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::LogAnalytics::LogAnalyticsClient#update_log_analytics_object_collection_rule}
@@ -540,7 +591,7 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#update_scheduled_task} and then waits for the {OCI::LogAnalytics::Models::ScheduledTask} acted upon
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
     # @param [String] scheduled_task_id Unique scheduledTask id returned from task create.
     #   If invalid will lead to a 404 not found.
@@ -586,7 +637,7 @@ module OCI
     # Calls {OCI::LogAnalytics::LogAnalyticsClient#upsert_associations} and then waits for the {OCI::LogAnalytics::Models::WorkRequest}
     # to enter the given state(s).
     #
-    # @param [String] namespace_name The Log Analytics namespace used for the request.
+    # @param [String] namespace_name The Logging Analytics namespace used for the request.
     #
     # @param [OCI::LogAnalytics::Models::UpsertLogAnalyticsAssociationDetails] upsert_log_analytics_association_details list of association details
     # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::LogAnalytics::Models::WorkRequest#status}

data/lib/oci/log_analytics/models/abstract_command_descriptor.rb

@@ -22,7 +22,7 @@ module OCI
       NAME_LINK_DETAILS = 'LINK_DETAILS'.freeze,
       NAME_CLUSTER = 'CLUSTER'.freeze,
       NAME_CLUSTER_DETAILS = 'CLUSTER_DETAILS'.freeze,
-      NAME_CUSLTER_SPLIT = 'CUSLTER_SPLIT'.freeze,
+      NAME_CLUSTER_SPLIT = 'CLUSTER_SPLIT'.freeze,
       NAME_EVAL = 'EVAL'.freeze,
       NAME_EXTRACT = 'EXTRACT'.freeze,
       NAME_EVENT_STATS = 'EVENT_STATS'.freeze,

data/lib/oci/log_analytics/models/archiving_configuration.rb

@@ -5,16 +5,16 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # configuration for archiving data in object storage
+  # This is the configuration for data archiving in object storage
   class LogAnalytics::Models::ArchivingConfiguration
-    # duration in active storage before data is archived, as described in
+    # Thi is the duration data in active storage before data is archived, as described in
     # https://en.wikipedia.org/wiki/ISO_8601#Durations.
     # The largest supported unit is D, e.g. P365D (not P1Y) or P14D (not P2W).
     #
     # @return [String]
     attr_accessor :active_storage_duration
 
-    # duration before data is deleted from object storage, as described in
+    # The is the duration before archived data is deleted from object storage, as described in
     # https://en.wikipedia.org/wiki/ISO_8601#Durations
     # The largest supported unit is D, e.g. P365D (not P1Y) or P14D (not P2W).
     #

data/lib/oci/log_analytics/models/bucket_range.rb

@@ -5,7 +5,7 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # Represents querylanguage bucket command input arguments in parse endpoint output.
+  # Represents querylanguage bucket command input arguments in parse output.
   #
   class LogAnalytics::Models::BucketRange
     # Lower bound of the bucket range specified in the querystring for the numeric field referenced in tbe bucket command.

data/lib/oci/log_analytics/models/change_log_analytics_object_collection_rule_compartment_details.rb

@@ -5,7 +5,7 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # Log Analytics Object Storage based collection rule compartment to be updated to.
+  # The new compartment this Object Collection Rule will be moved to.
   #
   class LogAnalytics::Models::ChangeLogAnalyticsObjectCollectionRuleCompartmentDetails
     # **[Required]** The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the compartment into which the rule should be moved.

data/lib/oci/log_analytics/models/char_encoding_collection.rb

@@ -5,9 +5,9 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # Set of valid character encodings
+  # List of supported character encodings
   class LogAnalytics::Models::CharEncodingCollection
-    # **[Required]** character encodings
+    # **[Required]** List of supported character encodings
     # @return [Array<String>]
     attr_accessor :items
 

data/lib/oci/log_analytics/models/create_log_analytics_object_collection_rule_details.rb

@@ -37,9 +37,7 @@ module OCI
     attr_accessor :os_bucket_name
 
     # The type of collection.
-    # Accepted values are: LIVE.
-    # Collection type LIVE indicates to enable log collection from the time of this rule creation,
-    # and continue until the rule exists.
+    # Supported collection types: LIVE, HISTORIC, HISTORIC_LIVE
     #
     # @return [String]
     attr_reader :collection_type
@@ -58,15 +56,15 @@ module OCI
     # @return [String]
     attr_accessor :poll_till
 
-    # **[Required]** Log Analytics Log group OCID to associate the processed logs with.
+    # **[Required]** Logging Analytics Log group OCID to associate the processed logs with.
     # @return [String]
     attr_accessor :log_group_id
 
-    # **[Required]** Name of the Log Analytics Source to use for the processing.
+    # **[Required]** Name of the Logging Analytics Source to use for the processing.
     # @return [String]
     attr_accessor :log_source_name
 
-    # Log Analytics entity OCID. Associates the processed logs with the given entity (optional).
+    # Logging Analytics entity OCID. Associates the processed logs with the given entity (optional).
     # @return [String]
     attr_accessor :entity_id
 

data/lib/oci/log_analytics/models/estimate_purge_data_size_details.rb

@@ -5,7 +5,7 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # Parameters used to estimate purge data size
+  # This is the input used to estimate the size of data that might be purged
   #
   class LogAnalytics::Models::EstimatePurgeDataSizeDetails
     DATA_TYPE_ENUM = [
@@ -13,23 +13,23 @@ module OCI
       DATA_TYPE_LOOKUP = 'LOOKUP'.freeze
     ].freeze
 
-    # **[Required]** the compartment OCID under which the data will be purged
+    # **[Required]** This is the compartment OCID under which the data will be purged
     # @return [String]
     attr_accessor :compartment_id
 
-    # if true, purge child compartments data
+    # If true, purge child compartments data
     # @return [BOOLEAN]
     attr_accessor :compartment_id_in_subtree
 
-    # **[Required]** the time before which data will be purged
+    # **[Required]** This is the time before which data will be purged
     # @return [DateTime]
     attr_accessor :time_data_ended
 
-    # the solr data filter query, '*' means all
+    # This is the solr data filter query, '*' means all
     # @return [String]
     attr_accessor :purge_query_string
 
-    # the type of the log data to be purged
+    # This is the type of the log data to be purged
     # @return [String]
     attr_reader :data_type
 

data/lib/oci/log_analytics/models/estimate_purge_data_size_result.rb

@@ -8,7 +8,7 @@ module OCI
   # purge data size in bytes
   #
   class LogAnalytics::Models::EstimatePurgeDataSizeResult
-    # **[Required]** purge data size in bytes
+    # **[Required]** This is the size of data to be purged in bytes
     # @return [Integer]
     attr_accessor :purge_data_size_in_bytes
 

data/lib/oci/log_analytics/models/export_content.rb

@@ -11,6 +11,7 @@ module OCI
     # @return [Array<String>]
     attr_accessor :field_names
 
+    # parserNames
     # @return [Array<String>]
     attr_accessor :parser_names
 

data/lib/oci/log_analytics/models/extract_log_field_results.rb

@@ -5,7 +5,7 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # ExtractLogFieldResults model.
+  # log field path values
   class LogAnalytics::Models::ExtractLogFieldResults
     # log field path values
     # @return [Array<String>]

data/lib/oci/log_analytics/models/extract_log_header_details.rb

@@ -5,7 +5,7 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # ExtractLogHeaderDetails model.
+  # log header values
   class LogAnalytics::Models::ExtractLogHeaderDetails
     # key
     # @return [String]

data/lib/oci/log_analytics/models/extract_log_header_results.rb

@@ -5,7 +5,7 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # ExtractLogHeaderResults model.
+  # log header values
   class LogAnalytics::Models::ExtractLogHeaderResults
     # log header json paths
     # @return [Array<OCI::LogAnalytics::Models::ExtractLogHeaderDetails>]

data/lib/oci/log_analytics/models/file_validation_response.rb

@@ -7,15 +7,15 @@ require 'date'
 module OCI
   # Response object containing details about file upload eligibility.
   class LogAnalytics::Models::FileValidationResponse
-    # **[Required]** Input File
+    # **[Required]** Input File Name.
     # @return [String]
     attr_accessor :input_file
 
-    # **[Required]** Object Location
+    # **[Required]** Object Location where file content is available.
     # @return [String]
     attr_accessor :object_location
 
-    # Files
+    # List of files inside the given archive file and their corresponding status information.
     # @return [Array<OCI::LogAnalytics::Models::UploadFileStatus>]
     attr_accessor :files
 

data/lib/oci/log_analytics/models/filter.rb

@@ -29,7 +29,7 @@ module OCI
       OPERATOR_CLEAR_SUBQUERY = 'CLEAR_SUBQUERY'.freeze
     ].freeze
 
-    # Field filter references when inserting filter into the query string. Field must be a valid enterprise logging out-of-the-box field, virtual field calculated in the query or a user defined field.
+    # Field filter references when inserting filter into the query string. Field must be a valid logging analytics out-of-the-box field, virtual field calculated in the query or a user defined field.
     #
     # @return [String]
     attr_accessor :field_name

data/lib/oci/log_analytics/models/filter_details.rb

@@ -12,7 +12,7 @@ module OCI
       SUB_SYSTEM_LOG = 'LOG'.freeze
     ].freeze
 
-    # **[Required]** Query to update.
+    # **[Required]** Query to apply edits to.
     # @return [String]
     attr_accessor :query_string
 

data/lib/oci/log_analytics/models/label_source_summary.rb

@@ -5,7 +5,7 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # LabelSourceSummary model.
+  # source summary
   class LogAnalytics::Models::LabelSourceSummary
     # display name
     # @return [String]

data/lib/oci/log_analytics/models/log_analytics_entity_summary.rb

@@ -86,6 +86,18 @@ module OCI
     # @return [String]
     attr_accessor :source_id
 
+    # Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only.
+    # Example: `{\"bar-key\": \"value\"}`
+    #
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
+    # Defined tags for this resource. Each key is predefined and scoped to a namespace.
+    # Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}`
+    #
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -103,7 +115,9 @@ module OCI
         'time_created': :'timeCreated',
         'time_updated': :'timeUpdated',
         'are_logs_collected': :'areLogsCollected',
-        'source_id': :'sourceId'
+        'source_id': :'sourceId',
+        'freeform_tags': :'freeformTags',
+        'defined_tags': :'definedTags'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -125,7 +139,9 @@ module OCI
         'time_created': :'DateTime',
         'time_updated': :'DateTime',
         'are_logs_collected': :'BOOLEAN',
-        'source_id': :'String'
+        'source_id': :'String',
+        'freeform_tags': :'Hash<String, String>',
+        'defined_tags': :'Hash<String, Hash<String, Object>>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -150,6 +166,8 @@ module OCI
     # @option attributes [DateTime] :time_updated The value to assign to the {#time_updated} property
     # @option attributes [BOOLEAN] :are_logs_collected The value to assign to the {#are_logs_collected} property
     # @option attributes [String] :source_id The value to assign to the {#source_id} 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
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -231,6 +249,18 @@ module OCI
       raise 'You cannot provide both :sourceId and :source_id' if attributes.key?(:'sourceId') && attributes.key?(:'source_id')
 
       self.source_id = attributes[:'source_id'] if attributes[:'source_id']
+
+      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
+
+      raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
+
+      self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
+
+      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
+
+      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']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -270,7 +300,9 @@ module OCI
         time_created == other.time_created &&
         time_updated == other.time_updated &&
         are_logs_collected == other.are_logs_collected &&
-        source_id == other.source_id
+        source_id == other.source_id &&
+        freeform_tags == other.freeform_tags &&
+        defined_tags == other.defined_tags
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -286,7 +318,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, name, compartment_id, entity_type_name, entity_type_internal_name, lifecycle_state, lifecycle_details, management_agent_id, cloud_resource_id, timezone_region, time_created, time_updated, are_logs_collected, source_id].hash
+      [id, name, compartment_id, entity_type_name, entity_type_internal_name, lifecycle_state, lifecycle_details, management_agent_id, cloud_resource_id, timezone_region, time_created, time_updated, are_logs_collected, source_id, freeform_tags, defined_tags].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines