pulumi-oci 1.28.0__py3-none-any.whl → 1.28.0a1710997024__py3-none-any.whl

pulumi_oci/database/outputs.py

@@ -2141,9 +2141,9 @@ class AutonomousDatabaseKeyHistoryEntry(dict):
                  vault_id: Optional[str] = None):
         """
         :param str id: The id of the Autonomous Database [Vault](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm#concepts) service key management history entry.
-        :param str kms_key_version_id: The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances.
+        :param str kms_key_version_id: The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation.
         :param str time_activated: The date and time the kms key activated.
-        :param str vault_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [vault](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm#concepts). This parameter and `secretId` are required for Customer Managed Keys.
+        :param str vault_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [vault](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm#concepts).
         """
         if id is not None:
             pulumi.set(__self__, "id", id)
@@ -2166,7 +2166,7 @@ class AutonomousDatabaseKeyHistoryEntry(dict):
     @pulumi.getter(name="kmsKeyVersionId")
     def kms_key_version_id(self) -> Optional[str]:
         """
-        The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation. Autonomous Database Serverless does not use key versions, hence is not applicable for Autonomous Database Serverless instances.
+        The OCID of the key container version that is used in database transparent data encryption (TDE) operations KMS Key can have multiple key versions. If none is specified, the current key version (latest) of the Key Id is used for the operation.
         """
         return pulumi.get(self, "kms_key_version_id")
 
@@ -2182,7 +2182,7 @@ class AutonomousDatabaseKeyHistoryEntry(dict):
     @pulumi.getter(name="vaultId")
     def vault_id(self) -> Optional[str]:
         """
-        The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [vault](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm#concepts). This parameter and `secretId` are required for Customer Managed Keys.
+        The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Oracle Cloud Infrastructure [vault](https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm#concepts).
         """
         return pulumi.get(self, "vault_id")
 

pulumi_oci/integration/__init__.py

@@ -8,6 +8,5 @@ import typing
 from .get_integration_instance import *
 from .get_integration_instances import *
 from .integration_instance import *
-from .private_endpoint_outbound_connection import *
 from ._inputs import *
 from . import outputs

pulumi_oci/integration/_inputs.py

@@ -16,7 +16,6 @@ __all__ = [
     'IntegrationInstanceIdcsInfoArgs',
     'IntegrationInstanceNetworkEndpointDetailsArgs',
     'IntegrationInstanceNetworkEndpointDetailsAllowlistedHttpVcnArgs',
-    'IntegrationInstancePrivateEndpointOutboundConnectionArgs',
     'GetIntegrationInstancesFilterArgs',
 ]
 
@@ -348,7 +347,6 @@ class IntegrationInstanceNetworkEndpointDetailsArgs:
         :param pulumi.Input[Sequence[pulumi.Input[str]]] allowlisted_http_ips: Source IP addresses or IP address ranges ingress rules. (ex: "168.122.59.5", "10.20.30.0/26") An invalid IP or CIDR block will result in a 400 response.
         :param pulumi.Input[Sequence[pulumi.Input['IntegrationInstanceNetworkEndpointDetailsAllowlistedHttpVcnArgs']]] allowlisted_http_vcns: Virtual Cloud Networks allowed to access this network endpoint.
         :param pulumi.Input[bool] is_integration_vcn_allowlisted: The Integration service's VCN is allow-listed to allow integrations to call back into other integrations
-               <<<<<<< HEAD
         """
         pulumi.set(__self__, "network_endpoint_type", network_endpoint_type)
         if allowlisted_http_ips is not None:
@@ -399,7 +397,6 @@ class IntegrationInstanceNetworkEndpointDetailsArgs:
     def is_integration_vcn_allowlisted(self) -> Optional[pulumi.Input[bool]]:
         """
         The Integration service's VCN is allow-listed to allow integrations to call back into other integrations
