pulumi-oci 2.21.0a1736852431__py3-none-any.whl → 2.22.0__py3-none-any.whl

pulumi_oci/__init__.py

@@ -1236,6 +1236,14 @@ _utilities.register(
    "oci:Core/bootVolumeBackup:BootVolumeBackup": "BootVolumeBackup"
   }
  },
+ {
+  "pkg": "oci",
+  "mod": "Core/byoasn",
+  "fqn": "pulumi_oci.core",
+  "classes": {
+   "oci:Core/byoasn:Byoasn": "Byoasn"
+  }
+ },
  {
   "pkg": "oci",
   "mod": "Core/captureFilter",

pulumi_oci/bigdataservice/bds_instance_api_key.py

@@ -28,9 +28,7 @@ class BdsInstanceApiKeyArgs:
         """
         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.
                
@@ -54,7 +52,6 @@ class BdsInstanceApiKeyArgs:
     def bds_instance_id(self) -> pulumi.Input[str]:
         """
         The OCID of the cluster.
-        <<<<<<< ours
         """
         return pulumi.get(self, "bds_instance_id")
 
@@ -67,7 +64,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")
 
@@ -145,12 +141,10 @@ 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.
@@ -190,7 +184,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")
 
@@ -239,7 +232,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")
 
@@ -367,11 +359,9 @@ 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.
                
@@ -493,12 +483,10 @@ 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.
@@ -532,7 +520,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")
 
@@ -565,7 +552,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/get_bds_instance_api_key.py

@@ -82,7 +82,6 @@ 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")
 
@@ -91,7 +90,6 @@ class GetBdsInstanceApiKeyResult:
     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")
 

pulumi_oci/bigdataservice/outputs.py

@@ -5396,9 +5396,7 @@ class GetBdsInstanceApiKeysBdsApiKeyResult(dict):
         """
         :param str bds_instance_id: The OCID of the cluster.
         :param str default_region: 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
         :param str domain_ocid: Identity domain OCID ,where user is present. For default domain ,this field will be optional.
-               =======
         :param str fingerprint: The fingerprint that corresponds to the public API key requested.
         :param str id: Identifier of the user's API key.
         :param str key_alias: User friendly identifier used to uniquely differentiate between different API keys. Only ASCII alphanumeric characters with no spaces allowed.
@@ -5434,7 +5432,6 @@ class GetBdsInstanceApiKeysBdsApiKeyResult(dict):
     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")
 
@@ -5443,7 +5440,6 @@ class GetBdsInstanceApiKeysBdsApiKeyResult(dict):
     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")
 

pulumi_oci/core/__init__.py

@@ -9,6 +9,7 @@ from .app_catalog_listing_resource_version_agreement import *
 from .app_catalog_subscription import *
 from .boot_volume import *
 from .boot_volume_backup import *
+from .byoasn import *
 from .capture_filter import *
 from .cluster_network import *
 from .compute_capacity_report import *
@@ -47,6 +48,8 @@ from .get_boot_volume_backups import *
 from .get_boot_volume_replica import *
 from .get_boot_volume_replicas import *
 from .get_boot_volumes import *
+from .get_byoasn import *
+from .get_byoasns import *
 from .get_byoip_allocated_ranges import *
 from .get_byoip_range import *
 from .get_byoip_ranges import *