pulumi-oci 2.3.0a1721242122__py3-none-any.whl → 2.4.0__py3-none-any.whl

pulumi_oci/datasafe/discovery_mod.py

@@ -8,6 +8,8 @@ import pulumi
 import pulumi.runtime
 from typing import Any, Mapping, Optional, Sequence, Union, overload
 from .. import _utilities
+from . import outputs
+from ._inputs import *
 
 __all__ = ['DiscoveryModArgs', 'DiscoveryMod']
 
@@ -25,7 +27,8 @@ class DiscoveryModArgs:
                  is_include_all_sensitive_types: Optional[pulumi.Input[bool]] = None,
                  is_sample_data_collection_enabled: Optional[pulumi.Input[bool]] = None,
                  schemas_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
-                 sensitive_type_ids_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None):
+                 sensitive_type_ids_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
+                 tables_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input['DiscoveryModTablesForDiscoveryArgs']]]] = None):
         """
         The set of arguments for constructing a DiscoveryMod resource.
         :param pulumi.Input[str] compartment_id: (Updatable) The OCID of the compartment where the discovery job resource should be created.
@@ -39,11 +42,8 @@ class DiscoveryModArgs:
         :param pulumi.Input[bool] is_include_all_sensitive_types: Indicates if all the existing sensitive types should be used by the discovery job. If it's set to true, the sensitiveTypeIdsForDiscovery attribute is ignored and all sensitive types are used for data discovery. If both attributes are not provided, the configuration from the sensitive data model is used.
         :param pulumi.Input[bool] is_sample_data_collection_enabled: Indicates if the discovery job should collect and store sample data values for the discovered columns. Sample data helps review the discovered columns and ensure that they actually contain sensitive data. As it collects original data from the target database, it's disabled by default and should be used only if it's acceptable to store sample data in Data Safe's repository in Oracle Cloud. Note that sample data values are not collected for columns with the following data types: LONG, LOB, RAW, XMLTYPE and BFILE.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] schemas_for_discoveries: The schemas to be scanned by the discovery job. If not provided, the schemasForDiscovery attribute of the sensitive data model is used to get the list of schemas.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] sensitive_type_ids_for_discoveries: The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types. 
-               
-               
-               ** IMPORTANT **
-               Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] sensitive_type_ids_for_discoveries: The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types.
+        :param pulumi.Input[Sequence[pulumi.Input['DiscoveryModTablesForDiscoveryArgs']]] tables_for_discoveries: The data discovery jobs will scan the tables specified here, including both schemas and tables. In the absence  of explicit input, the list of tables is obtained from the tablesForDiscovery attribute of the sensitive data model.
         """
         pulumi.set(__self__, "compartment_id", compartment_id)
         pulumi.set(__self__, "sensitive_data_model_id", sensitive_data_model_id)
@@ -67,6 +67,8 @@ class DiscoveryModArgs:
             pulumi.set(__self__, "schemas_for_discoveries", schemas_for_discoveries)
         if sensitive_type_ids_for_discoveries is not None:
             pulumi.set(__self__, "sensitive_type_ids_for_discoveries", sensitive_type_ids_for_discoveries)
+        if tables_for_discoveries is not None:
+            pulumi.set(__self__, "tables_for_discoveries", tables_for_discoveries)
 
     @property
     @pulumi.getter(name="compartmentId")
