oci 2.6.0 → 2.7.0

data/lib/oci/analytics/models/work_request_resource_type.rb

@@ -0,0 +1,9 @@
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+
+module OCI
+  module Analytics::Models
+    WORK_REQUEST_RESOURCE_TYPE_ENUM = [
+      WORK_REQUEST_RESOURCE_TYPE_ANALYTICS_INSTANCE = 'ANALYTICS_INSTANCE'.freeze
+    ].freeze
+  end
+end

data/lib/oci/analytics/models/work_request_sort_by.rb

@@ -0,0 +1,14 @@
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+
+module OCI
+  module Analytics::Models
+    WORK_REQUEST_SORT_BY_ENUM = [
+      WORK_REQUEST_SORT_BY_ID = 'id'.freeze,
+      WORK_REQUEST_SORT_BY_OPERATION_TYPE = 'operationType'.freeze,
+      WORK_REQUEST_SORT_BY_STATUS = 'status'.freeze,
+      WORK_REQUEST_SORT_BY_TIME_ACCEPTED = 'timeAccepted'.freeze,
+      WORK_REQUEST_SORT_BY_TIME_STARTED = 'timeStarted'.freeze,
+      WORK_REQUEST_SORT_BY_TIME_FINISHED = 'timeFinished'.freeze
+    ].freeze
+  end
+end

data/lib/oci/analytics/models/work_request_status.rb

@@ -0,0 +1,14 @@
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+
+module OCI
+  module Analytics::Models
+    WORK_REQUEST_STATUS_ENUM = [
+      WORK_REQUEST_STATUS_ACCEPTED = 'ACCEPTED'.freeze,
+      WORK_REQUEST_STATUS_IN_PROGRESS = 'IN_PROGRESS'.freeze,
+      WORK_REQUEST_STATUS_FAILED = 'FAILED'.freeze,
+      WORK_REQUEST_STATUS_SUCCEEDED = 'SUCCEEDED'.freeze,
+      WORK_REQUEST_STATUS_CANCELING = 'CANCELING'.freeze,
+      WORK_REQUEST_STATUS_CANCELED = 'CANCELED'.freeze
+    ].freeze
+  end
+end

data/lib/oci/analytics/models/work_request_summary.rb

