pulumi-oci 2.32.0a1745304290__py3-none-any.whl → 2.33.0__py3-none-any.whl

pulumi_oci/resourcescheduler/outputs.py

@@ -20,31 +20,41 @@ __all__ = [
     'ScheduleResource',
     'ScheduleResourceFilter',
     'ScheduleResourceFilterValue',
+    'ScheduleResourceParameter',
     'GetScheduleResourceResult',
     'GetScheduleResourceFilterResult',
     'GetScheduleResourceFilterValueResult',
+    'GetScheduleResourceParameterResult',
     'GetSchedulesFilterResult',
     'GetSchedulesScheduleCollectionResult',
     'GetSchedulesScheduleCollectionItemResult',
     'GetSchedulesScheduleCollectionItemResourceResult',
     'GetSchedulesScheduleCollectionItemResourceFilterResult',
     'GetSchedulesScheduleCollectionItemResourceFilterValueResult',
+    'GetSchedulesScheduleCollectionItemResourceParameterResult',
 ]
 
 @pulumi.output_type
 class ScheduleResource(dict):
     def __init__(__self__, *,
                  id: builtins.str,
-                 metadata: Optional[Mapping[str, builtins.str]] = None):
+                 metadata: Optional[Mapping[str, builtins.str]] = None,
+                 parameters: Optional[Sequence['outputs.ScheduleResourceParameter']] = None):
         """
         :param builtins.str id: (Updatable) This is the resource OCID.
         :param Mapping[str, builtins.str] metadata: (Updatable) This is additional information that helps to identity the resource for the schedule.
                
+               <<<<<<< ours
                { "id": "<OCID_of_bucket>" "metadata": { "namespaceName": "sampleNamespace", "bucketName": "sampleBucket" } }
+        :param Sequence['ScheduleResourceParameterArgs'] parameters: (Updatable) This is the user input parameters to use when acting on the resource.
+               
+               { "parameters": [ { "parameterType": "BODY", "value": { "ip": "192.168.44.44", "memory": "1024", "synced_folders": [ { "host_path": "data/", "guest_path": "/var/www", "type": "default" } ], "forwarded_ports": [] } }, { "parameterType": "PATH", "value": { "compartmentId": "ocid1.compartment.oc1..xxxxx", "instanceId": "ocid1.vcn.oc1..yyyy" } }, { "parameterType": "QUERY", "value": { "limit": "10", "tenantId": "ocid1.tenant.oc1..zzzz" } }, { "parameterType": "HEADER", "value": { "token": "xxxx" } } ] }
         """
         pulumi.set(__self__, "id", id)
         if metadata is not None:
             pulumi.set(__self__, "metadata", metadata)
+        if parameters is not None:
+            pulumi.set(__self__, "parameters", parameters)
 
     @property
     @pulumi.getter
@@ -60,10 +70,21 @@ class ScheduleResource(dict):
         """
         (Updatable) This is additional information that helps to identity the resource for the schedule.
 
+        <<<<<<< ours
         { "id": "<OCID_of_bucket>" "metadata": { "namespaceName": "sampleNamespace", "bucketName": "sampleBucket" } }
         """
         return pulumi.get(self, "metadata")
 
+    @property
+    @pulumi.getter
+    def parameters(self) -> Optional[Sequence['outputs.ScheduleResourceParameter']]:
+        """
+        (Updatable) This is the user input parameters to use when acting on the resource.
+
+        { "parameters": [ { "parameterType": "BODY", "value": { "ip": "192.168.44.44", "memory": "1024", "synced_folders": [ { "host_path": "data/", "guest_path": "/var/www", "type": "default" } ], "forwarded_ports": [] } }, { "parameterType": "PATH", "value": { "compartmentId": "ocid1.compartment.oc1..xxxxx", "instanceId": "ocid1.vcn.oc1..yyyy" } }, { "parameterType": "QUERY", "value": { "limit": "10", "tenantId": "ocid1.tenant.oc1..zzzz" } }, { "parameterType": "HEADER", "value": { "token": "xxxx" } } ] }
+        """
+        return pulumi.get(self, "parameters")
+
 
 @pulumi.output_type
 class ScheduleResourceFilter(dict):