@@ -204,11 +206,7 @@ class DiscoveryModArgs:
     @pulumi.getter(name="sensitiveTypeIdsForDiscoveries")
     def sensitive_type_ids_for_discoveries(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
-        The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types. 
-
-
-        ** IMPORTANT **
-        Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values
+        The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types.
         """
         return pulumi.get(self, "sensitive_type_ids_for_discoveries")
 
@@ -216,6 +214,18 @@ class DiscoveryModArgs:
     def sensitive_type_ids_for_discoveries(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]):
         pulumi.set(self, "sensitive_type_ids_for_discoveries", value)
 
+    @property
+    @pulumi.getter(name="tablesForDiscoveries")
+    def tables_for_discoveries(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['DiscoveryModTablesForDiscoveryArgs']]]]:
+        """
+        The data discovery jobs will scan the tables specified here, including both schemas and tables. In the absence  of explicit input, the list of tables is obtained from the tablesForDiscovery attribute of the sensitive data model.
+        """
+        return pulumi.get(self, "tables_for_discoveries")
+
+    @tables_for_discoveries.setter
+    def tables_for_discoveries(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['DiscoveryModTablesForDiscoveryArgs']]]]):
+        pulumi.set(self, "tables_for_discoveries", value)
+
 
 @pulumi.input_type
 class _DiscoveryModState:
@@ -234,6 +244,7 @@ class _DiscoveryModState:
                  sensitive_type_ids_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  state: Optional[pulumi.Input[str]] = None,
                  system_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
+                 tables_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input['DiscoveryModTablesForDiscoveryArgs']]]] = None,
                  target_id: Optional[pulumi.Input[str]] = None,
                  time_finished: Optional[pulumi.Input[str]] = None,
                  time_started: Optional[pulumi.Input[str]] = None,
@@ -256,13 +267,10 @@ class _DiscoveryModState:
         :param pulumi.Input[bool] is_sample_data_collection_enabled: Indicates if the discovery job should collect and store sample data values for the discovered columns. Sample data helps review the discovered columns and ensure that they actually contain sensitive data. As it collects original data from the target database, it's disabled by default and should be used only if it's acceptable to store sample data in Data Safe's repository in Oracle Cloud. Note that sample data values are not collected for columns with the following data types: LONG, LOB, RAW, XMLTYPE and BFILE.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] schemas_for_discoveries: The schemas to be scanned by the discovery job. If not provided, the schemasForDiscovery attribute of the sensitive data model is used to get the list of schemas.
         :param pulumi.Input[str] sensitive_data_model_id: The OCID of the sensitive data model.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] sensitive_type_ids_for_discoveries: The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types. 
-               
-               
-               ** IMPORTANT **
-               Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] sensitive_type_ids_for_discoveries: The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types.
         :param pulumi.Input[str] state: The current state of the discovery job.
         :param pulumi.Input[Mapping[str, Any]] system_tags: System tags for this resource. Each key is predefined and scoped to a namespace. For more information, see Resource Tags. Example: `{"orcl-cloud.free-tier-retained": "true"}`
+        :param pulumi.Input[Sequence[pulumi.Input['DiscoveryModTablesForDiscoveryArgs']]] tables_for_discoveries: The data discovery jobs will scan the tables specified here, including both schemas and tables. In the absence  of explicit input, the list of tables is obtained from the tablesForDiscovery attribute of the sensitive data model.
         :param pulumi.Input[str] target_id: The OCID of the target database associated with the discovery job.
         :param pulumi.Input[str] time_finished: The date and time the discovery job finished, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339)..
         :param pulumi.Input[str] time_started: The date and time the discovery job started, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339).
@@ -301,6 +309,8 @@ class _DiscoveryModState:
             pulumi.set(__self__, "state", state)
         if system_tags is not None:
             pulumi.set(__self__, "system_tags", system_tags)
+        if tables_for_discoveries is not None:
+            pulumi.set(__self__, "tables_for_discoveries", tables_for_discoveries)
         if target_id is not None:
             pulumi.set(__self__, "target_id", target_id)
         if time_finished is not None:
@@ -456,11 +466,7 @@ class _DiscoveryModState:
     @pulumi.getter(name="sensitiveTypeIdsForDiscoveries")
     def sensitive_type_ids_for_discoveries(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
-        The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types. 
-
-
-        ** IMPORTANT **
-        Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values
+        The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types.
         """
         return pulumi.get(self, "sensitive_type_ids_for_discoveries")
 
@@ -492,6 +498,18 @@ class _DiscoveryModState:
     def system_tags(self, value: Optional[pulumi.Input[Mapping[str, Any]]]):
         pulumi.set(self, "system_tags", value)
 
+    @property
+    @pulumi.getter(name="tablesForDiscoveries")
+    def tables_for_discoveries(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['DiscoveryModTablesForDiscoveryArgs']]]]:
+        """
+        The data discovery jobs will scan the tables specified here, including both schemas and tables. In the absence  of explicit input, the list of tables is obtained from the tablesForDiscovery attribute of the sensitive data model.
+        """
+        return pulumi.get(self, "tables_for_discoveries")
+
+    @tables_for_discoveries.setter
+    def tables_for_discoveries(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['DiscoveryModTablesForDiscoveryArgs']]]]):
+        pulumi.set(self, "tables_for_discoveries", value)
+
     @property
     @pulumi.getter(name="targetId")
     def target_id(self) -> Optional[pulumi.Input[str]]:
@@ -618,6 +636,7 @@ class DiscoveryMod(pulumi.CustomResource):
                  schemas_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  sensitive_data_model_id: Optional[pulumi.Input[str]] = None,
                  sensitive_type_ids_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
+                 tables_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DiscoveryModTablesForDiscoveryArgs']]]]] = None,
                  __props__=None):
         """
         This resource provides the Discovery Job resource in Oracle Cloud Infrastructure Data Safe service.
@@ -650,7 +669,11 @@ class DiscoveryMod(pulumi.CustomResource):
             is_include_all_sensitive_types=discovery_job_is_include_all_sensitive_types,
             is_sample_data_collection_enabled=discovery_job_is_sample_data_collection_enabled,
             schemas_for_discoveries=discovery_job_schemas_for_discovery,
-            sensitive_type_ids_for_discoveries=discovery_job_sensitive_type_ids_for_discovery)
+            sensitive_type_ids_for_discoveries=discovery_job_sensitive_type_ids_for_discovery,
+            tables_for_discoveries=[oci.data_safe.DiscoveryModTablesForDiscoveryArgs(
+                schema_name=discovery_job_tables_for_discovery_schema_name,
+                table_names=discovery_job_tables_for_discovery_table_names,
+            )])
         ```
 
         ## Import
@@ -674,11 +697,8 @@ class DiscoveryMod(pulumi.CustomResource):
         :param pulumi.Input[bool] is_sample_data_collection_enabled: Indicates if the discovery job should collect and store sample data values for the discovered columns. Sample data helps review the discovered columns and ensure that they actually contain sensitive data. As it collects original data from the target database, it's disabled by default and should be used only if it's acceptable to store sample data in Data Safe's repository in Oracle Cloud. Note that sample data values are not collected for columns with the following data types: LONG, LOB, RAW, XMLTYPE and BFILE.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] schemas_for_discoveries: The schemas to be scanned by the discovery job. If not provided, the schemasForDiscovery attribute of the sensitive data model is used to get the list of schemas.
         :param pulumi.Input[str] sensitive_data_model_id: The OCID of the sensitive data model.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] sensitive_type_ids_for_discoveries: The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types. 
-               
-               
-               ** IMPORTANT **
-               Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] sensitive_type_ids_for_discoveries: The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types.
+        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DiscoveryModTablesForDiscoveryArgs']]]] tables_for_discoveries: The data discovery jobs will scan the tables specified here, including both schemas and tables. In the absence  of explicit input, the list of tables is obtained from the tablesForDiscovery attribute of the sensitive data model.
         """
         ...
     @overload
