pulumi-oci 2.20.0__py3-none-any.whl → 2.20.0a1734157400__py3-none-any.whl

pulumi_oci/bigdataservice/bds_instance_api_key.py

@@ -23,14 +23,11 @@ class BdsInstanceApiKeyArgs:
                  key_alias: pulumi.Input[str],
                  passphrase: pulumi.Input[str],
                  user_id: pulumi.Input[str],
-                 default_region: Optional[pulumi.Input[str]] = None,
-                 domain_ocid: Optional[pulumi.Input[str]] = None):
+                 default_region: Optional[pulumi.Input[str]] = None):
         """
         The set of arguments for constructing a BdsInstanceApiKey resource.
         :param pulumi.Input[str] bds_instance_id: The OCID of the cluster.
-               <<<<<<< ours
         :param pulumi.Input[str] key_alias: User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
-               >>>>>>> theirs
         :param pulumi.Input[str] passphrase: Base64 passphrase used to secure the private key which will be created on user behalf.
         :param pulumi.Input[str] user_id: The OCID of the user for whom this new generated API key pair will be created.
                
@@ -38,7 +35,6 @@ class BdsInstanceApiKeyArgs:
                ** 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[str] default_region: The name of the region to establish the Object Storage endpoint. See https://docs.oracle.com/en-us/iaas/api/#/en/identity/20160918/Region/ for additional information.
-        :param pulumi.Input[str] domain_ocid: Identity domain OCID , where user is present. For default domain , this field will be optional.
         """
         pulumi.set(__self__, "bds_instance_id", bds_instance_id)
         pulumi.set(__self__, "key_alias", key_alias)
@@ -46,15 +42,12 @@ class BdsInstanceApiKeyArgs:
         pulumi.set(__self__, "user_id", user_id)
         if default_region is not None:
             pulumi.set(__self__, "default_region", default_region)
-        if domain_ocid is not None:
-            pulumi.set(__self__, "domain_ocid", domain_ocid)
 
     @property
     @pulumi.getter(name="bdsInstanceId")
     def bds_instance_id(self) -> pulumi.Input[str]:
         """
         The OCID of the cluster.
-        <<<<<<< ours
         """
         return pulumi.get(self, "bds_instance_id")
 
@@ -67,7 +60,6 @@ class BdsInstanceApiKeyArgs:
     def key_alias(self) -> pulumi.Input[str]:
         """
         User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
-        >>>>>>> theirs
         """
         return pulumi.get(self, "key_alias")
 
@@ -115,25 +107,12 @@ class BdsInstanceApiKeyArgs:
     def default_region(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "default_region", value)
 