@@ -198,17 +219,71 @@ class ScheduleResourceFilterValue(dict):
         return pulumi.get(self, "value")
 
 
+@pulumi.output_type
+class ScheduleResourceParameter(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "parameterType":
+            suggest = "parameter_type"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in ScheduleResourceParameter. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        ScheduleResourceParameter.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        ScheduleResourceParameter.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 parameter_type: builtins.str,
+                 value: Optional[builtins.str] = None):
+        """
+        :param builtins.str parameter_type: (Updatable) This is the parameter type on which the input parameter is defined
+        :param builtins.str value: (Updatable) This is the HTTP request header value.
+               =======
+               { "id": "<OCID_of_bucket>" "metadata": { "namespaceName": "sampleNamespace", "bucketName": "sampleBucket" } }
+        """
+        pulumi.set(__self__, "parameter_type", parameter_type)
+        if value is not None:
+            pulumi.set(__self__, "value", value)
+
+    @property
+    @pulumi.getter(name="parameterType")
+    def parameter_type(self) -> builtins.str:
+        """
+        (Updatable) This is the parameter type on which the input parameter is defined
+        """
+        return pulumi.get(self, "parameter_type")
+
+    @property
+    @pulumi.getter
+    def value(self) -> Optional[builtins.str]:
+        """
+        (Updatable) This is the HTTP request header value.
+        =======
+        { "id": "<OCID_of_bucket>" "metadata": { "namespaceName": "sampleNamespace", "bucketName": "sampleBucket" } }
+        """
+        return pulumi.get(self, "value")
+
+
 @pulumi.output_type
 class GetScheduleResourceResult(dict):
     def __init__(__self__, *,
                  id: builtins.str,
-                 metadata: Mapping[str, builtins.str]):
+                 metadata: Mapping[str, builtins.str],
+                 parameters: Sequence['outputs.GetScheduleResourceParameterResult']):
         """
         :param builtins.str id: This is the resource OCID.
         :param Mapping[str, builtins.str] metadata: This is additional information that helps to identity the resource for the schedule.
+        :param Sequence['GetScheduleResourceParameterArgs'] parameters: This is the user input parameters to use when acting on the resource.
         """
         pulumi.set(__self__, "id", id)
         pulumi.set(__self__, "metadata", metadata)
+        pulumi.set(__self__, "parameters", parameters)
 
     @property
     @pulumi.getter
@@ -226,6 +301,14 @@ class GetScheduleResourceResult(dict):
         """
         return pulumi.get(self, "metadata")
 
+    @property
+    @pulumi.getter
+    def parameters(self) -> Sequence['outputs.GetScheduleResourceParameterResult']:
+        """
+        This is the user input parameters to use when acting on the resource.
+        """
+        return pulumi.get(self, "parameters")
+
 
 @pulumi.output_type
 class GetScheduleResourceFilterResult(dict):
@@ -238,7 +321,7 @@ class GetScheduleResourceFilterResult(dict):
         :param builtins.str attribute: This is the resource attribute on which the threshold is defined.
         :param builtins.str condition: This is the condition for the filter in comparison to its creation time.
         :param builtins.bool should_include_child_compartments: This sets whether to include child compartments.
-        :param Sequence['GetScheduleResourceFilterValueArgs'] values: This is the value of the defined tag.
+        :param Sequence['GetScheduleResourceFilterValueArgs'] values: This is the HTTP request header value.
         """
         pulumi.set(__self__, "attribute", attribute)
         pulumi.set(__self__, "condition", condition)
@@ -273,7 +356,7 @@ class GetScheduleResourceFilterResult(dict):
     @pulumi.getter
     def values(self) -> Sequence['outputs.GetScheduleResourceFilterValueResult']:
         """
-        This is the value of the defined tag.
+        This is the HTTP request header value.
         """
         return pulumi.get(self, "values")
 
@@ -287,7 +370,7 @@ class GetScheduleResourceFilterValueResult(dict):
         """
         :param builtins.str namespace: This is the namespace of the defined tag.
         :param builtins.str tag_key: This is the key of the defined tag.
-        :param builtins.str value: This is the value of the defined tag.
+        :param builtins.str value: This is the HTTP request header value.
         """
         pulumi.set(__self__, "namespace", namespace)
         pulumi.set(__self__, "tag_key", tag_key)