@@ -0,0 +1,300 @@
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+
+require 'date'
+require 'logger'
+
+# rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
+module OCI
+  # An asynchronous work request.
+  class Analytics::Models::WorkRequestSummary
+    OPERATION_TYPE_ENUM = [
+      OPERATION_TYPE_CREATE_ANALYTICS_INSTANCE = 'CREATE_ANALYTICS_INSTANCE'.freeze,
+      OPERATION_TYPE_DELETE_ANALYTICS_INSTANCE = 'DELETE_ANALYTICS_INSTANCE'.freeze,
+      OPERATION_TYPE_START_ANALYTICS_INSTANCE = 'START_ANALYTICS_INSTANCE'.freeze,
+      OPERATION_TYPE_STOP_ANALYTICS_INSTANCE = 'STOP_ANALYTICS_INSTANCE'.freeze,
+      OPERATION_TYPE_SCALE_ANALYTICS_INSTANCE = 'SCALE_ANALYTICS_INSTANCE'.freeze,
+      OPERATION_TYPE_CHANGE_ANALYTICS_INSTANCE_COMPARTMENT = 'CHANGE_ANALYTICS_INSTANCE_COMPARTMENT'.freeze,
+      OPERATION_TYPE_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
+    ].freeze
+
+    STATUS_ENUM = [
+      STATUS_ACCEPTED = 'ACCEPTED'.freeze,
+      STATUS_IN_PROGRESS = 'IN_PROGRESS'.freeze,
+      STATUS_FAILED = 'FAILED'.freeze,
+      STATUS_SUCCEEDED = 'SUCCEEDED'.freeze,
+      STATUS_CANCELING = 'CANCELING'.freeze,
+      STATUS_CANCELED = 'CANCELED'.freeze,
+      STATUS_UNKNOWN_ENUM_VALUE = 'UNKNOWN_ENUM_VALUE'.freeze
+    ].freeze
+
+    # **[Required]** The resource OCID.
+    #
+    # @return [String]
+    attr_accessor :id
+
+    # **[Required]** The operation performed by the work request.
+    #
+    # @return [String]
+    attr_reader :operation_type
+
+    # **[Required]** The current status of the work request.
+    #
+    # @return [String]
+    attr_reader :status
+
+    # **[Required]** The compartment OCID of this work request.
+    #
+    # @return [String]
+    attr_accessor :compartment_id
+
+    # **[Required]** The resources this work request affects.
+    #
+    # @return [Array<OCI::Analytics::Models::WorkRequestResource>]
+    attr_accessor :resources
+
+    # **[Required]** The time the work request was accepted, in the format defined by RFC3339.
+    #
+    # Example: `2016-08-25T21:10:29.600Z`
+    #
+    # @return [DateTime]
+    attr_accessor :time_accepted
+
+    # The time the work request was started, in the format defined by RFC3339.
+    #
+    # Example: `2016-08-25T21:10:29.600Z`
+    #
+    # @return [DateTime]
+    attr_accessor :time_started
+
+    # The time the work request was finished, in the format defined by RFC3339.
+    #
+    # Example: `2016-08-25T21:10:29.600Z`
+    #
+    # @return [DateTime]
+    attr_accessor :time_finished
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'id': :'id',
+        'operation_type': :'operationType',
+        'status': :'status',
+        'compartment_id': :'compartmentId',
+        'resources': :'resources',
+        'time_accepted': :'timeAccepted',
+        'time_started': :'timeStarted',
+        'time_finished': :'timeFinished'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'id': :'String',
+        'operation_type': :'String',
+        'status': :'String',
+        'compartment_id': :'String',
+        'resources': :'Array<OCI::Analytics::Models::WorkRequestResource>',
+        'time_accepted': :'DateTime',
+        'time_started': :'DateTime',
+        'time_finished': :'DateTime'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :id The value to assign to the {#id} property
+    # @option attributes [String] :operation_type The value to assign to the {#operation_type} property
+    # @option attributes [String] :status The value to assign to the {#status} property
+    # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
+    # @option attributes [Array<OCI::Analytics::Models::WorkRequestResource>] :resources The value to assign to the {#resources} property
+    # @option attributes [DateTime] :time_accepted The value to assign to the {#time_accepted} property
+    # @option attributes [DateTime] :time_started The value to assign to the {#time_started} property
+    # @option attributes [DateTime] :time_finished The value to assign to the {#time_finished} 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.id = attributes[:'id'] if attributes[:'id']
+
+      self.operation_type = attributes[:'operationType'] if attributes[:'operationType']
+
+      raise 'You cannot provide both :operationType and :operation_type' if attributes.key?(:'operationType') && attributes.key?(:'operation_type')
+
+      self.operation_type = attributes[:'operation_type'] if attributes[:'operation_type']
+
+      self.status = attributes[:'status'] if attributes[:'status']
+
+      self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
+
+      raise 'You cannot provide both :compartmentId and :compartment_id' if attributes.key?(:'compartmentId') && attributes.key?(:'compartment_id')
+
+      self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
+
+      self.resources = attributes[:'resources'] if attributes[:'resources']
+
+      self.time_accepted = attributes[:'timeAccepted'] if attributes[:'timeAccepted']
+
+      raise 'You cannot provide both :timeAccepted and :time_accepted' if attributes.key?(:'timeAccepted') && attributes.key?(:'time_accepted')
+
+      self.time_accepted = attributes[:'time_accepted'] if attributes[:'time_accepted']
+
+      self.time_started = attributes[:'timeStarted'] if attributes[:'timeStarted']
+
+      raise 'You cannot provide both :timeStarted and :time_started' if attributes.key?(:'timeStarted') && attributes.key?(:'time_started')
+
+      self.time_started = attributes[:'time_started'] if attributes[:'time_started']
+
+      self.time_finished = attributes[:'timeFinished'] if attributes[:'timeFinished']
+
+      raise 'You cannot provide both :timeFinished and :time_finished' if attributes.key?(:'timeFinished') && attributes.key?(:'time_finished')
+
+      self.time_finished = attributes[:'time_finished'] if attributes[:'time_finished']
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] operation_type Object to be assigned
+    def operation_type=(operation_type)
+      # rubocop:disable Style/ConditionalAssignment
+      if operation_type && !OPERATION_TYPE_ENUM.include?(operation_type)
+        OCI.logger.debug("Unknown value for 'operation_type' [" + operation_type + "]. Mapping to 'OPERATION_TYPE_UNKNOWN_ENUM_VALUE'") if OCI.logger
+        @operation_type = OPERATION_TYPE_UNKNOWN_ENUM_VALUE
+      else
+        @operation_type = operation_type
+      end
+      # rubocop:enable Style/ConditionalAssignment
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] status Object to be assigned
+    def status=(status)
+      # rubocop:disable Style/ConditionalAssignment
+      if status && !STATUS_ENUM.include?(status)
+        OCI.logger.debug("Unknown value for 'status' [" + status + "]. Mapping to 'STATUS_UNKNOWN_ENUM_VALUE'") if OCI.logger
+        @status = STATUS_UNKNOWN_ENUM_VALUE
+      else
+        @status = status
+      end
+      # rubocop:enable Style/ConditionalAssignment
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
+
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] other the other object to be compared
+    def ==(other)
+      return true if equal?(other)
+
+      self.class == other.class &&
+        id == other.id &&
+        operation_type == other.operation_type &&
+        status == other.status &&
+        compartment_id == other.compartment_id &&
+        resources == other.resources &&
+        time_accepted == other.time_accepted &&
+        time_started == other.time_started &&
+        time_finished == other.time_finished
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
+
+    # @see the `==` method
+    # @param [Object] other the other object to be compared
+    def eql?(other)
+      self == other
+    end
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [id, operation_type, status, compartment_id, resources, time_accepted, time_started, time_finished].hash
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            public_method("#{key}=").call(
+              attributes[self.class.attribute_map[key]]
+                .map { |v| OCI::Internal::Util.convert_to_type(Regexp.last_match(1), v) }
+            )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          public_method("#{key}=").call(
+            OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]])
+          )
+        end
+        # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = public_method(attr).call
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    private
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end
+# rubocop:enable Lint/UnneededCopDisableDirective, Metrics/LineLength