-    @property
-    @pulumi.getter(name="domainOcid")
-    def domain_ocid(self) -> Optional[pulumi.Input[str]]:
-        """
-        Identity domain OCID , where user is present. For default domain , this field will be optional.
-        """
-        return pulumi.get(self, "domain_ocid")
-
-    @domain_ocid.setter
-    def domain_ocid(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "domain_ocid", value)
-
 
 @pulumi.input_type
 class _BdsInstanceApiKeyState:
     def __init__(__self__, *,
                  bds_instance_id: Optional[pulumi.Input[str]] = None,
                  default_region: Optional[pulumi.Input[str]] = None,
-                 domain_ocid: Optional[pulumi.Input[str]] = None,
                  fingerprint: Optional[pulumi.Input[str]] = None,
                  key_alias: Optional[pulumi.Input[str]] = None,
                  passphrase: Optional[pulumi.Input[str]] = None,
@@ -145,12 +124,9 @@ class _BdsInstanceApiKeyState:
         """
         Input properties used for looking up and filtering BdsInstanceApiKey resources.
         :param pulumi.Input[str] bds_instance_id: The OCID of the cluster.
-               <<<<<<< ours
         :param pulumi.Input[str] default_region: The name of the region to establish the Object Storage endpoint. See https://docs.oracle.com/en-us/iaas/api/#/en/identity/20160918/Region/ for additional information.
-        :param pulumi.Input[str] domain_ocid: Identity domain OCID , where user is present. For default domain , this field will be optional.
         :param pulumi.Input[str] fingerprint: The fingerprint that corresponds to the public API key requested.
         :param pulumi.Input[str] key_alias: User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
-               >>>>>>> theirs
         :param pulumi.Input[str] passphrase: Base64 passphrase used to secure the private key which will be created on user behalf.
         :param pulumi.Input[str] pemfilepath: The full path and file name of the private key used for authentication. This location will be automatically selected on the BDS local file system.
         :param pulumi.Input[str] state: The current status of the API key.
@@ -166,8 +142,6 @@ class _BdsInstanceApiKeyState:
             pulumi.set(__self__, "bds_instance_id", bds_instance_id)
         if default_region is not None:
             pulumi.set(__self__, "default_region", default_region)
-        if domain_ocid is not None:
-            pulumi.set(__self__, "domain_ocid", domain_ocid)
         if fingerprint is not None:
             pulumi.set(__self__, "fingerprint", fingerprint)
         if key_alias is not None:
@@ -190,7 +164,6 @@ class _BdsInstanceApiKeyState:
     def bds_instance_id(self) -> Optional[pulumi.Input[str]]:
         """
         The OCID of the cluster.
-        <<<<<<< ours
         """
         return pulumi.get(self, "bds_instance_id")
 
@@ -210,18 +183,6 @@ class _BdsInstanceApiKeyState:
     def default_region(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "default_region", value)
 
-    @property
-    @pulumi.getter(name="domainOcid")
-    def domain_ocid(self) -> Optional[pulumi.Input[str]]:
-        """
-        Identity domain OCID , where user is present. For default domain , this field will be optional.
-        """
-        return pulumi.get(self, "domain_ocid")
-
-    @domain_ocid.setter
-    def domain_ocid(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "domain_ocid", value)
-
     @property
     @pulumi.getter
     def fingerprint(self) -> Optional[pulumi.Input[str]]:
@@ -239,7 +200,6 @@ class _BdsInstanceApiKeyState:
     def key_alias(self) -> Optional[pulumi.Input[str]]:
         """
         User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
-        >>>>>>> theirs
         """
         return pulumi.get(self, "key_alias")
 
@@ -331,7 +291,6 @@ class BdsInstanceApiKey(pulumi.CustomResource):
                  opts: Optional[pulumi.ResourceOptions] = None,
                  bds_instance_id: Optional[pulumi.Input[str]] = None,
                  default_region: Optional[pulumi.Input[str]] = None,
-                 domain_ocid: Optional[pulumi.Input[str]] = None,
                  key_alias: Optional[pulumi.Input[str]] = None,
                  passphrase: Optional[pulumi.Input[str]] = None,
                  user_id: Optional[pulumi.Input[str]] = None,
@@ -352,8 +311,7 @@ class BdsInstanceApiKey(pulumi.CustomResource):
             key_alias=bds_instance_api_key_key_alias,
             passphrase=bds_instance_api_key_passphrase,
             user_id=test_user["id"],
-            default_region=bds_instance_api_key_default_region,
-            domain_ocid=bds_instance_api_key_domain_ocid)
+            default_region=bds_instance_api_key_default_region)
         ```
 
         ## Import
@@ -367,11 +325,8 @@ class BdsInstanceApiKey(pulumi.CustomResource):
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[str] bds_instance_id: The OCID of the cluster.
-               <<<<<<< ours
         :param pulumi.Input[str] default_region: The name of the region to establish the Object Storage endpoint. See https://docs.oracle.com/en-us/iaas/api/#/en/identity/20160918/Region/ for additional information.
-        :param pulumi.Input[str] domain_ocid: Identity domain OCID , where user is present. For default domain , this field will be optional.
         :param pulumi.Input[str] key_alias: User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
-               >>>>>>> theirs
         :param pulumi.Input[str] passphrase: Base64 passphrase used to secure the private key which will be created on user behalf.
         :param pulumi.Input[str] user_id: The OCID of the user for whom this new generated API key pair will be created.
                
@@ -401,8 +356,7 @@ class BdsInstanceApiKey(pulumi.CustomResource):
             key_alias=bds_instance_api_key_key_alias,
             passphrase=bds_instance_api_key_passphrase,
             user_id=test_user["id"],
-            default_region=bds_instance_api_key_default_region,
-            domain_ocid=bds_instance_api_key_domain_ocid)
+            default_region=bds_instance_api_key_default_region)
         ```
 
         ## Import
@@ -430,7 +384,6 @@ class BdsInstanceApiKey(pulumi.CustomResource):
                  opts: Optional[pulumi.ResourceOptions] = None,
                  bds_instance_id: Optional[pulumi.Input[str]] = None,
                  default_region: Optional[pulumi.Input[str]] = None,
-                 domain_ocid: Optional[pulumi.Input[str]] = None,
                  key_alias: Optional[pulumi.Input[str]] = None,
                  passphrase: Optional[pulumi.Input[str]] = None,
                  user_id: Optional[pulumi.Input[str]] = None,
@@ -447,7 +400,6 @@ class BdsInstanceApiKey(pulumi.CustomResource):
                 raise TypeError("Missing required property 'bds_instance_id'")
             __props__.__dict__["bds_instance_id"] = bds_instance_id
             __props__.__dict__["default_region"] = default_region
-            __props__.__dict__["domain_ocid"] = domain_ocid
             if key_alias is None and not opts.urn:
                 raise TypeError("Missing required property 'key_alias'")
             __props__.__dict__["key_alias"] = key_alias
@@ -476,7 +428,6 @@ class BdsInstanceApiKey(pulumi.CustomResource):
             opts: Optional[pulumi.ResourceOptions] = None,
             bds_instance_id: Optional[pulumi.Input[str]] = None,
             default_region: Optional[pulumi.Input[str]] = None,
-            domain_ocid: Optional[pulumi.Input[str]] = None,
             fingerprint: Optional[pulumi.Input[str]] = None,
             key_alias: Optional[pulumi.Input[str]] = None,
             passphrase: Optional[pulumi.Input[str]] = None,
@@ -493,12 +444,9 @@ class BdsInstanceApiKey(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[str] bds_instance_id: The OCID of the cluster.
-               <<<<<<< ours
         :param pulumi.Input[str] default_region: The name of the region to establish the Object Storage endpoint. See https://docs.oracle.com/en-us/iaas/api/#/en/identity/20160918/Region/ for additional information.
-        :param pulumi.Input[str] domain_ocid: Identity domain OCID , where user is present. For default domain , this field will be optional.
         :param pulumi.Input[str] fingerprint: The fingerprint that corresponds to the public API key requested.
         :param pulumi.Input[str] key_alias: User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
-               >>>>>>> theirs
         :param pulumi.Input[str] passphrase: Base64 passphrase used to secure the private key which will be created on user behalf.
         :param pulumi.Input[str] pemfilepath: The full path and file name of the private key used for authentication. This location will be automatically selected on the BDS local file system.
         :param pulumi.Input[str] state: The current status of the API key.
@@ -516,7 +464,6 @@ class BdsInstanceApiKey(pulumi.CustomResource):
 
         __props__.__dict__["bds_instance_id"] = bds_instance_id
         __props__.__dict__["default_region"] = default_region
-        __props__.__dict__["domain_ocid"] = domain_ocid
         __props__.__dict__["fingerprint"] = fingerprint
         __props__.__dict__["key_alias"] = key_alias
         __props__.__dict__["passphrase"] = passphrase
@@ -532,7 +479,6 @@ class BdsInstanceApiKey(pulumi.CustomResource):
     def bds_instance_id(self) -> pulumi.Output[str]:
         """
         The OCID of the cluster.
-        <<<<<<< ours
         """
         return pulumi.get(self, "bds_instance_id")
 
@@ -544,14 +490,6 @@ class BdsInstanceApiKey(pulumi.CustomResource):
         """
         return pulumi.get(self, "default_region")
 
-    @property
-    @pulumi.getter(name="domainOcid")
-    def domain_ocid(self) -> pulumi.Output[str]:
-        """
-        Identity domain OCID , where user is present. For default domain , this field will be optional.
-        """
-        return pulumi.get(self, "domain_ocid")
-
     @property
     @pulumi.getter
     def fingerprint(self) -> pulumi.Output[str]:
@@ -565,7 +503,6 @@ class BdsInstanceApiKey(pulumi.CustomResource):
     def key_alias(self) -> pulumi.Output[str]:
         """
         User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
-        >>>>>>> theirs
         """
         return pulumi.get(self, "key_alias")
 

pulumi_oci/bigdataservice/bds_instance_patch_action.py

@@ -203,8 +203,6 @@ class BdsInstancePatchAction(pulumi.CustomResource):
             patching_config={
                 "patching_config_strategy": bds_instance_patch_action_patching_config_patching_config_strategy,
                 "batch_size": bds_instance_patch_action_patching_config_batch_size,
-                "tolerance_threshold_per_batch": bds_instance_patch_action_patching_config_tolerance_threshold_per_batch,
-                "tolerance_threshold_per_domain": bds_instance_patch_action_patching_config_tolerance_threshold_per_domain,
                 "wait_time_between_batch_in_seconds": bds_instance_patch_action_patching_config_wait_time_between_batch_in_seconds,
                 "wait_time_between_domain_in_seconds": bds_instance_patch_action_patching_config_wait_time_between_domain_in_seconds,
             })