-        <<<<<<< HEAD
         """
         return pulumi.get(self, "is_integration_vcn_allowlisted")
 
@@ -446,61 +443,6 @@ class IntegrationInstanceNetworkEndpointDetailsAllowlistedHttpVcnArgs:
         pulumi.set(self, "allowlisted_ips", value)
 
 
-@pulumi.input_type
-class IntegrationInstancePrivateEndpointOutboundConnectionArgs:
-    def __init__(__self__, *,
-                 nsg_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
-                 outbound_connection_type: Optional[pulumi.Input[str]] = None,
-                 subnet_id: Optional[pulumi.Input[str]] = None):
-        """
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] nsg_ids: One or more Network security group Ids. This is an optional argument.
-        :param pulumi.Input[str] outbound_connection_type: The type of Outbound Connection.
-        :param pulumi.Input[str] subnet_id: Customer Private Network VCN Subnet OCID. This is a required argument.
-        """
-        if nsg_ids is not None:
-            pulumi.set(__self__, "nsg_ids", nsg_ids)
-        if outbound_connection_type is not None:
-            pulumi.set(__self__, "outbound_connection_type", outbound_connection_type)
-        if subnet_id is not None:
-            pulumi.set(__self__, "subnet_id", subnet_id)
-
-    @property
-    @pulumi.getter(name="nsgIds")
-    def nsg_ids(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
-        """
-        One or more Network security group Ids. This is an optional argument.
-        """
-        return pulumi.get(self, "nsg_ids")
-
-    @nsg_ids.setter
-    def nsg_ids(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]):
-        pulumi.set(self, "nsg_ids", value)
-
-    @property
-    @pulumi.getter(name="outboundConnectionType")
-    def outbound_connection_type(self) -> Optional[pulumi.Input[str]]:
-        """
-        The type of Outbound Connection.
-        """
-        return pulumi.get(self, "outbound_connection_type")
-
-    @outbound_connection_type.setter
-    def outbound_connection_type(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "outbound_connection_type", value)
-
-    @property
-    @pulumi.getter(name="subnetId")
-    def subnet_id(self) -> Optional[pulumi.Input[str]]:
-        """
-        Customer Private Network VCN Subnet OCID. This is a required argument.
-        """
-        return pulumi.get(self, "subnet_id")
-
-    @subnet_id.setter
-    def subnet_id(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "subnet_id", value)
-
-
 @pulumi.input_type
 class GetIntegrationInstancesFilterArgs:
     def __init__(__self__, *,

pulumi_oci/integration/get_integration_instance.py

@@ -22,7 +22,7 @@ class GetIntegrationInstanceResult:
     """
     A collection of values returned by getIntegrationInstance.
     """
-    def __init__(__self__, alternate_custom_endpoints=None, attachments=None, compartment_id=None, consumption_model=None, custom_endpoints=None, defined_tags=None, display_name=None, domain_id=None, enable_process_automation_trigger=None, freeform_tags=None, id=None, idcs_at=None, idcs_infos=None, instance_url=None, integration_instance_id=None, integration_instance_type=None, is_byol=None, is_file_server_enabled=None, is_visual_builder_enabled=None, message_packs=None, network_endpoint_details=None, private_endpoint_outbound_connections=None, shape=None, state=None, state_message=None, time_created=None, time_updated=None):
+    def __init__(__self__, alternate_custom_endpoints=None, attachments=None, compartment_id=None, consumption_model=None, custom_endpoints=None, defined_tags=None, display_name=None, domain_id=None, enable_process_automation_trigger=None, freeform_tags=None, id=None, idcs_at=None, idcs_infos=None, instance_url=None, integration_instance_id=None, integration_instance_type=None, is_byol=None, is_file_server_enabled=None, is_visual_builder_enabled=None, message_packs=None, network_endpoint_details=None, shape=None, state=None, state_message=None, time_created=None, time_updated=None):
         if alternate_custom_endpoints and not isinstance(alternate_custom_endpoints, list):
             raise TypeError("Expected argument 'alternate_custom_endpoints' to be a list")
         pulumi.set(__self__, "alternate_custom_endpoints", alternate_custom_endpoints)
@@ -86,9 +86,6 @@ class GetIntegrationInstanceResult:
         if network_endpoint_details and not isinstance(network_endpoint_details, list):
             raise TypeError("Expected argument 'network_endpoint_details' to be a list")
         pulumi.set(__self__, "network_endpoint_details", network_endpoint_details)
-        if private_endpoint_outbound_connections and not isinstance(private_endpoint_outbound_connections, list):
-            raise TypeError("Expected argument 'private_endpoint_outbound_connections' to be a list")
-        pulumi.set(__self__, "private_endpoint_outbound_connections", private_endpoint_outbound_connections)
         if shape and not isinstance(shape, str):
             raise TypeError("Expected argument 'shape' to be a str")
         pulumi.set(__self__, "shape", shape)
@@ -261,20 +258,11 @@ class GetIntegrationInstanceResult:
         """
         return pulumi.get(self, "network_endpoint_details")
 
-    @property
-    @pulumi.getter(name="privateEndpointOutboundConnections")
-    def private_endpoint_outbound_connections(self) -> Sequence['outputs.GetIntegrationInstancePrivateEndpointOutboundConnectionResult']:
-        """
-        Base representation for Outbound Connection (Reverse Connection).
-        """
-        return pulumi.get(self, "private_endpoint_outbound_connections")
-
     @property
     @pulumi.getter
     def shape(self) -> str:
         """
         Shape
-        >>>>>>> c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         """
         return pulumi.get(self, "shape")
 
@@ -338,7 +326,6 @@ class AwaitableGetIntegrationInstanceResult(GetIntegrationInstanceResult):
             is_visual_builder_enabled=self.is_visual_builder_enabled,
             message_packs=self.message_packs,
             network_endpoint_details=self.network_endpoint_details,