@@ -313,11 +396,40 @@ class GetScheduleResourceFilterValueResult(dict):
     @pulumi.getter
     def value(self) -> builtins.str:
         """
-        This is the value of the defined tag.
+        This is the HTTP request header value.
         """
         return pulumi.get(self, "value")
 
 
+@pulumi.output_type
+class GetScheduleResourceParameterResult(dict):
+    def __init__(__self__, *,
+                 parameter_type: builtins.str,
+                 values: Sequence[builtins.str]):
+        """
+        :param builtins.str parameter_type: This is the parameter type on which the input parameter is defined
+        :param Sequence[builtins.str] values: This is the HTTP request header value.
+        """
+        pulumi.set(__self__, "parameter_type", parameter_type)
+        pulumi.set(__self__, "values", values)
+
+    @property
+    @pulumi.getter(name="parameterType")
+    def parameter_type(self) -> builtins.str:
+        """
+        This is the parameter type on which the input parameter is defined
+        """
+        return pulumi.get(self, "parameter_type")
+
+    @property
+    @pulumi.getter
+    def values(self) -> Sequence[builtins.str]:
+        """
+        This is the HTTP request header value.
+        """
+        return pulumi.get(self, "values")
+
+
 @pulumi.output_type
 class GetSchedulesFilterResult(dict):
     def __init__(__self__, *,
@@ -367,6 +479,7 @@ class GetSchedulesScheduleCollectionItemResult(dict):
                  display_name: builtins.str,
                  freeform_tags: Mapping[str, builtins.str],
                  id: builtins.str,
+                 last_run_status: builtins.str,
                  recurrence_details: builtins.str,
                  recurrence_type: builtins.str,
                  resource_filters: Sequence['outputs.GetSchedulesScheduleCollectionItemResourceFilterResult'],
@@ -387,6 +500,7 @@ class GetSchedulesScheduleCollectionItemResult(dict):
         :param builtins.str display_name: This is a filter to return only resources that match the given display name exactly.
         :param Mapping[str, builtins.str] freeform_tags: These are free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
         :param builtins.str id: This is the resource OCID.
+        :param builtins.str last_run_status: This is the status of the last work request.
         :param builtins.str recurrence_details: This is the frequency of recurrence of a schedule. The frequency field can either conform to RFC-5545 formatting or UNIX cron formatting for recurrences, based on the value specified by the recurrenceType field.
         :param builtins.str recurrence_type: Type of recurrence of a schedule
         :param Sequence['GetSchedulesScheduleCollectionItemResourceFilterArgs'] resource_filters: This is a list of resources filters.  The schedule will be applied to resources matching all of them.
@@ -407,6 +521,7 @@ class GetSchedulesScheduleCollectionItemResult(dict):
         pulumi.set(__self__, "display_name", display_name)
         pulumi.set(__self__, "freeform_tags", freeform_tags)
         pulumi.set(__self__, "id", id)
+        pulumi.set(__self__, "last_run_status", last_run_status)
         pulumi.set(__self__, "recurrence_details", recurrence_details)
         pulumi.set(__self__, "recurrence_type", recurrence_type)
         pulumi.set(__self__, "resource_filters", resource_filters)
@@ -476,6 +591,14 @@ class GetSchedulesScheduleCollectionItemResult(dict):
         """
         return pulumi.get(self, "id")
 
+    @property
+    @pulumi.getter(name="lastRunStatus")
+    def last_run_status(self) -> builtins.str:
+        """
+        This is the status of the last work request.
+        """
+        return pulumi.get(self, "last_run_status")
+
     @property
     @pulumi.getter(name="recurrenceDetails")
     def recurrence_details(self) -> builtins.str:
@@ -577,13 +700,16 @@ class GetSchedulesScheduleCollectionItemResult(dict):
 class GetSchedulesScheduleCollectionItemResourceResult(dict):
     def __init__(__self__, *,
                  id: builtins.str,
-                 metadata: Mapping[str, builtins.str]):
+                 metadata: Mapping[str, builtins.str],
+                 parameters: Sequence['outputs.GetSchedulesScheduleCollectionItemResourceParameterResult']):
         """
         :param builtins.str id: This is the resource OCID.
         :param Mapping[str, builtins.str] metadata: This is additional information that helps to identity the resource for the schedule.
+        :param Sequence['GetSchedulesScheduleCollectionItemResourceParameterArgs'] parameters: This is the user input parameters to use when acting on the resource.
         """
         pulumi.set(__self__, "id", id)
         pulumi.set(__self__, "metadata", metadata)
+        pulumi.set(__self__, "parameters", parameters)
 
     @property
     @pulumi.getter
@@ -601,6 +727,14 @@ class GetSchedulesScheduleCollectionItemResourceResult(dict):
         """
         return pulumi.get(self, "metadata")
 
+    @property
+    @pulumi.getter
+    def parameters(self) -> Sequence['outputs.GetSchedulesScheduleCollectionItemResourceParameterResult']:
+        """
+        This is the user input parameters to use when acting on the resource.
+        """
+        return pulumi.get(self, "parameters")
+
 
 @pulumi.output_type
 class GetSchedulesScheduleCollectionItemResourceFilterResult(dict):
@@ -613,7 +747,7 @@ class GetSchedulesScheduleCollectionItemResourceFilterResult(dict):
         :param builtins.str attribute: This is the resource attribute on which the threshold is defined.
         :param builtins.str condition: This is the condition for the filter in comparison to its creation time.
         :param builtins.bool should_include_child_compartments: This sets whether to include child compartments.
-        :param Sequence['GetSchedulesScheduleCollectionItemResourceFilterValueArgs'] values: This is the value of the defined tag.
+        :param Sequence['GetSchedulesScheduleCollectionItemResourceFilterValueArgs'] values: This is the HTTP request header value.
         """
         pulumi.set(__self__, "attribute", attribute)
         pulumi.set(__self__, "condition", condition)
@@ -648,7 +782,7 @@ class GetSchedulesScheduleCollectionItemResourceFilterResult(dict):
     @pulumi.getter
     def values(self) -> Sequence['outputs.GetSchedulesScheduleCollectionItemResourceFilterValueResult']:
         """
-        This is the value of the defined tag.
+        This is the HTTP request header value.
         """
         return pulumi.get(self, "values")
 
@@ -662,7 +796,7 @@ class GetSchedulesScheduleCollectionItemResourceFilterValueResult(dict):
         """
         :param builtins.str namespace: This is the namespace of the defined tag.
         :param builtins.str tag_key: This is the key of the defined tag.
-        :param builtins.str value: This is the value of the defined tag.
+        :param builtins.str value: This is the HTTP request header value.
         """
         pulumi.set(__self__, "namespace", namespace)
         pulumi.set(__self__, "tag_key", tag_key)
@@ -688,8 +822,37 @@ class GetSchedulesScheduleCollectionItemResourceFilterValueResult(dict):
     @pulumi.getter
     def value(self) -> builtins.str:
         """
-        This is the value of the defined tag.
+        This is the HTTP request header value.
         """
         return pulumi.get(self, "value")
 
 
+@pulumi.output_type
+class GetSchedulesScheduleCollectionItemResourceParameterResult(dict):
+    def __init__(__self__, *,
+                 parameter_type: builtins.str,
+                 values: Sequence[builtins.str]):
+        """
+        :param builtins.str parameter_type: This is the parameter type on which the input parameter is defined
+        :param Sequence[builtins.str] values: This is the HTTP request header value.
+        """
+        pulumi.set(__self__, "parameter_type", parameter_type)
+        pulumi.set(__self__, "values", values)
+
+    @property
+    @pulumi.getter(name="parameterType")
+    def parameter_type(self) -> builtins.str:
+        """
+        This is the parameter type on which the input parameter is defined
+        """
+        return pulumi.get(self, "parameter_type")
+
+    @property
+    @pulumi.getter
+    def values(self) -> Sequence[builtins.str]:
+        """
+        This is the HTTP request header value.
+        """
+        return pulumi.get(self, "values")
+
+

pulumi_oci/resourcescheduler/schedule.py

@@ -38,13 +38,17 @@ class ScheduleArgs:
         """
         The set of arguments for constructing a Schedule resource.
         :param pulumi.Input[builtins.str] action: (Updatable) This is the action that will be executed by the schedule.
+               <<<<<<< ours
         :param pulumi.Input[builtins.str] compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment in which the schedule is created
         :param pulumi.Input[builtins.str] recurrence_details: (Updatable) This is the frequency of recurrence of a schedule. The frequency field can either conform to RFC-5545 formatting or UNIX cron formatting for recurrences, based on the value specified by the recurrenceType field. Example: `FREQ=WEEKLY;BYDAY=MO,TU,WE,TH;BYHOUR=10;INTERVAL=1`
+               
+               >>>>>>> theirs
         :param pulumi.Input[builtins.str] recurrence_type: (Updatable) Type of recurrence of a schedule. Could be set to `ICAL`, `CRON`
         :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] defined_tags: (Updatable) These are defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param pulumi.Input[builtins.str] description: (Updatable) This is the description of the schedule.
         :param pulumi.Input[builtins.str] display_name: (Updatable) This is a user-friendly name for the schedule. It does not have to be unique, and it's changeable.
         :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] freeform_tags: (Updatable) These are free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