@@ -717,7 +737,11 @@ class DiscoveryMod(pulumi.CustomResource):
             is_include_all_sensitive_types=discovery_job_is_include_all_sensitive_types,
             is_sample_data_collection_enabled=discovery_job_is_sample_data_collection_enabled,
             schemas_for_discoveries=discovery_job_schemas_for_discovery,
-            sensitive_type_ids_for_discoveries=discovery_job_sensitive_type_ids_for_discovery)
+            sensitive_type_ids_for_discoveries=discovery_job_sensitive_type_ids_for_discovery,
+            tables_for_discoveries=[oci.data_safe.DiscoveryModTablesForDiscoveryArgs(
+                schema_name=discovery_job_tables_for_discovery_schema_name,
+                table_names=discovery_job_tables_for_discovery_table_names,
+            )])
         ```
 
         ## Import
@@ -755,6 +779,7 @@ class DiscoveryMod(pulumi.CustomResource):
                  schemas_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  sensitive_data_model_id: Optional[pulumi.Input[str]] = None,
                  sensitive_type_ids_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
+                 tables_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DiscoveryModTablesForDiscoveryArgs']]]]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
         if not isinstance(opts, pulumi.ResourceOptions):
@@ -780,6 +805,7 @@ class DiscoveryMod(pulumi.CustomResource):
                 raise TypeError("Missing required property 'sensitive_data_model_id'")
             __props__.__dict__["sensitive_data_model_id"] = sensitive_data_model_id
             __props__.__dict__["sensitive_type_ids_for_discoveries"] = sensitive_type_ids_for_discoveries
+            __props__.__dict__["tables_for_discoveries"] = tables_for_discoveries
             __props__.__dict__["state"] = None
             __props__.__dict__["system_tags"] = None
             __props__.__dict__["target_id"] = None
@@ -815,6 +841,7 @@ class DiscoveryMod(pulumi.CustomResource):
             sensitive_type_ids_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             state: Optional[pulumi.Input[str]] = None,
             system_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
+            tables_for_discoveries: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DiscoveryModTablesForDiscoveryArgs']]]]] = None,
             target_id: Optional[pulumi.Input[str]] = None,
             time_finished: Optional[pulumi.Input[str]] = None,
             time_started: Optional[pulumi.Input[str]] = None,
@@ -842,13 +869,10 @@ class DiscoveryMod(pulumi.CustomResource):
         :param pulumi.Input[bool] is_sample_data_collection_enabled: Indicates if the discovery job should collect and store sample data values for the discovered columns. Sample data helps review the discovered columns and ensure that they actually contain sensitive data. As it collects original data from the target database, it's disabled by default and should be used only if it's acceptable to store sample data in Data Safe's repository in Oracle Cloud. Note that sample data values are not collected for columns with the following data types: LONG, LOB, RAW, XMLTYPE and BFILE.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] schemas_for_discoveries: The schemas to be scanned by the discovery job. If not provided, the schemasForDiscovery attribute of the sensitive data model is used to get the list of schemas.
         :param pulumi.Input[str] sensitive_data_model_id: The OCID of the sensitive data model.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] sensitive_type_ids_for_discoveries: The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types. 
-               
-               
-               ** IMPORTANT **
-               Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] sensitive_type_ids_for_discoveries: The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types.
         :param pulumi.Input[str] state: The current state of the discovery job.
         :param pulumi.Input[Mapping[str, Any]] system_tags: System tags for this resource. Each key is predefined and scoped to a namespace. For more information, see Resource Tags. Example: `{"orcl-cloud.free-tier-retained": "true"}`
+        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['DiscoveryModTablesForDiscoveryArgs']]]] tables_for_discoveries: The data discovery jobs will scan the tables specified here, including both schemas and tables. In the absence  of explicit input, the list of tables is obtained from the tablesForDiscovery attribute of the sensitive data model.
         :param pulumi.Input[str] target_id: The OCID of the target database associated with the discovery job.
         :param pulumi.Input[str] time_finished: The date and time the discovery job finished, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339)..
         :param pulumi.Input[str] time_started: The date and time the discovery job started, in the format defined by [RFC3339](https://tools.ietf.org/html/rfc3339).
@@ -877,6 +901,7 @@ class DiscoveryMod(pulumi.CustomResource):
         __props__.__dict__["sensitive_type_ids_for_discoveries"] = sensitive_type_ids_for_discoveries
         __props__.__dict__["state"] = state
         __props__.__dict__["system_tags"] = system_tags
+        __props__.__dict__["tables_for_discoveries"] = tables_for_discoveries
         __props__.__dict__["target_id"] = target_id
         __props__.__dict__["time_finished"] = time_finished
         __props__.__dict__["time_started"] = time_started
@@ -980,11 +1005,7 @@ class DiscoveryMod(pulumi.CustomResource):
     @pulumi.getter(name="sensitiveTypeIdsForDiscoveries")
     def sensitive_type_ids_for_discoveries(self) -> pulumi.Output[Sequence[str]]:
         """
-        The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types. 
-
-
-        ** IMPORTANT **
-        Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values
+        The OCIDs of the sensitive types to be used by the discovery job. If not provided, the sensitiveTypeIdsForDiscovery attribute of the sensitive data model is used to get the list of sensitive types.
         """
         return pulumi.get(self, "sensitive_type_ids_for_discoveries")
 
@@ -1004,6 +1025,14 @@ class DiscoveryMod(pulumi.CustomResource):
         """
         return pulumi.get(self, "system_tags")
 
+    @property
+    @pulumi.getter(name="tablesForDiscoveries")
+    def tables_for_discoveries(self) -> pulumi.Output[Sequence['outputs.DiscoveryModTablesForDiscovery']]:
+        """
+        The data discovery jobs will scan the tables specified here, including both schemas and tables. In the absence  of explicit input, the list of tables is obtained from the tablesForDiscovery attribute of the sensitive data model.
+        """
+        return pulumi.get(self, "tables_for_discoveries")
+
     @property
     @pulumi.getter(name="targetId")
     def target_id(self) -> pulumi.Output[str]:

pulumi_oci/datasafe/get_audit_events.py

@@ -147,7 +147,7 @@ def get_audit_events(access_level: Optional[str] = None,
     :param bool compartment_id_in_subtree: Default is false. When set to true, the hierarchy of compartments is traversed and all compartments and subcompartments in the tenancy are returned. Depends on the 'accessLevel' setting.
     :param str scim_query: The scimQuery query parameter accepts filter expressions that use the syntax described in Section 3.2.2.2 of the System for Cross-Domain Identity Management (SCIM) specification, which is available at [RFC3339](https://tools.ietf.org/html/draft-ietf-scim-api-12). In SCIM filtering expressions, text, date, and time values must be enclosed in quotation marks, with date and time values using ISO-8601 format. (Numeric and boolean values should not be quoted.)
            
-           **Example:** query=(operationTime ge '2021-06-04T01-00-26') and (eventName eq 'LOGON')
+           **Example:** (operationTime ge "2021-06-04T12:00:00.000Z") and (eventName eq "LOGON")
     """
     __args__ = dict()
     __args__['accessLevel'] = access_level
@@ -210,6 +210,6 @@ def get_audit_events_output(access_level: Optional[pulumi.Input[Optional[str]]]
     :param bool compartment_id_in_subtree: Default is false. When set to true, the hierarchy of compartments is traversed and all compartments and subcompartments in the tenancy are returned. Depends on the 'accessLevel' setting.
     :param str scim_query: The scimQuery query parameter accepts filter expressions that use the syntax described in Section 3.2.2.2 of the System for Cross-Domain Identity Management (SCIM) specification, which is available at [RFC3339](https://tools.ietf.org/html/draft-ietf-scim-api-12). In SCIM filtering expressions, text, date, and time values must be enclosed in quotation marks, with date and time values using ISO-8601 format. (Numeric and boolean values should not be quoted.)
            
-           **Example:** query=(operationTime ge '2021-06-04T01-00-26') and (eventName eq 'LOGON')
+           **Example:** (operationTime ge "2021-06-04T12:00:00.000Z") and (eventName eq "LOGON")
     """
     ...

pulumi_oci/datasafe/get_discovery_job.py

@@ -8,6 +8,7 @@ import pulumi
 import pulumi.runtime
 from typing import Any, Mapping, Optional, Sequence, Union, overload
 from .. import _utilities
+from . import outputs
 
 __all__ = [
     'GetDiscoveryJobResult',
@@ -21,7 +22,7 @@ class GetDiscoveryJobResult:
     """
     A collection of values returned by getDiscoveryJob.
     """
-    def __init__(__self__, compartment_id=None, defined_tags=None, discovery_job_id=None, discovery_type=None, display_name=None, freeform_tags=None, id=None, is_app_defined_relation_discovery_enabled=None, is_include_all_schemas=None, is_include_all_sensitive_types=None, is_sample_data_collection_enabled=None, schemas_for_discoveries=None, sensitive_data_model_id=None, sensitive_type_ids_for_discoveries=None, state=None, system_tags=None, target_id=None, time_finished=None, time_started=None, total_columns_scanned=None, total_deleted_sensitive_columns=None, total_modified_sensitive_columns=None, total_new_sensitive_columns=None, total_objects_scanned=None, total_schemas_scanned=None):
+    def __init__(__self__, compartment_id=None, defined_tags=None, discovery_job_id=None, discovery_type=None, display_name=None, freeform_tags=None, id=None, is_app_defined_relation_discovery_enabled=None, is_include_all_schemas=None, is_include_all_sensitive_types=None, is_sample_data_collection_enabled=None, schemas_for_discoveries=None, sensitive_data_model_id=None, sensitive_type_ids_for_discoveries=None, state=None, system_tags=None, tables_for_discoveries=None, target_id=None, time_finished=None, time_started=None, total_columns_scanned=None, total_deleted_sensitive_columns=None, total_modified_sensitive_columns=None, total_new_sensitive_columns=None, total_objects_scanned=None, total_schemas_scanned=None):
         if compartment_id and not isinstance(compartment_id, str):
             raise TypeError("Expected argument 'compartment_id' to be a str")
         pulumi.set(__self__, "compartment_id", compartment_id)
@@ -70,6 +71,9 @@ class GetDiscoveryJobResult:
         if system_tags and not isinstance(system_tags, dict):
             raise TypeError("Expected argument 'system_tags' to be a dict")
         pulumi.set(__self__, "system_tags", system_tags)
+        if tables_for_discoveries and not isinstance(tables_for_discoveries, list):
+            raise TypeError("Expected argument 'tables_for_discoveries' to be a list")
+        pulumi.set(__self__, "tables_for_discoveries", tables_for_discoveries)
         if target_id and not isinstance(target_id, str):
             raise TypeError("Expected argument 'target_id' to be a str")
         pulumi.set(__self__, "target_id", target_id)
@@ -223,6 +227,14 @@ class GetDiscoveryJobResult:
         """
         return pulumi.get(self, "system_tags")
 
+    @property
+    @pulumi.getter(name="tablesForDiscoveries")
+    def tables_for_discoveries(self) -> Sequence['outputs.GetDiscoveryJobTablesForDiscoveryResult']:
+        """
+        The data discovery jobs will scan the tables specified here, including both schemas and tables.
+        """
+        return pulumi.get(self, "tables_for_discoveries")
+
     @property
     @pulumi.getter(name="targetId")
     def target_id(self) -> str:
@@ -318,6 +330,7 @@ class AwaitableGetDiscoveryJobResult(GetDiscoveryJobResult):
             sensitive_type_ids_for_discoveries=self.sensitive_type_ids_for_discoveries,
             state=self.state,
             system_tags=self.system_tags,
+            tables_for_discoveries=self.tables_for_discoveries,
             target_id=self.target_id,
             time_finished=self.time_finished,
             time_started=self.time_started,
@@ -370,6 +383,7 @@ def get_discovery_job(discovery_job_id: Optional[str] = None,
         sensitive_type_ids_for_discoveries=pulumi.get(__ret__, 'sensitive_type_ids_for_discoveries'),
         state=pulumi.get(__ret__, 'state'),
         system_tags=pulumi.get(__ret__, 'system_tags'),
+        tables_for_discoveries=pulumi.get(__ret__, 'tables_for_discoveries'),
         target_id=pulumi.get(__ret__, 'target_id'),
         time_finished=pulumi.get(__ret__, 'time_finished'),
         time_started=pulumi.get(__ret__, 'time_started'),

pulumi_oci/datasafe/get_report.py

@@ -114,7 +114,7 @@ class GetReportResult:
     @pulumi.getter(name="mimeType")
     def mime_type(self) -> str:
         """
-        Specifies the format of report to be .xls or .pdf
+        Specifies the format of report to be .xls or .pdf or .json
         """
         return pulumi.get(self, "mime_type")
 

pulumi_oci/datasafe/get_report_definition.py

@@ -261,7 +261,7 @@ class GetReportDefinitionResult:
     @pulumi.getter(name="scheduledReportMimeType")
     def scheduled_report_mime_type(self) -> str:
         """
-        Specifies the format of the report ( either .xls or .pdf )
+        Specifies the format of the report ( either .xls or .pdf or .json)
         """
         return pulumi.get(self, "scheduled_report_mime_type")
 

pulumi_oci/datasafe/get_reports.py

@@ -23,7 +23,7 @@ class GetReportsResult:
     """
     A collection of values returned by getReports.
     """
-    def __init__(__self__, access_level=None, compartment_id=None, compartment_id_in_subtree=None, display_name=None, filters=None, id=None, report_collections=None, report_definition_id=None, state=None, type=None):
+    def __init__(__self__, access_level=None, compartment_id=None, compartment_id_in_subtree=None, display_name=None, filters=None, id=None, report_collections=None, report_definition_id=None, state=None, time_generated_greater_than_or_equal_to=None, time_generated_less_than=None, type=None):
         if access_level and not isinstance(access_level, str):
             raise TypeError("Expected argument 'access_level' to be a str")
         pulumi.set(__self__, "access_level", access_level)
@@ -51,6 +51,12 @@ class GetReportsResult:
         if state and not isinstance(state, str):
             raise TypeError("Expected argument 'state' to be a str")
         pulumi.set(__self__, "state", state)
+        if time_generated_greater_than_or_equal_to and not isinstance(time_generated_greater_than_or_equal_to, str):
+            raise TypeError("Expected argument 'time_generated_greater_than_or_equal_to' to be a str")
+        pulumi.set(__self__, "time_generated_greater_than_or_equal_to", time_generated_greater_than_or_equal_to)
+        if time_generated_less_than and not isinstance(time_generated_less_than, str):
+            raise TypeError("Expected argument 'time_generated_less_than' to be a str")
+        pulumi.set(__self__, "time_generated_less_than", time_generated_less_than)
         if type and not isinstance(type, str):
             raise TypeError("Expected argument 'type' to be a str")
         pulumi.set(__self__, "type", type)
@@ -118,6 +124,16 @@ class GetReportsResult:
         """
         return pulumi.get(self, "state")
 
+    @property
+    @pulumi.getter(name="timeGeneratedGreaterThanOrEqualTo")
+    def time_generated_greater_than_or_equal_to(self) -> Optional[str]:
+        return pulumi.get(self, "time_generated_greater_than_or_equal_to")
+
+    @property
+    @pulumi.getter(name="timeGeneratedLessThan")
+    def time_generated_less_than(self) -> Optional[str]:
+        return pulumi.get(self, "time_generated_less_than")
+
     @property
     @pulumi.getter
     def type(self) -> Optional[str]:
@@ -142,6 +158,8 @@ class AwaitableGetReportsResult(GetReportsResult):
             report_collections=self.report_collections,
             report_definition_id=self.report_definition_id,
             state=self.state,
+            time_generated_greater_than_or_equal_to=self.time_generated_greater_than_or_equal_to,
+            time_generated_less_than=self.time_generated_less_than,
             type=self.type)
 
 
@@ -152,6 +170,8 @@ def get_reports(access_level: Optional[str] = None,
                 filters: Optional[Sequence[pulumi.InputType['GetReportsFilterArgs']]] = None,
                 report_definition_id: Optional[str] = None,
                 state: Optional[str] = None,
+                time_generated_greater_than_or_equal_to: Optional[str] = None,
+                time_generated_less_than: Optional[str] = None,
                 type: Optional[str] = None,
                 opts: Optional[pulumi.InvokeOptions] = None) -> AwaitableGetReportsResult:
     """
@@ -171,6 +191,8 @@ def get_reports(access_level: Optional[str] = None,
         display_name=report_display_name,
         report_definition_id=test_report_definition["id"],
         state=report_state,
+        time_generated_greater_than_or_equal_to=report_time_generated_greater_than_or_equal_to,
+        time_generated_less_than=report_time_generated_less_than,
         type=report_type)
     ```
 