data/lib/oci/analytics/util.rb

@@ -0,0 +1,2 @@
+# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+

data/lib/oci/audit/audit.rb

@@ -12,6 +12,11 @@ end
 # Require models
 require 'oci/audit/models/audit_event'
 require 'oci/audit/models/configuration'
+require 'oci/audit/models/data'
+require 'oci/audit/models/identity'
+require 'oci/audit/models/request'
+require 'oci/audit/models/response'
+require 'oci/audit/models/state_change'
 require 'oci/audit/models/update_configuration_details'
 
 # Require generated clients

data/lib/oci/audit/audit_client.rb

@@ -5,7 +5,10 @@ require 'logger'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # API for the Audit Service. You can use this API for queries, but not bulk-export operations.
+  # API for the Audit Service. Use this API for compliance monitoring in your tenancy.
+  # For more information, see [Overview of Audit](/iaas/Content/Audit/Concepts/auditoverview.htm).
+  #
+  # **Tip**: This API is good for queries, but not bulk-export operations.
   class Audit::AuditClient
     # Client used to make HTTP requests.
     # @return [OCI::ApiClient]
@@ -76,7 +79,7 @@ module OCI
       @retry_config = retry_config
 
       if endpoint
-        @endpoint = endpoint + '/20160918'
+        @endpoint = endpoint + '/20190901'
       else
         region ||= config.region
         region ||= signer.region if signer.respond_to?(:region)
@@ -94,7 +97,7 @@ module OCI
 
       raise 'A region must be specified.' unless @region
 
-      @endpoint = OCI::Regions.get_service_endpoint(@region, :AuditClient) + '/20160918'
+      @endpoint = OCI::Regions.get_service_endpoint_for_template(@region, 'https://audit.{region}.oraclecloud.com') + '/20190901'
       logger.info "AuditClient endpoint set to '#{@endpoint} from region #{@region}'." if logger
     end
 
@@ -161,22 +164,35 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
-    # Returns all audit events for the specified compartment that were processed within the specified time range.
-    # @param [String] compartment_id The OCID of the compartment.
-    # @param [DateTime] start_time Returns events that were processed at or after this start date and time, expressed in [RFC 3339](https://tools.ietf.org/html/rfc3339) timestamp format.
-    #   For example, a start value of `2017-01-15T11:30:00Z` will retrieve a list of all events processed since 30 minutes after the 11th hour of January 15, 2017, in Coordinated Universal Time (UTC).
-    #   You can specify a value with granularity to the minute. Seconds (and milliseconds, if included) must be set to `0`.
+    # Returns all the audit events processed for the specified compartment within the specified
+    # time range.
     #