-            private_endpoint_outbound_connections=self.private_endpoint_outbound_connections,
             shape=self.shape,
             state=self.state,
             state_message=self.state_message,
@@ -394,7 +381,6 @@ def get_integration_instance(integration_instance_id: Optional[str] = None,
         is_visual_builder_enabled=pulumi.get(__ret__, 'is_visual_builder_enabled'),
         message_packs=pulumi.get(__ret__, 'message_packs'),
         network_endpoint_details=pulumi.get(__ret__, 'network_endpoint_details'),
-        private_endpoint_outbound_connections=pulumi.get(__ret__, 'private_endpoint_outbound_connections'),
         shape=pulumi.get(__ret__, 'shape'),
         state=pulumi.get(__ret__, 'state'),
         state_message=pulumi.get(__ret__, 'state_message'),

pulumi_oci/integration/integration_instance.py

@@ -47,14 +47,12 @@ class IntegrationInstanceArgs:
         :param pulumi.Input[Mapping[str, Any]] defined_tags: (Updatable) Usage of predefined tag keys. These predefined keys are scoped to namespaces. Example: `{"foo-namespace.bar-key": "value"}`
         :param pulumi.Input[str] domain_id: The OCID of the identity domain, that will be used to determine the  corresponding Idcs Stripe and create an Idcs application within the stripe.  This parameter is mutually exclusive with parameter: idcsAt, i.e only one of  two parameters should be specified.
         :param pulumi.Input[int] enable_process_automation_trigger: (Updatable) An optional property when incremented triggers Enable Process Automation. Could be set to any integer value.
-               ||||||| parent of c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         :param pulumi.Input[Mapping[str, Any]] freeform_tags: (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}`
         :param pulumi.Input[str] idcs_at: (Updatable) IDCS Authentication token. This is required for all realms with IDCS. Its optional as its not required for non IDCS realms.
         :param pulumi.Input[bool] is_file_server_enabled: (Updatable) The file server is enabled or not.
         :param pulumi.Input[bool] is_visual_builder_enabled: (Updatable) Visual Builder is enabled or not.
         :param pulumi.Input['IntegrationInstanceNetworkEndpointDetailsArgs'] network_endpoint_details: Base representation of a network endpoint.
         :param pulumi.Input[str] shape: Shape
-               >>>>>>> c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         :param pulumi.Input[str] state: (Updatable) The target state for the instance. Could be set to ACTIVE or INACTIVE
                
                
@@ -218,7 +216,6 @@ class IntegrationInstanceArgs:
     def enable_process_automation_trigger(self) -> Optional[pulumi.Input[int]]:
         """
         (Updatable) An optional property when incremented triggers Enable Process Automation. Could be set to any integer value.
-        ||||||| parent of c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         """
         return pulumi.get(self, "enable_process_automation_trigger")
 
@@ -291,7 +288,6 @@ class IntegrationInstanceArgs:
     def shape(self) -> Optional[pulumi.Input[str]]:
         """
         Shape
-        >>>>>>> c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         """
         return pulumi.get(self, "shape")
 
@@ -338,7 +334,6 @@ class _IntegrationInstanceState:
                  is_visual_builder_enabled: Optional[pulumi.Input[bool]] = None,
                  message_packs: Optional[pulumi.Input[int]] = None,
                  network_endpoint_details: Optional[pulumi.Input['IntegrationInstanceNetworkEndpointDetailsArgs']] = None,
-                 private_endpoint_outbound_connections: Optional[pulumi.Input[Sequence[pulumi.Input['IntegrationInstancePrivateEndpointOutboundConnectionArgs']]]] = None,
                  shape: Optional[pulumi.Input[str]] = None,
                  state: Optional[pulumi.Input[str]] = None,
                  state_message: Optional[pulumi.Input[str]] = None,
@@ -355,7 +350,6 @@ class _IntegrationInstanceState:
         :param pulumi.Input[str] display_name: (Updatable) Integration Instance Identifier.
         :param pulumi.Input[str] domain_id: The OCID of the identity domain, that will be used to determine the  corresponding Idcs Stripe and create an Idcs application within the stripe.  This parameter is mutually exclusive with parameter: idcsAt, i.e only one of  two parameters should be specified.
         :param pulumi.Input[int] enable_process_automation_trigger: (Updatable) An optional property when incremented triggers Enable Process Automation. Could be set to any integer value.
-               ||||||| parent of c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         :param pulumi.Input[Mapping[str, Any]] freeform_tags: (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}`
         :param pulumi.Input[str] idcs_at: (Updatable) IDCS Authentication token. This is required for all realms with IDCS. Its optional as its not required for non IDCS realms.
         :param pulumi.Input[Sequence[pulumi.Input['IntegrationInstanceIdcsInfoArgs']]] idcs_infos: Information for IDCS access
@@ -366,9 +360,7 @@ class _IntegrationInstanceState:
         :param pulumi.Input[bool] is_visual_builder_enabled: (Updatable) Visual Builder is enabled or not.
         :param pulumi.Input[int] message_packs: (Updatable) The number of configured message packs
         :param pulumi.Input['IntegrationInstanceNetworkEndpointDetailsArgs'] network_endpoint_details: Base representation of a network endpoint.
-        :param pulumi.Input[Sequence[pulumi.Input['IntegrationInstancePrivateEndpointOutboundConnectionArgs']]] private_endpoint_outbound_connections: Base representation for Outbound Connection (Reverse Connection).
         :param pulumi.Input[str] shape: Shape
-               >>>>>>> c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         :param pulumi.Input[str] state: (Updatable) The target state for the instance. Could be set to ACTIVE or INACTIVE
                
                
@@ -416,8 +408,6 @@ class _IntegrationInstanceState:
             pulumi.set(__self__, "message_packs", message_packs)
         if network_endpoint_details is not None:
             pulumi.set(__self__, "network_endpoint_details", network_endpoint_details)
-        if private_endpoint_outbound_connections is not None:
-            pulumi.set(__self__, "private_endpoint_outbound_connections", private_endpoint_outbound_connections)
         if shape is not None:
             pulumi.set(__self__, "shape", shape)
         if state is not None:
@@ -530,7 +520,6 @@ class _IntegrationInstanceState:
     def enable_process_automation_trigger(self) -> Optional[pulumi.Input[int]]:
         """
         (Updatable) An optional property when incremented triggers Enable Process Automation. Could be set to any integer value.
-        ||||||| parent of c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         """
         return pulumi.get(self, "enable_process_automation_trigger")
 
@@ -658,24 +647,11 @@ class _IntegrationInstanceState:
     def network_endpoint_details(self, value: Optional[pulumi.Input['IntegrationInstanceNetworkEndpointDetailsArgs']]):
         pulumi.set(self, "network_endpoint_details", value)
 
-    @property
-    @pulumi.getter(name="privateEndpointOutboundConnections")
-    def private_endpoint_outbound_connections(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['IntegrationInstancePrivateEndpointOutboundConnectionArgs']]]]:
-        """
-        Base representation for Outbound Connection (Reverse Connection).
-        """
-        return pulumi.get(self, "private_endpoint_outbound_connections")
-
-    @private_endpoint_outbound_connections.setter
-    def private_endpoint_outbound_connections(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['IntegrationInstancePrivateEndpointOutboundConnectionArgs']]]]):
-        pulumi.set(self, "private_endpoint_outbound_connections", value)
-
     @property
     @pulumi.getter
     def shape(self) -> Optional[pulumi.Input[str]]:
         """
         Shape
-        >>>>>>> c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         """
         return pulumi.get(self, "shape")
 