@@ -249,8 +247,6 @@ class BdsInstancePatchAction(pulumi.CustomResource):
             patching_config={
                 "patching_config_strategy": bds_instance_patch_action_patching_config_patching_config_strategy,
                 "batch_size": bds_instance_patch_action_patching_config_batch_size,
-                "tolerance_threshold_per_batch": bds_instance_patch_action_patching_config_tolerance_threshold_per_batch,
-                "tolerance_threshold_per_domain": bds_instance_patch_action_patching_config_tolerance_threshold_per_domain,
                 "wait_time_between_batch_in_seconds": bds_instance_patch_action_patching_config_wait_time_between_batch_in_seconds,
                 "wait_time_between_domain_in_seconds": bds_instance_patch_action_patching_config_wait_time_between_domain_in_seconds,
             })

pulumi_oci/bigdataservice/get_bds_instance.py

@@ -27,10 +27,7 @@ class GetBdsInstanceResult:
     """
     A collection of values returned by getBdsInstance.
     """
-    def __init__(__self__, bds_cluster_version_summaries=None, bds_instance_id=None, bootstrap_script_url=None, cloud_sql_details=None, cluster_admin_password=None, cluster_details=None, cluster_profile=None, cluster_public_key=None, cluster_version=None, compartment_id=None, compute_only_worker_nodes=None, created_by=None, defined_tags=None, display_name=None, edge_nodes=None, freeform_tags=None, id=None, ignore_existing_nodes_shapes=None, is_cloud_sql_configured=None, is_force_remove_enabled=None, is_force_stop_jobs=None, is_high_availability=None, is_kafka_configured=None, is_secure=None, kafka_broker_nodes=None, kerberos_realm_name=None, kms_key_id=None, master_nodes=None, network_configs=None, nodes=None, number_of_nodes=None, number_of_nodes_requiring_maintenance_reboot=None, os_patch_version=None, remove_node=None, start_cluster_shape_configs=None, state=None, time_created=None, time_updated=None, util_nodes=None, worker_nodes=None):
-        if bds_cluster_version_summaries and not isinstance(bds_cluster_version_summaries, list):
-            raise TypeError("Expected argument 'bds_cluster_version_summaries' to be a list")
-        pulumi.set(__self__, "bds_cluster_version_summaries", bds_cluster_version_summaries)
+    def __init__(__self__, bds_instance_id=None, bootstrap_script_url=None, cloud_sql_details=None, cluster_admin_password=None, cluster_details=None, cluster_profile=None, cluster_public_key=None, cluster_version=None, compartment_id=None, compute_only_worker_nodes=None, created_by=None, defined_tags=None, display_name=None, edge_nodes=None, freeform_tags=None, id=None, ignore_existing_nodes_shapes=None, is_cloud_sql_configured=None, is_force_stop_jobs=None, is_high_availability=None, is_kafka_configured=None, is_secure=None, kafka_broker_nodes=None, kerberos_realm_name=None, kms_key_id=None, master_nodes=None, network_configs=None, nodes=None, number_of_nodes=None, number_of_nodes_requiring_maintenance_reboot=None, os_patch_version=None, state=None, time_created=None, time_updated=None, util_nodes=None, worker_nodes=None):
         if bds_instance_id and not isinstance(bds_instance_id, str):
             raise TypeError("Expected argument 'bds_instance_id' to be a str")
         pulumi.set(__self__, "bds_instance_id", bds_instance_id)