-    # @param [DateTime] end_time Returns events that were processed before this end date and time, expressed in [RFC 3339](https://tools.ietf.org/html/rfc3339) timestamp format. For example, a start value of `2017-01-01T00:00:00Z` and an end value of `2017-01-02T00:00:00Z` will retrieve a list of all events processed on January 1, 2017.
-    #   Similarly, a start value of `2017-01-01T00:00:00Z` and an end value of `2017-02-01T00:00:00Z` will result in a list of all events processed between January 1, 2017 and January 31, 2017.
-    #   You can specify a value with granularity to the minute. Seconds (and milliseconds, if included) must be set to `0`.
+    # @param [String] compartment_id The [OCID](https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the compartment.
+    # @param [DateTime] start_time Returns events that were processed at or after this start date and time, expressed in
+    #   [RFC 3339](https://tools.ietf.org/html/rfc3339) timestamp format.
+    #
+    #   For example, a start value of `2017-01-15T11:30:00Z` will retrieve a list of all events processed
+    #   since 30 minutes after the 11th hour of January 15, 2017, in Coordinated Universal Time (UTC).
+    #   You can specify a value with granularity to the minute. Seconds (and milliseconds, if included) must
+    #   be set to `0`.
+    #
+    # @param [DateTime] end_time Returns events that were processed before this end date and time, expressed in
+    #   [RFC 3339](https://tools.ietf.org/html/rfc3339) timestamp format.
+    #
+    #   For example, a start value of `2017-01-01T00:00:00Z` and an end value of `2017-01-02T00:00:00Z`
+    #   will retrieve a list of all events processed on January 1, 2017. Similarly, a start value of
+    #   `2017-01-01T00:00:00Z` and an end value of `2017-02-01T00:00:00Z` will result in a list of all
+    #   events processed between January 1, 2017 and January 31, 2017. You can specify a value with
+    #   granularity to the minute. Seconds (and milliseconds, if included) must be set to `0`.
     #
     # @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] :page The value of the `opc-next-page` response header from the previous list query.
-    # @option opts [String] :opc_request_id Unique Oracle-assigned identifier for the request.
-    #   If you need to contact Oracle about a particular request, please provide the request ID.
+    # @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] :opc_request_id Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a
+    #   particular request, please provide the request ID.
     #
     # @return [Response] A Response object with data of type Array<{OCI::Audit::Models::AuditEvent AuditEvent}>
     def list_events(compartment_id, start_time, end_time, opts = {})

data/lib/oci/audit/models/audit_event.rb

@@ -4,126 +4,80 @@ require 'date'
 
 # rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
 module OCI
-  # AuditEvent model.
+  # All the attributes of an audit event. For more information, see [Viewing Audit Log Events](https://docs.cloud.oracle.com/iaas/Content/Audit/Tasks/viewinglogevents.htm).
+  #
   class Audit::Models::AuditEvent
-    # The OCID of the tenant.
-    # @return [String]
-    attr_accessor :tenant_id
-
-    # The OCID of the compartment.
-    # @return [String]
-    attr_accessor :compartment_id
-
-    # The name of the compartment. This value is the friendly name associated with compartmentId.
-    # This value can change, but the service logs the value that appeared at the time of the audit event.
+    # The type of event that happened.
+    #
+    # The service that produces the event can also add, remove, or change the meaning of a field.
+    # A service implementing these type changes would publish a new version of an `eventType` and
+    # revise the `eventTypeVersion` field.
+    #
+    # Example: `com.oraclecloud.ComputeApi.GetInstance`
     #
     # @return [String]
-    attr_accessor :compartment_name
+    attr_accessor :event_type
 
-    # The GUID of the event.
+    # The version of the CloudEvents specification. The structure of the envelope follows the
+    # [CloudEvents](https://github.com/cloudevents/spec) industry standard format hosted by the
+    # [Cloud Native Computing Foundation ( CNCF)](https://www.cncf.io/).
+    #
+    # Audit uses version 0.1 specification of the CloudEvents event envelope.
+    #
+    # Example: `0.1`
+    #
     # @return [String]
-    attr_accessor :event_id
+    attr_accessor :cloud_events_version
 