+               >>>>>>> theirs
         :param pulumi.Input[Sequence[pulumi.Input['ScheduleResourceFilterArgs']]] resource_filters: (Updatable) This is a list of resources filters.  The schedule will be applied to resources matching all of them.
         :param pulumi.Input[Sequence[pulumi.Input['ScheduleResourceArgs']]] resources: (Updatable) This is the list of resources to which the scheduled operation is applied.
         :param pulumi.Input[builtins.str] state: (Updatable) The target state for the Schedule. Could be set to `ACTIVE` or `INACTIVE`. 
@@ -83,6 +87,7 @@ class ScheduleArgs:
     def action(self) -> pulumi.Input[builtins.str]:
         """
         (Updatable) This is the action that will be executed by the schedule.
+        <<<<<<< ours
         """
         return pulumi.get(self, "action")
 
@@ -107,6 +112,8 @@ class ScheduleArgs:
     def recurrence_details(self) -> pulumi.Input[builtins.str]:
         """
         (Updatable) This is the frequency of recurrence of a schedule. The frequency field can either conform to RFC-5545 formatting or UNIX cron formatting for recurrences, based on the value specified by the recurrenceType field. Example: `FREQ=WEEKLY;BYDAY=MO,TU,WE,TH;BYHOUR=10;INTERVAL=1`
+
+        >>>>>>> theirs
         """
         return pulumi.get(self, "recurrence_details")
 