@@ -85,9 +82,6 @@ class GetBdsInstanceResult:
         if is_cloud_sql_configured and not isinstance(is_cloud_sql_configured, bool):
             raise TypeError("Expected argument 'is_cloud_sql_configured' to be a bool")
         pulumi.set(__self__, "is_cloud_sql_configured", is_cloud_sql_configured)
-        if is_force_remove_enabled and not isinstance(is_force_remove_enabled, bool):
-            raise TypeError("Expected argument 'is_force_remove_enabled' to be a bool")
-        pulumi.set(__self__, "is_force_remove_enabled", is_force_remove_enabled)
         if is_force_stop_jobs and not isinstance(is_force_stop_jobs, bool):
             raise TypeError("Expected argument 'is_force_stop_jobs' to be a bool")
         pulumi.set(__self__, "is_force_stop_jobs", is_force_stop_jobs)
@@ -127,12 +121,6 @@ class GetBdsInstanceResult:
         if os_patch_version and not isinstance(os_patch_version, str):
             raise TypeError("Expected argument 'os_patch_version' to be a str")
         pulumi.set(__self__, "os_patch_version", os_patch_version)
-        if remove_node and not isinstance(remove_node, str):
-            raise TypeError("Expected argument 'remove_node' to be a str")
-        pulumi.set(__self__, "remove_node", remove_node)
-        if start_cluster_shape_configs and not isinstance(start_cluster_shape_configs, list):
-            raise TypeError("Expected argument 'start_cluster_shape_configs' to be a list")
-        pulumi.set(__self__, "start_cluster_shape_configs", start_cluster_shape_configs)
         if state and not isinstance(state, str):
             raise TypeError("Expected argument 'state' to be a str")
         pulumi.set(__self__, "state", state)
@@ -149,14 +137,6 @@ class GetBdsInstanceResult:
             raise TypeError("Expected argument 'worker_nodes' to be a list")
         pulumi.set(__self__, "worker_nodes", worker_nodes)
 
-    @property
-    @pulumi.getter(name="bdsClusterVersionSummaries")
-    def bds_cluster_version_summaries(self) -> Sequence['outputs.GetBdsInstanceBdsClusterVersionSummaryResult']:
-        """
-        Cluster version details including bds and odh version information.
-        """
-        return pulumi.get(self, "bds_cluster_version_summaries")
-
     @property
     @pulumi.getter(name="bdsInstanceId")
     def bds_instance_id(self) -> str:
@@ -283,11 +263,6 @@ class GetBdsInstanceResult:
         """
         return pulumi.get(self, "is_cloud_sql_configured")
 
-    @property
-    @pulumi.getter(name="isForceRemoveEnabled")
-    def is_force_remove_enabled(self) -> bool:
-        return pulumi.get(self, "is_force_remove_enabled")
-
     @property
     @pulumi.getter(name="isForceStopJobs")
     def is_force_stop_jobs(self) -> bool:
@@ -377,16 +352,6 @@ class GetBdsInstanceResult:
     def os_patch_version(self) -> str:
         return pulumi.get(self, "os_patch_version")
 
-    @property
-    @pulumi.getter(name="removeNode")
-    def remove_node(self) -> str:
-        return pulumi.get(self, "remove_node")
-
-    @property
-    @pulumi.getter(name="startClusterShapeConfigs")
-    def start_cluster_shape_configs(self) -> Sequence['outputs.GetBdsInstanceStartClusterShapeConfigResult']:
-        return pulumi.get(self, "start_cluster_shape_configs")
-
     @property
     @pulumi.getter
     def state(self) -> str:
@@ -428,7 +393,6 @@ class AwaitableGetBdsInstanceResult(GetBdsInstanceResult):
         if False:
             yield self
         return GetBdsInstanceResult(
-            bds_cluster_version_summaries=self.bds_cluster_version_summaries,
             bds_instance_id=self.bds_instance_id,
             bootstrap_script_url=self.bootstrap_script_url,
             cloud_sql_details=self.cloud_sql_details,
@@ -447,7 +411,6 @@ class AwaitableGetBdsInstanceResult(GetBdsInstanceResult):
             id=self.id,
             ignore_existing_nodes_shapes=self.ignore_existing_nodes_shapes,
             is_cloud_sql_configured=self.is_cloud_sql_configured,
-            is_force_remove_enabled=self.is_force_remove_enabled,
             is_force_stop_jobs=self.is_force_stop_jobs,
             is_high_availability=self.is_high_availability,
             is_kafka_configured=self.is_kafka_configured,
@@ -461,8 +424,6 @@ class AwaitableGetBdsInstanceResult(GetBdsInstanceResult):
             number_of_nodes=self.number_of_nodes,
             number_of_nodes_requiring_maintenance_reboot=self.number_of_nodes_requiring_maintenance_reboot,
             os_patch_version=self.os_patch_version,
-            remove_node=self.remove_node,
-            start_cluster_shape_configs=self.start_cluster_shape_configs,
             state=self.state,
             time_created=self.time_created,
             time_updated=self.time_updated,
@@ -495,7 +456,6 @@ def get_bds_instance(bds_instance_id: Optional[str] = None,
     __ret__ = pulumi.runtime.invoke('oci:BigDataService/getBdsInstance:getBdsInstance', __args__, opts=opts, typ=GetBdsInstanceResult).value
 
     return AwaitableGetBdsInstanceResult(
-        bds_cluster_version_summaries=pulumi.get(__ret__, 'bds_cluster_version_summaries'),
         bds_instance_id=pulumi.get(__ret__, 'bds_instance_id'),
         bootstrap_script_url=pulumi.get(__ret__, 'bootstrap_script_url'),
         cloud_sql_details=pulumi.get(__ret__, 'cloud_sql_details'),
@@ -514,7 +474,6 @@ def get_bds_instance(bds_instance_id: Optional[str] = None,
         id=pulumi.get(__ret__, 'id'),
         ignore_existing_nodes_shapes=pulumi.get(__ret__, 'ignore_existing_nodes_shapes'),
         is_cloud_sql_configured=pulumi.get(__ret__, 'is_cloud_sql_configured'),
-        is_force_remove_enabled=pulumi.get(__ret__, 'is_force_remove_enabled'),
         is_force_stop_jobs=pulumi.get(__ret__, 'is_force_stop_jobs'),
         is_high_availability=pulumi.get(__ret__, 'is_high_availability'),
         is_kafka_configured=pulumi.get(__ret__, 'is_kafka_configured'),
@@ -528,8 +487,6 @@ def get_bds_instance(bds_instance_id: Optional[str] = None,
         number_of_nodes=pulumi.get(__ret__, 'number_of_nodes'),
         number_of_nodes_requiring_maintenance_reboot=pulumi.get(__ret__, 'number_of_nodes_requiring_maintenance_reboot'),
         os_patch_version=pulumi.get(__ret__, 'os_patch_version'),
-        remove_node=pulumi.get(__ret__, 'remove_node'),
-        start_cluster_shape_configs=pulumi.get(__ret__, 'start_cluster_shape_configs'),
         state=pulumi.get(__ret__, 'state'),
         time_created=pulumi.get(__ret__, 'time_created'),
         time_updated=pulumi.get(__ret__, 'time_updated'),
@@ -559,7 +516,6 @@ def get_bds_instance_output(bds_instance_id: Optional[pulumi.Input[str]] = None,
     opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('oci:BigDataService/getBdsInstance:getBdsInstance', __args__, opts=opts, typ=GetBdsInstanceResult)
     return __ret__.apply(lambda __response__: GetBdsInstanceResult(
-        bds_cluster_version_summaries=pulumi.get(__response__, 'bds_cluster_version_summaries'),
         bds_instance_id=pulumi.get(__response__, 'bds_instance_id'),
         bootstrap_script_url=pulumi.get(__response__, 'bootstrap_script_url'),
         cloud_sql_details=pulumi.get(__response__, 'cloud_sql_details'),
@@ -578,7 +534,6 @@ def get_bds_instance_output(bds_instance_id: Optional[pulumi.Input[str]] = None,
         id=pulumi.get(__response__, 'id'),
         ignore_existing_nodes_shapes=pulumi.get(__response__, 'ignore_existing_nodes_shapes'),
         is_cloud_sql_configured=pulumi.get(__response__, 'is_cloud_sql_configured'),
-        is_force_remove_enabled=pulumi.get(__response__, 'is_force_remove_enabled'),
         is_force_stop_jobs=pulumi.get(__response__, 'is_force_stop_jobs'),
         is_high_availability=pulumi.get(__response__, 'is_high_availability'),
         is_kafka_configured=pulumi.get(__response__, 'is_kafka_configured'),
@@ -592,8 +547,6 @@ def get_bds_instance_output(bds_instance_id: Optional[pulumi.Input[str]] = None,
         number_of_nodes=pulumi.get(__response__, 'number_of_nodes'),
         number_of_nodes_requiring_maintenance_reboot=pulumi.get(__response__, 'number_of_nodes_requiring_maintenance_reboot'),
         os_patch_version=pulumi.get(__response__, 'os_patch_version'),
-        remove_node=pulumi.get(__response__, 'remove_node'),
-        start_cluster_shape_configs=pulumi.get(__response__, 'start_cluster_shape_configs'),
         state=pulumi.get(__response__, 'state'),
         time_created=pulumi.get(__response__, 'time_created'),
         time_updated=pulumi.get(__response__, 'time_updated'),

pulumi_oci/bigdataservice/get_bds_instance_api_key.py

@@ -26,7 +26,7 @@ class GetBdsInstanceApiKeyResult:
     """
     A collection of values returned by getBdsInstanceApiKey.
     """
-    def __init__(__self__, api_key_id=None, bds_instance_id=None, default_region=None, domain_ocid=None, fingerprint=None, id=None, key_alias=None, passphrase=None, pemfilepath=None, state=None, tenant_id=None, time_created=None, user_id=None):
+    def __init__(__self__, api_key_id=None, bds_instance_id=None, default_region=None, fingerprint=None, id=None, key_alias=None, passphrase=None, pemfilepath=None, state=None, tenant_id=None, time_created=None, user_id=None):
         if api_key_id and not isinstance(api_key_id, str):
             raise TypeError("Expected argument 'api_key_id' to be a str")
         pulumi.set(__self__, "api_key_id", api_key_id)
@@ -36,9 +36,6 @@ class GetBdsInstanceApiKeyResult:
         if default_region and not isinstance(default_region, str):
             raise TypeError("Expected argument 'default_region' to be a str")
         pulumi.set(__self__, "default_region", default_region)
-        if domain_ocid and not isinstance(domain_ocid, str):
-            raise TypeError("Expected argument 'domain_ocid' to be a str")
-        pulumi.set(__self__, "domain_ocid", domain_ocid)
         if fingerprint and not isinstance(fingerprint, str):
             raise TypeError("Expected argument 'fingerprint' to be a str")
         pulumi.set(__self__, "fingerprint", fingerprint)
@@ -82,19 +79,9 @@ class GetBdsInstanceApiKeyResult:
     def default_region(self) -> str:
         """
         The name of the region to establish the Object Storage endpoint which was set as part of key creation operation. If no region was provided this will be set to be the same region where the cluster lives. Example us-phoenix-1 .