-    # The name of the event.
-    # Example: `LaunchInstance`
+    # The version of the event type. This version applies to the payload of the event, not the envelope.
+    # Use `cloudEventsVersion` to determine the version of the envelope.
+    #
+    # Example: `2.0`
     #
     # @return [String]
-    attr_accessor :event_name
+    attr_accessor :event_type_version
 
     # The source of the event.
+    #
+    # Example: `ComputeApi`
+    #
     # @return [String]
-    attr_accessor :event_source
+    attr_accessor :source
 
-    # The type of the event.
+    # The GUID of the event.
+    #
     # @return [String]
-    attr_accessor :event_type
+    attr_accessor :event_id
 
     # The time the event occurred, expressed in [RFC 3339](https://tools.ietf.org/html/rfc3339) timestamp format.
+    #
+    # Example: `2019-09-18T00:10:59.252Z`
+    #
     # @return [DateTime]
     attr_accessor :event_time
 
-    # The OCID of the user whose action triggered the event.
-    # @return [String]
-    attr_accessor :principal_id
-
-    # The credential ID of the user. This value is extracted from the HTTP 'Authorization' request header. It consists of the tenantId, userId, and user fingerprint, all delimited by a slash (/).
-    # @return [String]
-    attr_accessor :credential_id
-
-    # The HTTP method of the request.
-    # @return [String]
-    attr_accessor :request_action
-
-    # The opc-request-id of the request.
-    # @return [String]
-    attr_accessor :request_id
-
-    # The user agent of the client that made the request.
-    # @return [String]
-    attr_accessor :request_agent
-
-    # The HTTP header fields and values in the request.
-    # @return [Hash<String, Array<String>>]
-    attr_accessor :request_headers
-
-    # The IP address of the source of the request.
-    # @return [String]
-    attr_accessor :request_origin
-
-    # The query parameter fields and values for the request.
-    # @return [Hash<String, Array<String>>]
-    attr_accessor :request_parameters
-
-    # The resource targeted by the request.
-    # @return [String]
-    attr_accessor :request_resource
-
-    # The headers of the response.
-    # @return [Hash<String, Array<String>>]
-    attr_accessor :response_headers
-
-    # The status code of the response.
+    # The content type of the data contained in `data`.
+    #
+    # Example: `application/json`
+    #
     # @return [String]
-    attr_accessor :response_status
+    attr_accessor :content_type
 
-    # The time of the response to the audited request, expressed in [RFC 3339](https://tools.ietf.org/html/rfc3339) timestamp format.
-    # @return [DateTime]
-    attr_accessor :response_time
-
-    # Metadata of interest from the response payload. For example, the OCID of a resource.
-    # @return [Hash<String, Object>]
-    attr_accessor :response_payload
-
-    # The name of the user or service. This value is the friendly name associated with principalId.
-    # @return [String]
-    attr_accessor :user_name
+    # @return [OCI::Audit::Models::Data]
+    attr_accessor :data
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
-        'tenant_id': :'tenantId',
-        'compartment_id': :'compartmentId',
-        'compartment_name': :'compartmentName',
-        'event_id': :'eventId',
-        'event_name': :'eventName',
-        'event_source': :'eventSource',
         'event_type': :'eventType',
+        'cloud_events_version': :'cloudEventsVersion',
+        'event_type_version': :'eventTypeVersion',
+        'source': :'source',
+        'event_id': :'eventId',
         'event_time': :'eventTime',
-        'principal_id': :'principalId',
-        'credential_id': :'credentialId',
-        'request_action': :'requestAction',
-        'request_id': :'requestId',
-        'request_agent': :'requestAgent',
-        'request_headers': :'requestHeaders',
-        'request_origin': :'requestOrigin',
-        'request_parameters': :'requestParameters',
-        'request_resource': :'requestResource',
-        'response_headers': :'responseHeaders',
-        'response_status': :'responseStatus',
-        'response_time': :'responseTime',
-        'response_payload': :'responsePayload',
-        'user_name': :'userName'
+        'content_type': :'contentType',
+        'data': :'data'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -132,28 +86,14 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
-        'tenant_id': :'String',
-        'compartment_id': :'String',
-        'compartment_name': :'String',
-        'event_id': :'String',
-        'event_name': :'String',
-        'event_source': :'String',
         'event_type': :'String',
+        'cloud_events_version': :'String',
+        'event_type_version': :'String',
+        'source': :'String',
+        'event_id': :'String',
         'event_time': :'DateTime',