@@ -829,7 +805,6 @@ class IntegrationInstance(pulumi.CustomResource):
         :param pulumi.Input[str] display_name: (Updatable) Integration Instance Identifier.
         :param pulumi.Input[str] domain_id: The OCID of the identity domain, that will be used to determine the  corresponding Idcs Stripe and create an Idcs application within the stripe.  This parameter is mutually exclusive with parameter: idcsAt, i.e only one of  two parameters should be specified.
         :param pulumi.Input[int] enable_process_automation_trigger: (Updatable) An optional property when incremented triggers Enable Process Automation. Could be set to any integer value.
-               ||||||| parent of c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         :param pulumi.Input[Mapping[str, Any]] freeform_tags: (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}`
         :param pulumi.Input[str] idcs_at: (Updatable) IDCS Authentication token. This is required for all realms with IDCS. Its optional as its not required for non IDCS realms.
         :param pulumi.Input[str] integration_instance_type: (Updatable) Standard or Enterprise type,  Oracle Integration Generation 2 uses ENTERPRISE and STANDARD,  Oracle Integration 3 uses ENTERPRISEX and STANDARDX
@@ -839,7 +814,6 @@ class IntegrationInstance(pulumi.CustomResource):
         :param pulumi.Input[int] message_packs: (Updatable) The number of configured message packs
         :param pulumi.Input[pulumi.InputType['IntegrationInstanceNetworkEndpointDetailsArgs']] network_endpoint_details: Base representation of a network endpoint.
         :param pulumi.Input[str] shape: Shape
-               >>>>>>> c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         :param pulumi.Input[str] state: (Updatable) The target state for the instance. Could be set to ACTIVE or INACTIVE
                
                
@@ -984,7 +958,6 @@ class IntegrationInstance(pulumi.CustomResource):
             __props__.__dict__["attachments"] = None
             __props__.__dict__["idcs_infos"] = None
             __props__.__dict__["instance_url"] = None
-            __props__.__dict__["private_endpoint_outbound_connections"] = None
             __props__.__dict__["state_message"] = None
             __props__.__dict__["time_created"] = None
             __props__.__dict__["time_updated"] = None
@@ -1019,7 +992,6 @@ class IntegrationInstance(pulumi.CustomResource):
             is_visual_builder_enabled: Optional[pulumi.Input[bool]] = None,
             message_packs: Optional[pulumi.Input[int]] = None,
             network_endpoint_details: Optional[pulumi.Input[pulumi.InputType['IntegrationInstanceNetworkEndpointDetailsArgs']]] = None,
-            private_endpoint_outbound_connections: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['IntegrationInstancePrivateEndpointOutboundConnectionArgs']]]]] = None,
             shape: Optional[pulumi.Input[str]] = None,
             state: Optional[pulumi.Input[str]] = None,
             state_message: Optional[pulumi.Input[str]] = None,
@@ -1041,7 +1013,6 @@ class IntegrationInstance(pulumi.CustomResource):
         :param pulumi.Input[str] display_name: (Updatable) Integration Instance Identifier.
         :param pulumi.Input[str] domain_id: The OCID of the identity domain, that will be used to determine the  corresponding Idcs Stripe and create an Idcs application within the stripe.  This parameter is mutually exclusive with parameter: idcsAt, i.e only one of  two parameters should be specified.
         :param pulumi.Input[int] enable_process_automation_trigger: (Updatable) An optional property when incremented triggers Enable Process Automation. Could be set to any integer value.
-               ||||||| parent of c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         :param pulumi.Input[Mapping[str, Any]] freeform_tags: (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}`
         :param pulumi.Input[str] idcs_at: (Updatable) IDCS Authentication token. This is required for all realms with IDCS. Its optional as its not required for non IDCS realms.
         :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['IntegrationInstanceIdcsInfoArgs']]]] idcs_infos: Information for IDCS access