@@ -167,6 +174,7 @@ class ScheduleArgs:
     def freeform_tags(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]]:
         """
         (Updatable) These are free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
+        >>>>>>> theirs
         """
         return pulumi.get(self, "freeform_tags")
 
@@ -248,6 +256,7 @@ class _ScheduleState:
                  description: Optional[pulumi.Input[builtins.str]] = None,
                  display_name: Optional[pulumi.Input[builtins.str]] = None,
                  freeform_tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]] = None,
+                 last_run_status: Optional[pulumi.Input[builtins.str]] = None,
                  recurrence_details: Optional[pulumi.Input[builtins.str]] = None,
                  recurrence_type: Optional[pulumi.Input[builtins.str]] = None,
                  resource_filters: Optional[pulumi.Input[Sequence[pulumi.Input['ScheduleResourceFilterArgs']]]] = None,
@@ -263,12 +272,17 @@ class _ScheduleState:
         """
         Input properties used for looking up and filtering Schedule resources.
         :param pulumi.Input[builtins.str] action: (Updatable) This is the action that will be executed by the schedule.
+               <<<<<<< ours
         :param pulumi.Input[builtins.str] compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment in which the schedule is created
         :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] defined_tags: (Updatable) These are defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param pulumi.Input[builtins.str] description: (Updatable) This is the description of the schedule.
         :param pulumi.Input[builtins.str] display_name: (Updatable) This is a user-friendly name for the schedule. It does not have to be unique, and it's changeable.
         :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] freeform_tags: (Updatable) These are free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
+               >>>>>>> theirs
+        :param pulumi.Input[builtins.str] last_run_status: This is the status of the last work request.
         :param pulumi.Input[builtins.str] recurrence_details: (Updatable) This is the frequency of recurrence of a schedule. The frequency field can either conform to RFC-5545 formatting or UNIX cron formatting for recurrences, based on the value specified by the recurrenceType field. Example: `FREQ=WEEKLY;BYDAY=MO,TU,WE,TH;BYHOUR=10;INTERVAL=1`
+               
+               >>>>>>> theirs
         :param pulumi.Input[builtins.str] recurrence_type: (Updatable) Type of recurrence of a schedule. Could be set to `ICAL`, `CRON`
         :param pulumi.Input[Sequence[pulumi.Input['ScheduleResourceFilterArgs']]] resource_filters: (Updatable) This is a list of resources filters.  The schedule will be applied to resources matching all of them.
         :param pulumi.Input[Sequence[pulumi.Input['ScheduleResourceArgs']]] resources: (Updatable) This is the list of resources to which the scheduled operation is applied.
@@ -297,6 +311,8 @@ class _ScheduleState:
             pulumi.set(__self__, "display_name", display_name)
         if freeform_tags is not None:
             pulumi.set(__self__, "freeform_tags", freeform_tags)
+        if last_run_status is not None:
+            pulumi.set(__self__, "last_run_status", last_run_status)
         if recurrence_details is not None:
             pulumi.set(__self__, "recurrence_details", recurrence_details)
         if recurrence_type is not None:
@@ -327,6 +343,7 @@ class _ScheduleState:
     def action(self) -> Optional[pulumi.Input[builtins.str]]:
         """
         (Updatable) This is the action that will be executed by the schedule.
+        <<<<<<< ours
         """
         return pulumi.get(self, "action")
 
@@ -387,6 +404,7 @@ class _ScheduleState:
     def freeform_tags(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]]:
         """
         (Updatable) These are free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
+        >>>>>>> theirs
         """
         return pulumi.get(self, "freeform_tags")
 
@@ -394,11 +412,25 @@ class _ScheduleState:
     def freeform_tags(self, value: Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]]):
         pulumi.set(self, "freeform_tags", value)
 
+    @property
+    @pulumi.getter(name="lastRunStatus")
+    def last_run_status(self) -> Optional[pulumi.Input[builtins.str]]:
+        """
+        This is the status of the last work request.
+        """
+        return pulumi.get(self, "last_run_status")
+
+    @last_run_status.setter
+    def last_run_status(self, value: Optional[pulumi.Input[builtins.str]]):
+        pulumi.set(self, "last_run_status", value)
+
     @property
     @pulumi.getter(name="recurrenceDetails")
     def recurrence_details(self) -> Optional[pulumi.Input[builtins.str]]:
         """
         (Updatable) This is the frequency of recurrence of a schedule. The frequency field can either conform to RFC-5545 formatting or UNIX cron formatting for recurrences, based on the value specified by the recurrenceType field. Example: `FREQ=WEEKLY;BYDAY=MO,TU,WE,TH;BYHOUR=10;INTERVAL=1`
+
+        >>>>>>> theirs
         """
         return pulumi.get(self, "recurrence_details")
 
@@ -544,6 +576,9 @@ class _ScheduleState:
 
 
 class Schedule(pulumi.CustomResource):
+
+    pulumi_type = "oci:ResourceScheduler/schedule:Schedule"
+
     @overload
     def __init__(__self__,
                  resource_name: str,
@@ -565,7 +600,7 @@ class Schedule(pulumi.CustomResource):
         """
         This resource provides the Schedule resource in Oracle Cloud Infrastructure Resource Scheduler service.
 
-        Creates a Schedule
+        This API creates a schedule. You must provide either resources or resourceFilters.
 
         ## Import
 
@@ -578,12 +613,16 @@ class Schedule(pulumi.CustomResource):
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[builtins.str] action: (Updatable) This is the action that will be executed by the schedule.
+               <<<<<<< ours
         :param pulumi.Input[builtins.str] compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment in which the schedule is created
         :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] defined_tags: (Updatable) These are defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param pulumi.Input[builtins.str] description: (Updatable) This is the description of the schedule.
         :param pulumi.Input[builtins.str] display_name: (Updatable) This is a user-friendly name for the schedule. It does not have to be unique, and it's changeable.
         :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] freeform_tags: (Updatable) These are free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