-        'principal_id': :'String',
-        'credential_id': :'String',
-        'request_action': :'String',
-        'request_id': :'String',
-        'request_agent': :'String',
-        'request_headers': :'Hash<String, Array<String>>',
-        'request_origin': :'String',
-        'request_parameters': :'Hash<String, Array<String>>',
-        'request_resource': :'String',
-        'response_headers': :'Hash<String, Array<String>>',
-        'response_status': :'String',
-        'response_time': :'DateTime',
-        'response_payload': :'Hash<String, Object>',
-        'user_name': :'String'
+        'content_type': :'String',
+        'data': :'OCI::Audit::Models::Data'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -164,51 +104,39 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
-    # @option attributes [String] :tenant_id The value to assign to the {#tenant_id} property
-    # @option attributes [String] :compartment_id The value to assign to the {#compartment_id} property
-    # @option attributes [String] :compartment_name The value to assign to the {#compartment_name} property
-    # @option attributes [String] :event_id The value to assign to the {#event_id} property
-    # @option attributes [String] :event_name The value to assign to the {#event_name} property
-    # @option attributes [String] :event_source The value to assign to the {#event_source} property
     # @option attributes [String] :event_type The value to assign to the {#event_type} property
+    # @option attributes [String] :cloud_events_version The value to assign to the {#cloud_events_version} property
+    # @option attributes [String] :event_type_version The value to assign to the {#event_type_version} property
+    # @option attributes [String] :source The value to assign to the {#source} property
+    # @option attributes [String] :event_id The value to assign to the {#event_id} property
     # @option attributes [DateTime] :event_time The value to assign to the {#event_time} property
-    # @option attributes [String] :principal_id The value to assign to the {#principal_id} property
-    # @option attributes [String] :credential_id The value to assign to the {#credential_id} property
-    # @option attributes [String] :request_action The value to assign to the {#request_action} property
-    # @option attributes [String] :request_id The value to assign to the {#request_id} property
-    # @option attributes [String] :request_agent The value to assign to the {#request_agent} property
-    # @option attributes [Hash<String, Array<String>>] :request_headers The value to assign to the {#request_headers} property
-    # @option attributes [String] :request_origin The value to assign to the {#request_origin} property
-    # @option attributes [Hash<String, Array<String>>] :request_parameters The value to assign to the {#request_parameters} property
-    # @option attributes [String] :request_resource The value to assign to the {#request_resource} property
-    # @option attributes [Hash<String, Array<String>>] :response_headers The value to assign to the {#response_headers} property
-    # @option attributes [String] :response_status The value to assign to the {#response_status} property
-    # @option attributes [DateTime] :response_time The value to assign to the {#response_time} property
-    # @option attributes [Hash<String, Object>] :response_payload The value to assign to the {#response_payload} property
-    # @option attributes [String] :user_name The value to assign to the {#user_name} property
+    # @option attributes [String] :content_type The value to assign to the {#content_type} property
+    # @option attributes [OCI::Audit::Models::Data] :data The value to assign to the {#data} 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.tenant_id = attributes[:'tenantId'] if attributes[:'tenantId']
+      self.event_type = attributes[:'eventType'] if attributes[:'eventType']
+
+      raise 'You cannot provide both :eventType and :event_type' if attributes.key?(:'eventType') && attributes.key?(:'event_type')
 
-      raise 'You cannot provide both :tenantId and :tenant_id' if attributes.key?(:'tenantId') && attributes.key?(:'tenant_id')
+      self.event_type = attributes[:'event_type'] if attributes[:'event_type']
 
-      self.tenant_id = attributes[:'tenant_id'] if attributes[:'tenant_id']
+      self.cloud_events_version = attributes[:'cloudEventsVersion'] if attributes[:'cloudEventsVersion']
 
-      self.compartment_id = attributes[:'compartmentId'] if attributes[:'compartmentId']
+      raise 'You cannot provide both :cloudEventsVersion and :cloud_events_version' if attributes.key?(:'cloudEventsVersion') && attributes.key?(:'cloud_events_version')
 
-      raise 'You cannot provide both :compartmentId and :compartment_id' if attributes.key?(:'compartmentId') && attributes.key?(:'compartment_id')
+      self.cloud_events_version = attributes[:'cloud_events_version'] if attributes[:'cloud_events_version']
 