@@ -1052,9 +1023,7 @@ class IntegrationInstance(pulumi.CustomResource):
         :param pulumi.Input[bool] is_visual_builder_enabled: (Updatable) Visual Builder is enabled or not.
         :param pulumi.Input[int] message_packs: (Updatable) The number of configured message packs
         :param pulumi.Input[pulumi.InputType['IntegrationInstanceNetworkEndpointDetailsArgs']] network_endpoint_details: Base representation of a network endpoint.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['IntegrationInstancePrivateEndpointOutboundConnectionArgs']]]] private_endpoint_outbound_connections: Base representation for Outbound Connection (Reverse Connection).
         :param pulumi.Input[str] shape: Shape
-               >>>>>>> c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         :param pulumi.Input[str] state: (Updatable) The target state for the instance. Could be set to ACTIVE or INACTIVE
                
                
@@ -1087,7 +1056,6 @@ class IntegrationInstance(pulumi.CustomResource):
         __props__.__dict__["is_visual_builder_enabled"] = is_visual_builder_enabled
         __props__.__dict__["message_packs"] = message_packs
         __props__.__dict__["network_endpoint_details"] = network_endpoint_details
-        __props__.__dict__["private_endpoint_outbound_connections"] = private_endpoint_outbound_connections
         __props__.__dict__["shape"] = shape
         __props__.__dict__["state"] = state
         __props__.__dict__["state_message"] = state_message
@@ -1164,7 +1132,6 @@ class IntegrationInstance(pulumi.CustomResource):
     def enable_process_automation_trigger(self) -> pulumi.Output[Optional[int]]:
         """
         (Updatable) An optional property when incremented triggers Enable Process Automation. Could be set to any integer value.
-        ||||||| parent of c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         """
         return pulumi.get(self, "enable_process_automation_trigger")
 
@@ -1248,20 +1215,11 @@ class IntegrationInstance(pulumi.CustomResource):
         """
         return pulumi.get(self, "network_endpoint_details")
 
-    @property
-    @pulumi.getter(name="privateEndpointOutboundConnections")
-    def private_endpoint_outbound_connections(self) -> pulumi.Output[Sequence['outputs.IntegrationInstancePrivateEndpointOutboundConnection']]:
-        """
-        Base representation for Outbound Connection (Reverse Connection).
-        """
-        return pulumi.get(self, "private_endpoint_outbound_connections")
-
     @property
     @pulumi.getter
     def shape(self) -> pulumi.Output[str]:
         """
         Shape
-        >>>>>>> c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         """
         return pulumi.get(self, "shape")
 

pulumi_oci/integration/outputs.py

@@ -17,14 +17,12 @@ __all__ = [
     'IntegrationInstanceIdcsInfo',
     'IntegrationInstanceNetworkEndpointDetails',
     'IntegrationInstanceNetworkEndpointDetailsAllowlistedHttpVcn',
-    'IntegrationInstancePrivateEndpointOutboundConnection',
     'GetIntegrationInstanceAlternateCustomEndpointResult',
     'GetIntegrationInstanceAttachmentResult',
     'GetIntegrationInstanceCustomEndpointResult',
     'GetIntegrationInstanceIdcsInfoResult',
     'GetIntegrationInstanceNetworkEndpointDetailResult',
     'GetIntegrationInstanceNetworkEndpointDetailAllowlistedHttpVcnResult',
-    'GetIntegrationInstancePrivateEndpointOutboundConnectionResult',
     'GetIntegrationInstancesFilterResult',
     'GetIntegrationInstancesIntegrationInstanceResult',
     'GetIntegrationInstancesIntegrationInstanceAlternateCustomEndpointResult',
@@ -33,7 +31,6 @@ __all__ = [
     'GetIntegrationInstancesIntegrationInstanceIdcsInfoResult',
     'GetIntegrationInstancesIntegrationInstanceNetworkEndpointDetailResult',
     'GetIntegrationInstancesIntegrationInstanceNetworkEndpointDetailAllowlistedHttpVcnResult',
-    'GetIntegrationInstancesIntegrationInstancePrivateEndpointOutboundConnectionResult',
 ]
 
 @pulumi.output_type
@@ -403,7 +400,6 @@ class IntegrationInstanceNetworkEndpointDetails(dict):
         :param Sequence[str] allowlisted_http_ips: Source IP addresses or IP address ranges ingress rules. (ex: "168.122.59.5", "10.20.30.0/26") An invalid IP or CIDR block will result in a 400 response.
         :param Sequence['IntegrationInstanceNetworkEndpointDetailsAllowlistedHttpVcnArgs'] allowlisted_http_vcns: Virtual Cloud Networks allowed to access this network endpoint.
         :param bool is_integration_vcn_allowlisted: The Integration service's VCN is allow-listed to allow integrations to call back into other integrations
-               <<<<<<< HEAD
         """
         pulumi.set(__self__, "network_endpoint_type", network_endpoint_type)
         if allowlisted_http_ips is not None:
@@ -442,7 +438,6 @@ class IntegrationInstanceNetworkEndpointDetails(dict):
     def is_integration_vcn_allowlisted(self) -> Optional[bool]:
         """
         The Integration service's VCN is allow-listed to allow integrations to call back into other integrations
-        <<<<<<< HEAD
         """
         return pulumi.get(self, "is_integration_vcn_allowlisted")
 
@@ -494,70 +489,6 @@ class IntegrationInstanceNetworkEndpointDetailsAllowlistedHttpVcn(dict):
         return pulumi.get(self, "allowlisted_ips")
 
 
-@pulumi.output_type
-class IntegrationInstancePrivateEndpointOutboundConnection(dict):
-    @staticmethod
-    def __key_warning(key: str):
-        suggest = None
-        if key == "nsgIds":
-            suggest = "nsg_ids"
-        elif key == "outboundConnectionType":
-            suggest = "outbound_connection_type"
-        elif key == "subnetId":
-            suggest = "subnet_id"
-
-        if suggest:
-            pulumi.log.warn(f"Key '{key}' not found in IntegrationInstancePrivateEndpointOutboundConnection. Access the value via the '{suggest}' property getter instead.")
-
-    def __getitem__(self, key: str) -> Any:
-        IntegrationInstancePrivateEndpointOutboundConnection.__key_warning(key)
-        return super().__getitem__(key)
-
-    def get(self, key: str, default = None) -> Any:
-        IntegrationInstancePrivateEndpointOutboundConnection.__key_warning(key)
-        return super().get(key, default)
-
-    def __init__(__self__, *,
-                 nsg_ids: Optional[Sequence[str]] = None,
-                 outbound_connection_type: Optional[str] = None,
-                 subnet_id: Optional[str] = None):
-        """
-        :param Sequence[str] nsg_ids: One or more Network security group Ids. This is an optional argument.
-        :param str outbound_connection_type: The type of Outbound Connection.
-        :param str subnet_id: Customer Private Network VCN Subnet OCID. This is a required argument.
-        """
-        if nsg_ids is not None:
-            pulumi.set(__self__, "nsg_ids", nsg_ids)
-        if outbound_connection_type is not None:
-            pulumi.set(__self__, "outbound_connection_type", outbound_connection_type)
-        if subnet_id is not None:
-            pulumi.set(__self__, "subnet_id", subnet_id)
-
-    @property
-    @pulumi.getter(name="nsgIds")
-    def nsg_ids(self) -> Optional[Sequence[str]]:
-        """
-        One or more Network security group Ids. This is an optional argument.
-        """
-        return pulumi.get(self, "nsg_ids")
-
-    @property
-    @pulumi.getter(name="outboundConnectionType")
-    def outbound_connection_type(self) -> Optional[str]:
-        """
-        The type of Outbound Connection.
-        """
-        return pulumi.get(self, "outbound_connection_type")
-
-    @property
-    @pulumi.getter(name="subnetId")
-    def subnet_id(self) -> Optional[str]:
-        """
-        Customer Private Network VCN Subnet OCID. This is a required argument.
-        """
-        return pulumi.get(self, "subnet_id")
-
-
 @pulumi.output_type
 class GetIntegrationInstanceAlternateCustomEndpointResult(dict):
     def __init__(__self__, *,
@@ -797,8 +728,7 @@ class GetIntegrationInstanceNetworkEndpointDetailResult(dict):
         :param Sequence[str] allowlisted_http_ips: Source IP addresses or IP address ranges ingress rules. (ex: "168.122.59.5", "10.20.30.0/26") An invalid IP or CIDR block will result in a 400 response.
         :param Sequence['GetIntegrationInstanceNetworkEndpointDetailAllowlistedHttpVcnArgs'] allowlisted_http_vcns: Virtual Cloud Networks allowed to access this network endpoint.
         :param bool is_integration_vcn_allowlisted: The Integration service's VCN is allow-listed to allow integrations to call back into other integrations
-        :param str network_endpoint_type: The type of network endpoint. 
-               <<<<<<< HEAD
+        :param str network_endpoint_type: The type of network endpoint.
         """
         pulumi.set(__self__, "allowlisted_http_ips", allowlisted_http_ips)
         pulumi.set(__self__, "allowlisted_http_vcns", allowlisted_http_vcns)
@@ -833,8 +763,7 @@ class GetIntegrationInstanceNetworkEndpointDetailResult(dict):
     @pulumi.getter(name="networkEndpointType")
     def network_endpoint_type(self) -> str:
         """
-        The type of network endpoint. 
-        <<<<<<< HEAD
+        The type of network endpoint.
         """
         return pulumi.get(self, "network_endpoint_type")
 
@@ -868,46 +797,6 @@ class GetIntegrationInstanceNetworkEndpointDetailAllowlistedHttpVcnResult(dict):
         return pulumi.get(self, "id")
 
 
-@pulumi.output_type
-class GetIntegrationInstancePrivateEndpointOutboundConnectionResult(dict):
-    def __init__(__self__, *,
-                 nsg_ids: Sequence[str],
-                 outbound_connection_type: str,
-                 subnet_id: str):
-        """
-        :param Sequence[str] nsg_ids: One or more Network security group Ids. This is an optional argument.
-        :param str outbound_connection_type: The type of Outbound Connection.
-        :param str subnet_id: Customer Private Network VCN Subnet OCID. This is a required argument.
-        """
-        pulumi.set(__self__, "nsg_ids", nsg_ids)
-        pulumi.set(__self__, "outbound_connection_type", outbound_connection_type)
-        pulumi.set(__self__, "subnet_id", subnet_id)
-
-    @property
-    @pulumi.getter(name="nsgIds")
-    def nsg_ids(self) -> Sequence[str]:
-        """
-        One or more Network security group Ids. This is an optional argument.
-        """
-        return pulumi.get(self, "nsg_ids")
-
-    @property
-    @pulumi.getter(name="outboundConnectionType")
-    def outbound_connection_type(self) -> str:
-        """
-        The type of Outbound Connection.
-        """
-        return pulumi.get(self, "outbound_connection_type")
-
-    @property
-    @pulumi.getter(name="subnetId")
-    def subnet_id(self) -> str:
-        """
-        Customer Private Network VCN Subnet OCID. This is a required argument.
-        """
-        return pulumi.get(self, "subnet_id")
-
-
 @pulumi.output_type
 class GetIntegrationInstancesFilterResult(dict):
     def __init__(__self__, *,
@@ -958,7 +847,6 @@ class GetIntegrationInstancesIntegrationInstanceResult(dict):
                  is_visual_builder_enabled: bool,
                  message_packs: int,
                  network_endpoint_details: Sequence['outputs.GetIntegrationInstancesIntegrationInstanceNetworkEndpointDetailResult'],
-                 private_endpoint_outbound_connections: Sequence['outputs.GetIntegrationInstancesIntegrationInstancePrivateEndpointOutboundConnectionResult'],
                  shape: str,
                  state: str,
                  state_message: str,
@@ -982,9 +870,7 @@ class GetIntegrationInstancesIntegrationInstanceResult(dict):
         :param bool is_visual_builder_enabled: Visual Builder is enabled or not.
         :param int message_packs: The number of configured message packs (if any)
         :param Sequence['GetIntegrationInstancesIntegrationInstanceNetworkEndpointDetailArgs'] network_endpoint_details: Base representation of a network endpoint.
-        :param Sequence['GetIntegrationInstancesIntegrationInstancePrivateEndpointOutboundConnectionArgs'] private_endpoint_outbound_connections: Base representation for Outbound Connection (Reverse Connection).
         :param str shape: Shape
-               >>>>>>> c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         :param str state: Life cycle state to query on.
         :param str state_message: An message describing the current state in more detail. For example, can be used to provide actionable information for a resource in Failed state.
         :param str time_created: The time the the Integration Instance was created. An RFC3339 formatted datetime string.
@@ -1010,7 +896,6 @@ class GetIntegrationInstancesIntegrationInstanceResult(dict):
         pulumi.set(__self__, "is_visual_builder_enabled", is_visual_builder_enabled)
         pulumi.set(__self__, "message_packs", message_packs)
         pulumi.set(__self__, "network_endpoint_details", network_endpoint_details)
-        pulumi.set(__self__, "private_endpoint_outbound_connections", private_endpoint_outbound_connections)
         pulumi.set(__self__, "shape", shape)
         pulumi.set(__self__, "state", state)
         pulumi.set(__self__, "state_message", state_message)
@@ -1168,20 +1053,11 @@ class GetIntegrationInstancesIntegrationInstanceResult(dict):
         """
         return pulumi.get(self, "network_endpoint_details")
 
-    @property
-    @pulumi.getter(name="privateEndpointOutboundConnections")
-    def private_endpoint_outbound_connections(self) -> Sequence['outputs.GetIntegrationInstancesIntegrationInstancePrivateEndpointOutboundConnectionResult']:
-        """
-        Base representation for Outbound Connection (Reverse Connection).
-        """
-        return pulumi.get(self, "private_endpoint_outbound_connections")
-
     @property
     @pulumi.getter
     def shape(self) -> str:
         """
         Shape
-        >>>>>>> c689349fc7 (Added - Support for Enabling outbound private access using PE RCE for OIC Gen3 customers)
         """
         return pulumi.get(self, "shape")
 
@@ -1457,8 +1333,7 @@ class GetIntegrationInstancesIntegrationInstanceNetworkEndpointDetailResult(dict
         :param Sequence[str] allowlisted_http_ips: Source IP addresses or IP address ranges ingress rules. (ex: "168.122.59.5", "10.20.30.0/26") An invalid IP or CIDR block will result in a 400 response.
         :param Sequence['GetIntegrationInstancesIntegrationInstanceNetworkEndpointDetailAllowlistedHttpVcnArgs'] allowlisted_http_vcns: Virtual Cloud Networks allowed to access this network endpoint.
         :param bool is_integration_vcn_allowlisted: The Integration service's VCN is allow-listed to allow integrations to call back into other integrations
-        :param str network_endpoint_type: The type of network endpoint. 
-               <<<<<<< HEAD
+        :param str network_endpoint_type: The type of network endpoint.
         """
         pulumi.set(__self__, "allowlisted_http_ips", allowlisted_http_ips)
         pulumi.set(__self__, "allowlisted_http_vcns", allowlisted_http_vcns)
@@ -1493,8 +1368,7 @@ class GetIntegrationInstancesIntegrationInstanceNetworkEndpointDetailResult(dict
     @pulumi.getter(name="networkEndpointType")
     def network_endpoint_type(self) -> str:
         """
-        The type of network endpoint. 
-        <<<<<<< HEAD
+        The type of network endpoint.
         """
         return pulumi.get(self, "network_endpoint_type")
 
@@ -1528,43 +1402,3 @@ class GetIntegrationInstancesIntegrationInstanceNetworkEndpointDetailAllowlisted
         return pulumi.get(self, "id")
 
 
-@pulumi.output_type
-class GetIntegrationInstancesIntegrationInstancePrivateEndpointOutboundConnectionResult(dict):
-    def __init__(__self__, *,
-                 nsg_ids: Sequence[str],
-                 outbound_connection_type: str,
-                 subnet_id: str):
-        """
-        :param Sequence[str] nsg_ids: One or more Network security group Ids. This is an optional argument.
-        :param str outbound_connection_type: The type of Outbound Connection.
-        :param str subnet_id: Customer Private Network VCN Subnet OCID. This is a required argument.
-        """
-        pulumi.set(__self__, "nsg_ids", nsg_ids)
-        pulumi.set(__self__, "outbound_connection_type", outbound_connection_type)
-        pulumi.set(__self__, "subnet_id", subnet_id)
-
-    @property
-    @pulumi.getter(name="nsgIds")
-    def nsg_ids(self) -> Sequence[str]:
-        """
-        One or more Network security group Ids. This is an optional argument.
-        """
-        return pulumi.get(self, "nsg_ids")
-
-    @property
-    @pulumi.getter(name="outboundConnectionType")
-    def outbound_connection_type(self) -> str:
-        """
-        The type of Outbound Connection.
-        """
-        return pulumi.get(self, "outbound_connection_type")
-
-    @property
-    @pulumi.getter(name="subnetId")
-    def subnet_id(self) -> str:
-        """
-        Customer Private Network VCN Subnet OCID. This is a required argument.
-        """
-        return pulumi.get(self, "subnet_id")
-
-