+               >>>>>>> theirs
         :param pulumi.Input[builtins.str] recurrence_details: (Updatable) This is the frequency of recurrence of a schedule. The frequency field can either conform to RFC-5545 formatting or UNIX cron formatting for recurrences, based on the value specified by the recurrenceType field. Example: `FREQ=WEEKLY;BYDAY=MO,TU,WE,TH;BYHOUR=10;INTERVAL=1`
+               
+               >>>>>>> theirs
         :param pulumi.Input[builtins.str] recurrence_type: (Updatable) Type of recurrence of a schedule. Could be set to `ICAL`, `CRON`
         :param pulumi.Input[Sequence[pulumi.Input[Union['ScheduleResourceFilterArgs', 'ScheduleResourceFilterArgsDict']]]] resource_filters: (Updatable) This is a list of resources filters.  The schedule will be applied to resources matching all of them.
         :param pulumi.Input[Sequence[pulumi.Input[Union['ScheduleResourceArgs', 'ScheduleResourceArgsDict']]]] resources: (Updatable) This is the list of resources to which the scheduled operation is applied.
@@ -604,7 +643,7 @@ class Schedule(pulumi.CustomResource):
         """
         This resource provides the Schedule resource in Oracle Cloud Infrastructure Resource Scheduler service.
 
-        Creates a Schedule
+        This API creates a schedule. You must provide either resources or resourceFilters.
 
         ## Import
 
@@ -672,6 +711,7 @@ class Schedule(pulumi.CustomResource):
             __props__.__dict__["state"] = state
             __props__.__dict__["time_ends"] = time_ends
             __props__.__dict__["time_starts"] = time_starts
+            __props__.__dict__["last_run_status"] = None
             __props__.__dict__["system_tags"] = None
             __props__.__dict__["time_created"] = None
             __props__.__dict__["time_last_run"] = None
@@ -693,6 +733,7 @@ class Schedule(pulumi.CustomResource):
             description: Optional[pulumi.Input[builtins.str]] = None,
             display_name: Optional[pulumi.Input[builtins.str]] = None,
             freeform_tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]]] = None,
+            last_run_status: Optional[pulumi.Input[builtins.str]] = None,
             recurrence_details: Optional[pulumi.Input[builtins.str]] = None,
             recurrence_type: Optional[pulumi.Input[builtins.str]] = None,
             resource_filters: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ScheduleResourceFilterArgs', 'ScheduleResourceFilterArgsDict']]]]] = None,
@@ -713,12 +754,17 @@ class Schedule(pulumi.CustomResource):
         :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[builtins.str] action: (Updatable) This is the action that will be executed by the schedule.
+               <<<<<<< ours
         :param pulumi.Input[builtins.str] compartment_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment in which the schedule is created
         :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] defined_tags: (Updatable) These are defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Operations.CostCenter": "42"}`
         :param pulumi.Input[builtins.str] description: (Updatable) This is the description of the schedule.
         :param pulumi.Input[builtins.str] display_name: (Updatable) This is a user-friendly name for the schedule. It does not have to be unique, and it's changeable.
         :param pulumi.Input[Mapping[str, pulumi.Input[builtins.str]]] freeform_tags: (Updatable) These are free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
+               >>>>>>> theirs
+        :param pulumi.Input[builtins.str] last_run_status: This is the status of the last work request.
         :param pulumi.Input[builtins.str] recurrence_details: (Updatable) This is the frequency of recurrence of a schedule. The frequency field can either conform to RFC-5545 formatting or UNIX cron formatting for recurrences, based on the value specified by the recurrenceType field. Example: `FREQ=WEEKLY;BYDAY=MO,TU,WE,TH;BYHOUR=10;INTERVAL=1`
+               
+               >>>>>>> theirs
         :param pulumi.Input[builtins.str] recurrence_type: (Updatable) Type of recurrence of a schedule. Could be set to `ICAL`, `CRON`
         :param pulumi.Input[Sequence[pulumi.Input[Union['ScheduleResourceFilterArgs', 'ScheduleResourceFilterArgsDict']]]] resource_filters: (Updatable) This is a list of resources filters.  The schedule will be applied to resources matching all of them.
         :param pulumi.Input[Sequence[pulumi.Input[Union['ScheduleResourceArgs', 'ScheduleResourceArgsDict']]]] resources: (Updatable) This is the list of resources to which the scheduled operation is applied.
@@ -745,6 +791,7 @@ class Schedule(pulumi.CustomResource):
         __props__.__dict__["description"] = description
         __props__.__dict__["display_name"] = display_name
         __props__.__dict__["freeform_tags"] = freeform_tags
+        __props__.__dict__["last_run_status"] = last_run_status
         __props__.__dict__["recurrence_details"] = recurrence_details
         __props__.__dict__["recurrence_type"] = recurrence_type
         __props__.__dict__["resource_filters"] = resource_filters
@@ -764,6 +811,7 @@ class Schedule(pulumi.CustomResource):
     def action(self) -> pulumi.Output[builtins.str]:
         """
         (Updatable) This is the action that will be executed by the schedule.
+        <<<<<<< ours
         """
         return pulumi.get(self, "action")
 
@@ -804,14 +852,25 @@ class Schedule(pulumi.CustomResource):
     def freeform_tags(self) -> pulumi.Output[Mapping[str, builtins.str]]:
         """
         (Updatable) These are free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm).  Example: `{"Department": "Finance"}`
+        >>>>>>> theirs
         """
         return pulumi.get(self, "freeform_tags")
 
+    @property
+    @pulumi.getter(name="lastRunStatus")
+    def last_run_status(self) -> pulumi.Output[builtins.str]:
+        """
+        This is the status of the last work request.
+        """
+        return pulumi.get(self, "last_run_status")
+
     @property
     @pulumi.getter(name="recurrenceDetails")
     def recurrence_details(self) -> pulumi.Output[builtins.str]:
         """
         (Updatable) This is the frequency of recurrence of a schedule. The frequency field can either conform to RFC-5545 formatting or UNIX cron formatting for recurrences, based on the value specified by the recurrenceType field. Example: `FREQ=WEEKLY;BYDAY=MO,TU,WE,TH;BYHOUR=10;INTERVAL=1`
+
+        >>>>>>> theirs
         """
         return pulumi.get(self, "recurrence_details")
 

pulumi_oci/sch/connector.py

@@ -416,6 +416,9 @@ class _ConnectorState:
 
 
 class Connector(pulumi.CustomResource):
+
+    pulumi_type = "oci:Sch/connector:Connector"
+
     @overload
     def __init__(__self__,
                  resource_name: str,

pulumi_oci/securityattribute/security_attribute.py

@@ -290,6 +290,9 @@ class _SecurityAttributeState:
 
 
 class SecurityAttribute(pulumi.CustomResource):
+
+    pulumi_type = "oci:SecurityAttribute/securityAttribute:SecurityAttribute"
+
     @overload
     def __init__(__self__,
                  resource_name: str,

pulumi_oci/securityattribute/security_attribute_namespace.py

@@ -304,6 +304,9 @@ class _SecurityAttributeNamespaceState:
 
 
 class SecurityAttributeNamespace(pulumi.CustomResource):
+
+    pulumi_type = "oci:SecurityAttribute/securityAttributeNamespace:SecurityAttributeNamespace"
+
     @overload
     def __init__(__self__,
                  resource_name: str,

pulumi_oci/servicecatalog/catalog.py

@@ -224,6 +224,9 @@ class _CatalogState:
 
 
 class Catalog(pulumi.CustomResource):
+
+    pulumi_type = "oci:ServiceCatalog/catalog:Catalog"
+
     @overload
     def __init__(__self__,
                  resource_name: str,

pulumi_oci/servicecatalog/catalog_association.py

@@ -160,6 +160,9 @@ class _CatalogAssociationState:
 
 
 class CatalogAssociation(pulumi.CustomResource):
+
+    pulumi_type = "oci:ServiceCatalog/catalogAssociation:CatalogAssociation"
+
     @overload
     def __init__(__self__,
                  resource_name: str,