-      self.compartment_id = attributes[:'compartment_id'] if attributes[:'compartment_id']
+      self.event_type_version = attributes[:'eventTypeVersion'] if attributes[:'eventTypeVersion']
 
-      self.compartment_name = attributes[:'compartmentName'] if attributes[:'compartmentName']
+      raise 'You cannot provide both :eventTypeVersion and :event_type_version' if attributes.key?(:'eventTypeVersion') && attributes.key?(:'event_type_version')
 
-      raise 'You cannot provide both :compartmentName and :compartment_name' if attributes.key?(:'compartmentName') && attributes.key?(:'compartment_name')
+      self.event_type_version = attributes[:'event_type_version'] if attributes[:'event_type_version']
 
-      self.compartment_name = attributes[:'compartment_name'] if attributes[:'compartment_name']
+      self.source = attributes[:'source'] if attributes[:'source']
 
       self.event_id = attributes[:'eventId'] if attributes[:'eventId']
 
@@ -216,113 +144,19 @@ module OCI
 
       self.event_id = attributes[:'event_id'] if attributes[:'event_id']
 
-      self.event_name = attributes[:'eventName'] if attributes[:'eventName']
-
-      raise 'You cannot provide both :eventName and :event_name' if attributes.key?(:'eventName') && attributes.key?(:'event_name')
-
-      self.event_name = attributes[:'event_name'] if attributes[:'event_name']
-
-      self.event_source = attributes[:'eventSource'] if attributes[:'eventSource']
-
-      raise 'You cannot provide both :eventSource and :event_source' if attributes.key?(:'eventSource') && attributes.key?(:'event_source')
-
-      self.event_source = attributes[:'event_source'] if attributes[:'event_source']
-
-      self.event_type = attributes[:'eventType'] if attributes[:'eventType']
-
-      raise 'You cannot provide both :eventType and :event_type' if attributes.key?(:'eventType') && attributes.key?(:'event_type')
-
-      self.event_type = attributes[:'event_type'] if attributes[:'event_type']
-
       self.event_time = attributes[:'eventTime'] if attributes[:'eventTime']
 
       raise 'You cannot provide both :eventTime and :event_time' if attributes.key?(:'eventTime') && attributes.key?(:'event_time')
 
       self.event_time = attributes[:'event_time'] if attributes[:'event_time']
 
-      self.principal_id = attributes[:'principalId'] if attributes[:'principalId']
-
-      raise 'You cannot provide both :principalId and :principal_id' if attributes.key?(:'principalId') && attributes.key?(:'principal_id')
-
-      self.principal_id = attributes[:'principal_id'] if attributes[:'principal_id']
-
-      self.credential_id = attributes[:'credentialId'] if attributes[:'credentialId']
-
-      raise 'You cannot provide both :credentialId and :credential_id' if attributes.key?(:'credentialId') && attributes.key?(:'credential_id')
-
-      self.credential_id = attributes[:'credential_id'] if attributes[:'credential_id']
-
-      self.request_action = attributes[:'requestAction'] if attributes[:'requestAction']
-
-      raise 'You cannot provide both :requestAction and :request_action' if attributes.key?(:'requestAction') && attributes.key?(:'request_action')
-
-      self.request_action = attributes[:'request_action'] if attributes[:'request_action']
-
-      self.request_id = attributes[:'requestId'] if attributes[:'requestId']
-
-      raise 'You cannot provide both :requestId and :request_id' if attributes.key?(:'requestId') && attributes.key?(:'request_id')
-
-      self.request_id = attributes[:'request_id'] if attributes[:'request_id']
-
-      self.request_agent = attributes[:'requestAgent'] if attributes[:'requestAgent']
-
-      raise 'You cannot provide both :requestAgent and :request_agent' if attributes.key?(:'requestAgent') && attributes.key?(:'request_agent')
-
-      self.request_agent = attributes[:'request_agent'] if attributes[:'request_agent']
+      self.content_type = attributes[:'contentType'] if attributes[:'contentType']
 
-      self.request_headers = attributes[:'requestHeaders'] if attributes[:'requestHeaders']
+      raise 'You cannot provide both :contentType and :content_type' if attributes.key?(:'contentType') && attributes.key?(:'content_type')
 
-      raise 'You cannot provide both :requestHeaders and :request_headers' if attributes.key?(:'requestHeaders') && attributes.key?(:'request_headers')
+      self.content_type = attributes[:'content_type'] if attributes[:'content_type']
 