-        >>>>>>> theirs
         """
         return pulumi.get(self, "default_region")
 
-    @property
-    @pulumi.getter(name="domainOcid")
-    def domain_ocid(self) -> str:
-        """
-        Identity domain OCID ,where user is present. For default domain ,this field will be optional.
-        =======
-        """
-        return pulumi.get(self, "domain_ocid")
-
     @property
     @pulumi.getter
     def fingerprint(self) -> str:
@@ -174,7 +161,6 @@ class AwaitableGetBdsInstanceApiKeyResult(GetBdsInstanceApiKeyResult):
             api_key_id=self.api_key_id,
             bds_instance_id=self.bds_instance_id,
             default_region=self.default_region,
-            domain_ocid=self.domain_ocid,
             fingerprint=self.fingerprint,
             id=self.id,
             key_alias=self.key_alias,
@@ -218,7 +204,6 @@ def get_bds_instance_api_key(api_key_id: Optional[str] = None,
         api_key_id=pulumi.get(__ret__, 'api_key_id'),
         bds_instance_id=pulumi.get(__ret__, 'bds_instance_id'),
         default_region=pulumi.get(__ret__, 'default_region'),
-        domain_ocid=pulumi.get(__ret__, 'domain_ocid'),
         fingerprint=pulumi.get(__ret__, 'fingerprint'),
         id=pulumi.get(__ret__, 'id'),
         key_alias=pulumi.get(__ret__, 'key_alias'),
@@ -259,7 +244,6 @@ def get_bds_instance_api_key_output(api_key_id: Optional[pulumi.Input[str]] = No
         api_key_id=pulumi.get(__response__, 'api_key_id'),
         bds_instance_id=pulumi.get(__response__, 'bds_instance_id'),
         default_region=pulumi.get(__response__, 'default_region'),
-        domain_ocid=pulumi.get(__response__, 'domain_ocid'),
         fingerprint=pulumi.get(__response__, 'fingerprint'),
         id=pulumi.get(__response__, 'id'),
         key_alias=pulumi.get(__response__, 'key_alias'),

pulumi_oci/bigdataservice/get_bds_instance_api_keys.py

@@ -54,9 +54,6 @@ class GetBdsInstanceApiKeysResult:
     @property
     @pulumi.getter(name="bdsApiKeys")
     def bds_api_keys(self) -> Sequence['outputs.GetBdsInstanceApiKeysBdsApiKeyResult']:
-        """
-        The list of bds_api_keys.
-        """
         return pulumi.get(self, "bds_api_keys")
 
     @property