@@ -181,6 +203,12 @@ def get_reports(access_level: Optional[str] = None,
     :param str display_name: The name of the report definition to query.
     :param str report_definition_id: The ID of the report definition to filter the list of reports
     :param str state: An optional filter to return only resources that match the specified lifecycle state.
+    :param str time_generated_greater_than_or_equal_to: A filter to return only the resources that were generated after the specified date and time, as defined by [RFC3339](https://tools.ietf.org/html/rfc3339). Using TimeGeneratedGreaterThanOrEqualToQueryParam parameter retrieves all resources generated after that date.
+           
+           **Example:** 2016-12-19T16:39:57.600Z
+    :param str time_generated_less_than: Search for resources that were generated before a specific date. Specifying this parameter corresponding `timeGeneratedLessThan` parameter will retrieve all resources generated before the specified generated date, in "YYYY-MM-ddThh:mmZ" format with a Z offset, as defined by RFC 3339.
+           
+           **Example:** 2016-12-19T16:39:57.600Z
     :param str type: An optional filter to return only resources that match the specified type.
     """
     __args__ = dict()
@@ -191,6 +219,8 @@ def get_reports(access_level: Optional[str] = None,
     __args__['filters'] = filters
     __args__['reportDefinitionId'] = report_definition_id
     __args__['state'] = state
+    __args__['timeGeneratedGreaterThanOrEqualTo'] = time_generated_greater_than_or_equal_to
+    __args__['timeGeneratedLessThan'] = time_generated_less_than
     __args__['type'] = type
     opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke('oci:DataSafe/getReports:getReports', __args__, opts=opts, typ=GetReportsResult).value
@@ -205,6 +235,8 @@ def get_reports(access_level: Optional[str] = None,
         report_collections=pulumi.get(__ret__, 'report_collections'),
         report_definition_id=pulumi.get(__ret__, 'report_definition_id'),
         state=pulumi.get(__ret__, 'state'),
+        time_generated_greater_than_or_equal_to=pulumi.get(__ret__, 'time_generated_greater_than_or_equal_to'),
+        time_generated_less_than=pulumi.get(__ret__, 'time_generated_less_than'),
         type=pulumi.get(__ret__, 'type'))
 
 
@@ -216,6 +248,8 @@ def get_reports_output(access_level: Optional[pulumi.Input[Optional[str]]] = Non
                        filters: Optional[pulumi.Input[Optional[Sequence[pulumi.InputType['GetReportsFilterArgs']]]]] = None,
                        report_definition_id: Optional[pulumi.Input[Optional[str]]] = None,
                        state: Optional[pulumi.Input[Optional[str]]] = None,
+                       time_generated_greater_than_or_equal_to: Optional[pulumi.Input[Optional[str]]] = None,
+                       time_generated_less_than: Optional[pulumi.Input[Optional[str]]] = None,
                        type: Optional[pulumi.Input[Optional[str]]] = None,
                        opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetReportsResult]:
     """
@@ -235,6 +269,8 @@ def get_reports_output(access_level: Optional[pulumi.Input[Optional[str]]] = Non
         display_name=report_display_name,
         report_definition_id=test_report_definition["id"],
         state=report_state,
+        time_generated_greater_than_or_equal_to=report_time_generated_greater_than_or_equal_to,
+        time_generated_less_than=report_time_generated_less_than,
         type=report_type)
     ```
 
@@ -245,6 +281,12 @@ def get_reports_output(access_level: Optional[pulumi.Input[Optional[str]]] = Non
     :param str display_name: The name of the report definition to query.
     :param str report_definition_id: The ID of the report definition to filter the list of reports
     :param str state: An optional filter to return only resources that match the specified lifecycle state.
+    :param str time_generated_greater_than_or_equal_to: A filter to return only the resources that were generated after the specified date and time, as defined by [RFC3339](https://tools.ietf.org/html/rfc3339). Using TimeGeneratedGreaterThanOrEqualToQueryParam parameter retrieves all resources generated after that date.
+           
+           **Example:** 2016-12-19T16:39:57.600Z
+    :param str time_generated_less_than: Search for resources that were generated before a specific date. Specifying this parameter corresponding `timeGeneratedLessThan` parameter will retrieve all resources generated before the specified generated date, in "YYYY-MM-ddThh:mmZ" format with a Z offset, as defined by RFC 3339.
+           
+           **Example:** 2016-12-19T16:39:57.600Z
     :param str type: An optional filter to return only resources that match the specified type.
     """
     ...

pulumi_oci/datasafe/get_security_assessment.py

@@ -22,7 +22,7 @@ class GetSecurityAssessmentResult:
     """
     A collection of values returned by getSecurityAssessment.
     """
-    def __init__(__self__, compartment_id=None, defined_tags=None, description=None, display_name=None, freeform_tags=None, id=None, ignored_assessment_ids=None, ignored_targets=None, is_baseline=None, is_deviated_from_baseline=None, last_compared_baseline_id=None, lifecycle_details=None, link=None, schedule=None, schedule_security_assessment_id=None, security_assessment_id=None, state=None, statistics=None, system_tags=None, target_id=None, target_ids=None, target_version=None, time_created=None, time_last_assessed=None, time_updated=None, triggered_by=None, type=None):
+    def __init__(__self__, compartment_id=None, defined_tags=None, description=None, display_name=None, freeform_tags=None, id=None, ignored_assessment_ids=None, ignored_targets=None, is_assessment_scheduled=None, is_baseline=None, is_deviated_from_baseline=None, last_compared_baseline_id=None, lifecycle_details=None, link=None, schedule=None, schedule_security_assessment_id=None, security_assessment_id=None, state=None, statistics=None, system_tags=None, target_id=None, target_ids=None, target_version=None, time_created=None, time_last_assessed=None, time_updated=None, triggered_by=None, type=None):
         if compartment_id and not isinstance(compartment_id, str):
             raise TypeError("Expected argument 'compartment_id' to be a str")
         pulumi.set(__self__, "compartment_id", compartment_id)
@@ -47,6 +47,9 @@ class GetSecurityAssessmentResult:
         if ignored_targets and not isinstance(ignored_targets, list):
             raise TypeError("Expected argument 'ignored_targets' to be a list")
         pulumi.set(__self__, "ignored_targets", ignored_targets)
+        if is_assessment_scheduled and not isinstance(is_assessment_scheduled, bool):
+            raise TypeError("Expected argument 'is_assessment_scheduled' to be a bool")
+        pulumi.set(__self__, "is_assessment_scheduled", is_assessment_scheduled)
         if is_baseline and not isinstance(is_baseline, bool):
             raise TypeError("Expected argument 'is_baseline' to be a bool")
         pulumi.set(__self__, "is_baseline", is_baseline)
@@ -169,6 +172,14 @@ class GetSecurityAssessmentResult:
         """
         return pulumi.get(self, "ignored_targets")
 
+    @property
+    @pulumi.getter(name="isAssessmentScheduled")
+    def is_assessment_scheduled(self) -> bool:
+        """
+        Indicates whether the assessment is scheduled to run.
+        """
+        return pulumi.get(self, "is_assessment_scheduled")
+
     @property
     @pulumi.getter(name="isBaseline")
     def is_baseline(self) -> bool:
@@ -330,6 +341,7 @@ class AwaitableGetSecurityAssessmentResult(GetSecurityAssessmentResult):
             id=self.id,
             ignored_assessment_ids=self.ignored_assessment_ids,
             ignored_targets=self.ignored_targets,
+            is_assessment_scheduled=self.is_assessment_scheduled,
             is_baseline=self.is_baseline,
             is_deviated_from_baseline=self.is_deviated_from_baseline,
             last_compared_baseline_id=self.last_compared_baseline_id,
@@ -384,6 +396,7 @@ def get_security_assessment(security_assessment_id: Optional[str] = None,
         id=pulumi.get(__ret__, 'id'),
         ignored_assessment_ids=pulumi.get(__ret__, 'ignored_assessment_ids'),
         ignored_targets=pulumi.get(__ret__, 'ignored_targets'),
+        is_assessment_scheduled=pulumi.get(__ret__, 'is_assessment_scheduled'),
         is_baseline=pulumi.get(__ret__, 'is_baseline'),
         is_deviated_from_baseline=pulumi.get(__ret__, 'is_deviated_from_baseline'),
         last_compared_baseline_id=pulumi.get(__ret__, 'last_compared_baseline_id'),

pulumi_oci/datasafe/get_security_assessment_finding.py

@@ -23,7 +23,7 @@ class GetSecurityAssessmentFindingResult:
     """
     A collection of values returned by getSecurityAssessmentFinding.
     """
-    def __init__(__self__, access_level=None, compartment_id_in_subtree=None, filters=None, finding_key=None, findings=None, id=None, is_top_finding=None, references=None, security_assessment_id=None, severity=None, state=None):
+    def __init__(__self__, access_level=None, compartment_id_in_subtree=None, filters=None, finding_key=None, findings=None, id=None, is_top_finding=None, references=None, security_assessment_id=None, severity=None, state=None, target_id=None):
         if access_level and not isinstance(access_level, str):
             raise TypeError("Expected argument 'access_level' to be a str")
         pulumi.set(__self__, "access_level", access_level)
@@ -57,6 +57,9 @@ class GetSecurityAssessmentFindingResult:
         if state and not isinstance(state, str):
             raise TypeError("Expected argument 'state' to be a str")
         pulumi.set(__self__, "state", state)
+        if target_id and not isinstance(target_id, str):
+            raise TypeError("Expected argument 'target_id' to be a str")
+        pulumi.set(__self__, "target_id", target_id)
 
     @property
     @pulumi.getter(name="accessLevel")
@@ -116,6 +119,11 @@ class GetSecurityAssessmentFindingResult:
     def state(self) -> Optional[str]:
         return pulumi.get(self, "state")
 
+    @property
+    @pulumi.getter(name="targetId")
+    def target_id(self) -> Optional[str]:
+        return pulumi.get(self, "target_id")
+
 
 class AwaitableGetSecurityAssessmentFindingResult(GetSecurityAssessmentFindingResult):
     # pylint: disable=using-constant-test
@@ -133,7 +141,8 @@ class AwaitableGetSecurityAssessmentFindingResult(GetSecurityAssessmentFindingRe
             references=self.references,
             security_assessment_id=self.security_assessment_id,
             severity=self.severity,
-            state=self.state)
+            state=self.state,
+            target_id=self.target_id)
 
 
 def get_security_assessment_finding(access_level: Optional[str] = None,
@@ -145,6 +154,7 @@ def get_security_assessment_finding(access_level: Optional[str] = None,
                                     security_assessment_id: Optional[str] = None,
                                     severity: Optional[str] = None,
                                     state: Optional[str] = None,
+                                    target_id: Optional[str] = None,
                                     opts: Optional[pulumi.InvokeOptions] = None) -> AwaitableGetSecurityAssessmentFindingResult:
     """
     Use this data source to access information about an existing resource.
@@ -159,6 +169,7 @@ def get_security_assessment_finding(access_level: Optional[str] = None,
     __args__['securityAssessmentId'] = security_assessment_id
     __args__['severity'] = severity
     __args__['state'] = state
+    __args__['targetId'] = target_id
     opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke('oci:DataSafe/getSecurityAssessmentFinding:getSecurityAssessmentFinding', __args__, opts=opts, typ=GetSecurityAssessmentFindingResult).value
 
@@ -173,7 +184,8 @@ def get_security_assessment_finding(access_level: Optional[str] = None,
         references=pulumi.get(__ret__, 'references'),
         security_assessment_id=pulumi.get(__ret__, 'security_assessment_id'),
         severity=pulumi.get(__ret__, 'severity'),
-        state=pulumi.get(__ret__, 'state'))
+        state=pulumi.get(__ret__, 'state'),
+        target_id=pulumi.get(__ret__, 'target_id'))
 
 
 @_utilities.lift_output_func(get_security_assessment_finding)
@@ -186,6 +198,7 @@ def get_security_assessment_finding_output(access_level: Optional[pulumi.Input[O
                                            security_assessment_id: Optional[pulumi.Input[str]] = None,
                                            severity: Optional[pulumi.Input[Optional[str]]] = None,
                                            state: Optional[pulumi.Input[Optional[str]]] = None,
+                                           target_id: Optional[pulumi.Input[Optional[str]]] = None,
                                            opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetSecurityAssessmentFindingResult]:
     """
     Use this data source to access information about an existing resource.