-      self.request_headers = attributes[:'request_headers'] if attributes[:'request_headers']
-
-      self.request_origin = attributes[:'requestOrigin'] if attributes[:'requestOrigin']
-
-      raise 'You cannot provide both :requestOrigin and :request_origin' if attributes.key?(:'requestOrigin') && attributes.key?(:'request_origin')
-
-      self.request_origin = attributes[:'request_origin'] if attributes[:'request_origin']
-
-      self.request_parameters = attributes[:'requestParameters'] if attributes[:'requestParameters']
-
-      raise 'You cannot provide both :requestParameters and :request_parameters' if attributes.key?(:'requestParameters') && attributes.key?(:'request_parameters')
-
-      self.request_parameters = attributes[:'request_parameters'] if attributes[:'request_parameters']
-
-      self.request_resource = attributes[:'requestResource'] if attributes[:'requestResource']
-
-      raise 'You cannot provide both :requestResource and :request_resource' if attributes.key?(:'requestResource') && attributes.key?(:'request_resource')
-
-      self.request_resource = attributes[:'request_resource'] if attributes[:'request_resource']
-
-      self.response_headers = attributes[:'responseHeaders'] if attributes[:'responseHeaders']
-
-      raise 'You cannot provide both :responseHeaders and :response_headers' if attributes.key?(:'responseHeaders') && attributes.key?(:'response_headers')
-
-      self.response_headers = attributes[:'response_headers'] if attributes[:'response_headers']
-
-      self.response_status = attributes[:'responseStatus'] if attributes[:'responseStatus']
-
-      raise 'You cannot provide both :responseStatus and :response_status' if attributes.key?(:'responseStatus') && attributes.key?(:'response_status')
-
-      self.response_status = attributes[:'response_status'] if attributes[:'response_status']
-
-      self.response_time = attributes[:'responseTime'] if attributes[:'responseTime']
-
-      raise 'You cannot provide both :responseTime and :response_time' if attributes.key?(:'responseTime') && attributes.key?(:'response_time')
-
-      self.response_time = attributes[:'response_time'] if attributes[:'response_time']
-
-      self.response_payload = attributes[:'responsePayload'] if attributes[:'responsePayload']
-
-      raise 'You cannot provide both :responsePayload and :response_payload' if attributes.key?(:'responsePayload') && attributes.key?(:'response_payload')
-
-      self.response_payload = attributes[:'response_payload'] if attributes[:'response_payload']
-
-      self.user_name = attributes[:'userName'] if attributes[:'userName']
-
-      raise 'You cannot provide both :userName and :user_name' if attributes.key?(:'userName') && attributes.key?(:'user_name')
-
-      self.user_name = attributes[:'user_name'] if attributes[:'user_name']
+      self.data = attributes[:'data'] if attributes[:'data']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -336,28 +170,14 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
-        tenant_id == other.tenant_id &&
-        compartment_id == other.compartment_id &&
-        compartment_name == other.compartment_name &&
-        event_id == other.event_id &&
-        event_name == other.event_name &&
-        event_source == other.event_source &&
         event_type == other.event_type &&
+        cloud_events_version == other.cloud_events_version &&
+        event_type_version == other.event_type_version &&
+        source == other.source &&
+        event_id == other.event_id &&
         event_time == other.event_time &&
-        principal_id == other.principal_id &&
-        credential_id == other.credential_id &&
-        request_action == other.request_action &&
-        request_id == other.request_id &&
-        request_agent == other.request_agent &&
-        request_headers == other.request_headers &&
-        request_origin == other.request_origin &&
-        request_parameters == other.request_parameters &&
-        request_resource == other.request_resource &&
-        response_headers == other.response_headers &&
-        response_status == other.response_status &&
-        response_time == other.response_time &&
-        response_payload == other.response_payload &&
-        user_name == other.user_name
+        content_type == other.content_type &&
+        data == other.data
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -373,7 +193,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [tenant_id, compartment_id, compartment_name, event_id, event_name, event_source, event_type, event_time, principal_id, credential_id, request_action, request_id, request_agent, request_headers, request_origin, request_parameters, request_resource, response_headers, response_status, response_time, response_payload, user_name].hash
+      [event_type, cloud_events_version, event_type_version, source, event_id, event_time, content_type, data].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines