pulumi-oci 2.26.0a1741847591__py3-none-any.whl → 2.27.0a1742000109__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (135) hide show
  1. pulumi_oci/__init__.py +67 -0
  2. pulumi_oci/containerengine/_inputs.py +34 -35
  3. pulumi_oci/containerengine/cluster.py +2 -0
  4. pulumi_oci/containerengine/container_instance.py +2 -4
  5. pulumi_oci/containerengine/outputs.py +110 -21
  6. pulumi_oci/containerinstances/outputs.py +0 -14
  7. pulumi_oci/core/_inputs.py +21 -33
  8. pulumi_oci/core/outputs.py +13 -21
  9. pulumi_oci/database/__init__.py +1 -0
  10. pulumi_oci/database/_inputs.py +704 -0
  11. pulumi_oci/database/application_vip.py +59 -10
  12. pulumi_oci/database/autonomous_database.py +7 -28
  13. pulumi_oci/database/backup.py +153 -5
  14. pulumi_oci/database/cloud_exadata_infrastructure.py +126 -0
  15. pulumi_oci/database/cloud_vm_cluster.py +163 -30
  16. pulumi_oci/database/db_node.py +64 -8
  17. pulumi_oci/database/exadata_infrastructure.py +157 -3
  18. pulumi_oci/database/exadata_infrastructure_configure_exascale_management.py +1615 -0
  19. pulumi_oci/database/exadb_vm_cluster.py +84 -7
  20. pulumi_oci/database/exascale_db_storage_vault.py +147 -0
  21. pulumi_oci/database/external_container_database.py +4 -4
  22. pulumi_oci/database/external_non_container_database.py +4 -4
  23. pulumi_oci/database/external_pluggable_database.py +4 -4
  24. pulumi_oci/database/get_application_vip.py +16 -2
  25. pulumi_oci/database/get_autonomous_database.py +0 -3
  26. pulumi_oci/database/get_backups.py +136 -10
  27. pulumi_oci/database/get_cloud_exadata_infrastructure.py +43 -1
  28. pulumi_oci/database/get_cloud_vm_cluster.py +59 -3
  29. pulumi_oci/database/get_cloud_vm_clusters.py +28 -6
  30. pulumi_oci/database/get_database_software_images.py +20 -1
  31. pulumi_oci/database/get_db_node.py +31 -4
  32. pulumi_oci/database/get_db_server.py +15 -1
  33. pulumi_oci/database/get_exadata_infrastructure.py +57 -1
  34. pulumi_oci/database/get_exadb_vm_cluster.py +29 -1
  35. pulumi_oci/database/get_exadb_vm_clusters.py +25 -3
  36. pulumi_oci/database/get_exascale_db_storage_vault.py +43 -1
  37. pulumi_oci/database/get_exascale_db_storage_vaults.py +47 -3
  38. pulumi_oci/database/get_external_container_database.py +1 -1
  39. pulumi_oci/database/get_external_non_container_database.py +1 -1
  40. pulumi_oci/database/get_external_pluggable_database.py +1 -1
  41. pulumi_oci/database/get_flex_components.py +28 -6
  42. pulumi_oci/database/get_vm_cluster.py +60 -4
  43. pulumi_oci/database/get_vm_clusters.py +25 -3
  44. pulumi_oci/database/outputs.py +1084 -42
  45. pulumi_oci/database/pluggable_database.py +13 -13
  46. pulumi_oci/database/vm_cluster.py +172 -18
  47. pulumi_oci/database/vm_cluster_add_virtual_network.py +114 -2
  48. pulumi_oci/database/vm_cluster_remove_virtual_machine.py +114 -2
  49. pulumi_oci/datasafe/__init__.py +7 -0
  50. pulumi_oci/datasafe/_inputs.py +301 -0
  51. pulumi_oci/datasafe/discovery_mod.py +49 -0
  52. pulumi_oci/datasafe/get_discovery_job.py +15 -1
  53. pulumi_oci/datasafe/get_masking_report.py +46 -4
  54. pulumi_oci/datasafe/get_masking_report_masking_errors.py +166 -0
  55. pulumi_oci/datasafe/get_security_assessment_finding.py +31 -1
  56. pulumi_oci/datasafe/get_security_assessment_findings.py +43 -3
  57. pulumi_oci/datasafe/get_sensitive_column_analytics.py +370 -0
  58. pulumi_oci/datasafe/get_sensitive_data_model.py +15 -1
  59. pulumi_oci/datasafe/get_sensitive_type_group.py +253 -0
  60. pulumi_oci/datasafe/get_sensitive_type_group_grouped_sensitive_types.py +166 -0
  61. pulumi_oci/datasafe/get_sensitive_type_groups.py +294 -0
  62. pulumi_oci/datasafe/outputs.py +676 -3
  63. pulumi_oci/datasafe/sensitive_data_model.py +49 -0
  64. pulumi_oci/datasafe/sensitive_type_group.py +563 -0
  65. pulumi_oci/datasafe/sensitive_type_group_grouped_sensitive_type.py +287 -0
  66. pulumi_oci/datascience/__init__.py +4 -0
  67. pulumi_oci/datascience/_inputs.py +1160 -41
  68. pulumi_oci/datascience/get_model.py +29 -1
  69. pulumi_oci/datascience/get_model_custom_metadata_artifact_content.py +151 -0
  70. pulumi_oci/datascience/get_model_defined_metadata_artifact_content.py +151 -0
  71. pulumi_oci/datascience/get_model_version_set.py +15 -1
  72. pulumi_oci/datascience/get_model_version_sets.py +25 -3
  73. pulumi_oci/datascience/get_models.py +25 -3
  74. pulumi_oci/datascience/get_pipeline.py +15 -1
  75. pulumi_oci/datascience/model.py +64 -0
  76. pulumi_oci/datascience/model_custom_metadata_artifact.py +418 -0
  77. pulumi_oci/datascience/model_defined_metadata_artifact.py +418 -0
  78. pulumi_oci/datascience/model_version_set.py +28 -0
  79. pulumi_oci/datascience/outputs.py +4343 -2164
  80. pulumi_oci/datascience/pipeline.py +48 -141
  81. pulumi_oci/datascience/pipeline_run.py +32 -0
  82. pulumi_oci/dblm/__init__.py +17 -0
  83. pulumi_oci/dblm/_inputs.py +275 -0
  84. pulumi_oci/dblm/get_vulnerability.py +242 -0
  85. pulumi_oci/dblm/get_vulnerability_aggregated_vulnerability_data.py +220 -0
  86. pulumi_oci/dblm/get_vulnerability_notifications.py +144 -0
  87. pulumi_oci/dblm/get_vulnerability_resources.py +258 -0
  88. pulumi_oci/dblm/get_vulnerability_scan.py +267 -0
  89. pulumi_oci/dblm/get_vulnerability_scans.py +270 -0
  90. pulumi_oci/dblm/get_vulnerability_vulnerabilities.py +258 -0
  91. pulumi_oci/dblm/outputs.py +1294 -0
  92. pulumi_oci/dblm/vulnerability_scan.py +521 -0
  93. pulumi_oci/email/dkim.py +120 -20
  94. pulumi_oci/email/get_dkim.py +40 -1
  95. pulumi_oci/email/outputs.py +29 -0
  96. pulumi_oci/filestorage/__init__.py +3 -0
  97. pulumi_oci/filestorage/_inputs.py +49 -0
  98. pulumi_oci/filestorage/file_system.py +105 -0
  99. pulumi_oci/filestorage/file_system_quota_rule.py +593 -0
  100. pulumi_oci/filestorage/get_file_system_quota_rule.py +248 -0
  101. pulumi_oci/filestorage/get_file_system_quota_rules.py +210 -0
  102. pulumi_oci/filestorage/outputs.py +186 -0
  103. pulumi_oci/mysql/_inputs.py +1239 -10
  104. pulumi_oci/mysql/channel.py +28 -0
  105. pulumi_oci/mysql/get_channel.py +15 -1
  106. pulumi_oci/mysql/get_mysql_backup.py +15 -1
  107. pulumi_oci/mysql/get_mysql_configuration.py +15 -1
  108. pulumi_oci/mysql/get_mysql_db_system.py +15 -1
  109. pulumi_oci/mysql/mysql_backup.py +28 -0
  110. pulumi_oci/mysql/mysql_configuration.py +106 -0
  111. pulumi_oci/mysql/mysql_db_system.py +36 -0
  112. pulumi_oci/mysql/outputs.py +2008 -35
  113. pulumi_oci/opensearch/__init__.py +3 -0
  114. pulumi_oci/opensearch/_inputs.py +101 -0
  115. pulumi_oci/opensearch/cluster.py +76 -29
  116. pulumi_oci/opensearch/get_opensearch_cluster.py +12 -1
  117. pulumi_oci/opensearch/get_opensearch_cluster_pipeline.py +433 -0
  118. pulumi_oci/opensearch/get_opensearch_cluster_pipelines.py +218 -0
  119. pulumi_oci/opensearch/opensearch_cluster_pipeline.py +1172 -0
  120. pulumi_oci/opensearch/outputs.py +425 -0
  121. pulumi_oci/psql/_inputs.py +258 -0
  122. pulumi_oci/psql/backup.py +129 -28
  123. pulumi_oci/psql/db_system.py +10 -0
  124. pulumi_oci/psql/get_backup.py +47 -2
  125. pulumi_oci/psql/get_backups.py +3 -0
  126. pulumi_oci/psql/get_configurations.py +23 -1
  127. pulumi_oci/psql/get_db_system.py +1 -1
  128. pulumi_oci/psql/get_db_systems.py +1 -1
  129. pulumi_oci/psql/outputs.py +541 -5
  130. pulumi_oci/pulumi-plugin.json +1 -1
  131. pulumi_oci/redis/redis_cluster.py +7 -7
  132. {pulumi_oci-2.26.0a1741847591.dist-info → pulumi_oci-2.27.0a1742000109.dist-info}/METADATA +1 -1
  133. {pulumi_oci-2.26.0a1741847591.dist-info → pulumi_oci-2.27.0a1742000109.dist-info}/RECORD +135 -106
  134. {pulumi_oci-2.26.0a1741847591.dist-info → pulumi_oci-2.27.0a1742000109.dist-info}/WHEEL +0 -0
  135. {pulumi_oci-2.26.0a1741847591.dist-info → pulumi_oci-2.27.0a1742000109.dist-info}/top_level.txt +0 -0
pulumi_oci/database/application_vip.py CHANGED
@@ -23,7 +23,8 @@ class ApplicationVipArgs:
23
23
  hostname_label: pulumi.Input[str],
24
24
  subnet_id: pulumi.Input[str],
25
25
  db_node_id: Optional[pulumi.Input[str]] = None,
26
- ip_address: Optional[pulumi.Input[str]] = None):
26
+ ip_address: Optional[pulumi.Input[str]] = None,
27
+ ipv6address: Optional[pulumi.Input[str]] = None):
27
28
  """
28
29
  The set of arguments for constructing a ApplicationVip resource.
29
30
  :param pulumi.Input[str] cloud_vm_cluster_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the cloud VM cluster associated with the application virtual IP (VIP) address.
@@ -34,7 +35,8 @@ class ApplicationVipArgs:
34
35
  ** IMPORTANT **
35
36
  Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values
36
37
  :param pulumi.Input[str] db_node_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the DB node associated with the application virtual IP (VIP) address.
37
- :param pulumi.Input[str] ip_address: The application virtual IP (VIP) address.
38
+ :param pulumi.Input[str] ip_address: The application virtual IP (VIP) IPv4 address.
39
+ :param pulumi.Input[str] ipv6address: The application virtual IP (VIP) IPv6 address.
38
40
  """
39
41
  pulumi.set(__self__, "cloud_vm_cluster_id", cloud_vm_cluster_id)
40
42
  pulumi.set(__self__, "hostname_label", hostname_label)
@@ -43,6 +45,8 @@ class ApplicationVipArgs:
43
45
  pulumi.set(__self__, "db_node_id", db_node_id)
44
46
  if ip_address is not None:
45
47
  pulumi.set(__self__, "ip_address", ip_address)
48
+ if ipv6address is not None:
49
+ pulumi.set(__self__, "ipv6address", ipv6address)
46
50
 
47
51
  @property
48
52
  @pulumi.getter(name="cloudVmClusterId")
@@ -100,7 +104,7 @@ class ApplicationVipArgs:
100
104
  @pulumi.getter(name="ipAddress")
101
105
  def ip_address(self) -> Optional[pulumi.Input[str]]:
102
106
  """
103
- The application virtual IP (VIP) address.
107
+ The application virtual IP (VIP) IPv4 address.
104
108
  """
105
109
  return pulumi.get(self, "ip_address")
106
110
 
@@ -108,6 +112,18 @@ class ApplicationVipArgs:
108
112
  def ip_address(self, value: Optional[pulumi.Input[str]]):
109
113
  pulumi.set(self, "ip_address", value)
110
114
 
115
+ @property
116
+ @pulumi.getter
117
+ def ipv6address(self) -> Optional[pulumi.Input[str]]:
118
+ """
119
+ The application virtual IP (VIP) IPv6 address.
120
+ """
121
+ return pulumi.get(self, "ipv6address")
122
+
123
+ @ipv6address.setter
124
+ def ipv6address(self, value: Optional[pulumi.Input[str]]):
125
+ pulumi.set(self, "ipv6address", value)
126
+
111
127
 
112
128
  @pulumi.input_type
113
129
  class _ApplicationVipState:
@@ -119,6 +135,7 @@ class _ApplicationVipState:
119
135
  freeform_tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
120
136
  hostname_label: Optional[pulumi.Input[str]] = None,
121
137
  ip_address: Optional[pulumi.Input[str]] = None,
138
+ ipv6address: Optional[pulumi.Input[str]] = None,
122
139
  lifecycle_details: Optional[pulumi.Input[str]] = None,
123
140
  state: Optional[pulumi.Input[str]] = None,
124
141
  subnet_id: Optional[pulumi.Input[str]] = None,
@@ -131,7 +148,8 @@ class _ApplicationVipState:
131
148
  :param pulumi.Input[Mapping[str, pulumi.Input[str]]] defined_tags: 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).
132
149
  :param pulumi.Input[Mapping[str, pulumi.Input[str]]] freeform_tags: 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"}`
133
150
  :param pulumi.Input[str] hostname_label: The hostname of the application virtual IP (VIP) address.
134
- :param pulumi.Input[str] ip_address: The application virtual IP (VIP) address.
151
+ :param pulumi.Input[str] ip_address: The application virtual IP (VIP) IPv4 address.
152
+ :param pulumi.Input[str] ipv6address: The application virtual IP (VIP) IPv6 address.
135
153
  :param pulumi.Input[str] lifecycle_details: Additional information about the current lifecycle state of the application virtual IP (VIP) address.
136
154
  :param pulumi.Input[str] state: The current lifecycle state of the application virtual IP (VIP) address.
137
155
  :param pulumi.Input[str] subnet_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the subnet associated with the application virtual IP (VIP) address.
@@ -155,6 +173,8 @@ class _ApplicationVipState:
155
173
  pulumi.set(__self__, "hostname_label", hostname_label)
156
174
  if ip_address is not None:
157
175
  pulumi.set(__self__, "ip_address", ip_address)
176
+ if ipv6address is not None:
177
+ pulumi.set(__self__, "ipv6address", ipv6address)
158
178
  if lifecycle_details is not None:
159
179
  pulumi.set(__self__, "lifecycle_details", lifecycle_details)
160
180
  if state is not None:
@@ -240,7 +260,7 @@ class _ApplicationVipState:
240
260
  @pulumi.getter(name="ipAddress")
241
261
  def ip_address(self) -> Optional[pulumi.Input[str]]:
242
262
  """
243
- The application virtual IP (VIP) address.
263
+ The application virtual IP (VIP) IPv4 address.
244
264
  """
245
265
  return pulumi.get(self, "ip_address")
246
266
 
@@ -248,6 +268,18 @@ class _ApplicationVipState:
248
268
  def ip_address(self, value: Optional[pulumi.Input[str]]):
249
269
  pulumi.set(self, "ip_address", value)
250
270
 
271
+ @property
272
+ @pulumi.getter
273
+ def ipv6address(self) -> Optional[pulumi.Input[str]]:
274
+ """
275
+ The application virtual IP (VIP) IPv6 address.
276
+ """
277
+ return pulumi.get(self, "ipv6address")
278
+
279
+ @ipv6address.setter
280
+ def ipv6address(self, value: Optional[pulumi.Input[str]]):
281
+ pulumi.set(self, "ipv6address", value)
282
+
251
283
  @property
252
284
  @pulumi.getter(name="lifecycleDetails")
253
285
  def lifecycle_details(self) -> Optional[pulumi.Input[str]]:
@@ -310,6 +342,7 @@ class ApplicationVip(pulumi.CustomResource):
310
342
  db_node_id: Optional[pulumi.Input[str]] = None,
311
343
  hostname_label: Optional[pulumi.Input[str]] = None,
312
344
  ip_address: Optional[pulumi.Input[str]] = None,
345
+ ipv6address: Optional[pulumi.Input[str]] = None,
313
346
  subnet_id: Optional[pulumi.Input[str]] = None,
314
347
  __props__=None):
315
348
  """
@@ -328,7 +361,8 @@ class ApplicationVip(pulumi.CustomResource):
328
361
  hostname_label=application_vip_hostname_label,
329
362
  subnet_id=test_subnet["id"],
330
363
  db_node_id=test_db_node["id"],
331
- ip_address=application_vip_ip_address)
364
+ ip_address=application_vip_ip_address,
365
+ ipv6address=application_vip_ipv6address)
332
366
  ```
333
367
 
334
368
  ## Import
@@ -344,7 +378,8 @@ class ApplicationVip(pulumi.CustomResource):
344
378
  :param pulumi.Input[str] cloud_vm_cluster_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the cloud VM cluster associated with the application virtual IP (VIP) address.
345
379
  :param pulumi.Input[str] db_node_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the DB node associated with the application virtual IP (VIP) address.
346
380
  :param pulumi.Input[str] hostname_label: The hostname of the application virtual IP (VIP) address.
347
- :param pulumi.Input[str] ip_address: The application virtual IP (VIP) address.
381
+ :param pulumi.Input[str] ip_address: The application virtual IP (VIP) IPv4 address.
382
+ :param pulumi.Input[str] ipv6address: The application virtual IP (VIP) IPv6 address.
348
383
  :param pulumi.Input[str] subnet_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the subnet associated with the application virtual IP (VIP) address.
349
384
 
350
385
 
@@ -373,7 +408,8 @@ class ApplicationVip(pulumi.CustomResource):
373
408
  hostname_label=application_vip_hostname_label,
374
409
  subnet_id=test_subnet["id"],
375
410
  db_node_id=test_db_node["id"],
376
- ip_address=application_vip_ip_address)
411
+ ip_address=application_vip_ip_address,
412
+ ipv6address=application_vip_ipv6address)
377
413
  ```
378
414
 
379
415
  ## Import
@@ -403,6 +439,7 @@ class ApplicationVip(pulumi.CustomResource):
403
439
  db_node_id: Optional[pulumi.Input[str]] = None,
404
440
  hostname_label: Optional[pulumi.Input[str]] = None,
405
441
  ip_address: Optional[pulumi.Input[str]] = None,
442
+ ipv6address: Optional[pulumi.Input[str]] = None,
406
443
  subnet_id: Optional[pulumi.Input[str]] = None,
407
444
  __props__=None):
408
445
  opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
@@ -421,6 +458,7 @@ class ApplicationVip(pulumi.CustomResource):
421
458
  raise TypeError("Missing required property 'hostname_label'")
422
459
  __props__.__dict__["hostname_label"] = hostname_label
423
460
  __props__.__dict__["ip_address"] = ip_address
461
+ __props__.__dict__["ipv6address"] = ipv6address
424
462
  if subnet_id is None and not opts.urn:
425
463
  raise TypeError("Missing required property 'subnet_id'")
426
464
  __props__.__dict__["subnet_id"] = subnet_id
@@ -447,6 +485,7 @@ class ApplicationVip(pulumi.CustomResource):
447
485
  freeform_tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
448
486
  hostname_label: Optional[pulumi.Input[str]] = None,
449
487
  ip_address: Optional[pulumi.Input[str]] = None,
488
+ ipv6address: Optional[pulumi.Input[str]] = None,
450
489
  lifecycle_details: Optional[pulumi.Input[str]] = None,
451
490
  state: Optional[pulumi.Input[str]] = None,
452
491
  subnet_id: Optional[pulumi.Input[str]] = None,
@@ -464,7 +503,8 @@ class ApplicationVip(pulumi.CustomResource):
464
503
  :param pulumi.Input[Mapping[str, pulumi.Input[str]]] defined_tags: 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).
465
504
  :param pulumi.Input[Mapping[str, pulumi.Input[str]]] freeform_tags: 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"}`
466
505
  :param pulumi.Input[str] hostname_label: The hostname of the application virtual IP (VIP) address.
467
- :param pulumi.Input[str] ip_address: The application virtual IP (VIP) address.
506
+ :param pulumi.Input[str] ip_address: The application virtual IP (VIP) IPv4 address.
507
+ :param pulumi.Input[str] ipv6address: The application virtual IP (VIP) IPv6 address.
468
508
  :param pulumi.Input[str] lifecycle_details: Additional information about the current lifecycle state of the application virtual IP (VIP) address.
469
509
  :param pulumi.Input[str] state: The current lifecycle state of the application virtual IP (VIP) address.
470
510
  :param pulumi.Input[str] subnet_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the subnet associated with the application virtual IP (VIP) address.
@@ -485,6 +525,7 @@ class ApplicationVip(pulumi.CustomResource):
485
525
  __props__.__dict__["freeform_tags"] = freeform_tags
486
526
  __props__.__dict__["hostname_label"] = hostname_label
487
527
  __props__.__dict__["ip_address"] = ip_address
528
+ __props__.__dict__["ipv6address"] = ipv6address
488
529
  __props__.__dict__["lifecycle_details"] = lifecycle_details
489
530
  __props__.__dict__["state"] = state
490
531
  __props__.__dict__["subnet_id"] = subnet_id
@@ -543,10 +584,18 @@ class ApplicationVip(pulumi.CustomResource):
543
584
  @pulumi.getter(name="ipAddress")
544
585
  def ip_address(self) -> pulumi.Output[str]:
545
586
  """
546
- The application virtual IP (VIP) address.
587
+ The application virtual IP (VIP) IPv4 address.
547
588
  """
548
589
  return pulumi.get(self, "ip_address")
549
590
 
591
+ @property
592
+ @pulumi.getter
593
+ def ipv6address(self) -> pulumi.Output[str]:
594
+ """
595
+ The application virtual IP (VIP) IPv6 address.
596
+ """
597
+ return pulumi.get(self, "ipv6address")
598
+
550
599
  @property
551
600
  @pulumi.getter(name="lifecycleDetails")
552
601
  def lifecycle_details(self) -> pulumi.Output[str]:
pulumi_oci/database/autonomous_database.py CHANGED
@@ -122,13 +122,10 @@ class AutonomousDatabaseArgs:
122
122
  :param pulumi.Input[int] backup_retention_period_in_days: (Updatable) Retention period, in days, for backups.
123
123
  :param pulumi.Input[str] character_set: The character set for the autonomous database. The default is AL32UTF8. Allowed values for an Autonomous Database on Serverless infrastructure as returned by [List Autonomous Database Character Sets](https://www.terraform.io/autonomousDatabaseCharacterSets)
124
124
 
125
- For an Autonomous Database on dedicated infrastructure, the allowed values are:
126
-
127
- <<<<<<< ours
125
+ For an Autonomous Database on dedicated infrastructure, the allowed values are
128
126
  AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSC5601, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P1, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS
129
127
  :param pulumi.Input[Sequence[pulumi.Input[int]]] clone_table_space_lists: A list of the source Autonomous Database's table space number(s) used to create this partial clone from the backup.
130
128
  :param pulumi.Input[str] clone_type: The Autonomous Database clone type. This parameter is not used to create a refreshable clone type, and for refreshable clones one must use the (source=CLONE_TO_REFRESHABLE) parameter.
131
- >>>>>>> theirs
132
129
  * `FULL` - This option creates a new database that includes all source database data.
133
130
  * `METADATA` - This option creates a new database that includes the source database schema and select metadata, but not the source database data.
134
131
  :param pulumi.Input[float] compute_count: (Updatable) The compute amount available to the database. Minimum and maximum values depend on the compute model and whether the database is an Autonomous Database Serverless instance or an Autonomous Database on Dedicated Exadata Infrastructure. For an Autonomous Database Serverless instance, the 'ECPU' compute model requires a minimum value of one, for databases in the elastic resource pool and minimum value of two, otherwise. Required when using the `computeModel` parameter. When using `cpuCoreCount` parameter, it is an error to specify computeCount to a non-null value. Providing `computeModel` and `computeCount` is the preferred method for both OCPU and ECPU.
@@ -595,9 +592,7 @@ class AutonomousDatabaseArgs:
595
592
  """
596
593
  The character set for the autonomous database. The default is AL32UTF8. Allowed values for an Autonomous Database on Serverless infrastructure as returned by [List Autonomous Database Character Sets](https://www.terraform.io/autonomousDatabaseCharacterSets)
597
594
 
598
- For an Autonomous Database on dedicated infrastructure, the allowed values are:
599
-
600
- <<<<<<< ours
595
+ For an Autonomous Database on dedicated infrastructure, the allowed values are
601
596
  AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSC5601, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P1, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS
602
597
  """
603
598
  return pulumi.get(self, "character_set")
@@ -623,7 +618,6 @@ class AutonomousDatabaseArgs:
623
618
  def clone_type(self) -> Optional[pulumi.Input[str]]:
624
619
  """
625
620
  The Autonomous Database clone type. This parameter is not used to create a refreshable clone type, and for refreshable clones one must use the (source=CLONE_TO_REFRESHABLE) parameter.
626
- >>>>>>> theirs
627
621
  * `FULL` - This option creates a new database that includes all source database data.
628
622
  * `METADATA` - This option creates a new database that includes the source database schema and select metadata, but not the source database data.
629
623
  """
@@ -1725,13 +1719,10 @@ class _AutonomousDatabaseState:
1725
1719
  :param pulumi.Input[int] backup_retention_period_in_days: (Updatable) Retention period, in days, for backups.
1726
1720
  :param pulumi.Input[str] character_set: The character set for the autonomous database. The default is AL32UTF8. Allowed values for an Autonomous Database on Serverless infrastructure as returned by [List Autonomous Database Character Sets](https://www.terraform.io/autonomousDatabaseCharacterSets)
1727
1721
 
1728
- For an Autonomous Database on dedicated infrastructure, the allowed values are:
1729
-
1730
- <<<<<<< ours
1722
+ For an Autonomous Database on dedicated infrastructure, the allowed values are
1731
1723
  AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSC5601, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P1, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS
1732
1724
  :param pulumi.Input[Sequence[pulumi.Input[int]]] clone_table_space_lists: A list of the source Autonomous Database's table space number(s) used to create this partial clone from the backup.
1733
1725
  :param pulumi.Input[str] clone_type: The Autonomous Database clone type. This parameter is not used to create a refreshable clone type, and for refreshable clones one must use the (source=CLONE_TO_REFRESHABLE) parameter.
1734
- >>>>>>> theirs
1735
1726
  * `FULL` - This option creates a new database that includes all source database data.
1736
1727
  * `METADATA` - This option creates a new database that includes the source database schema and select metadata, but not the source database data.
1737
1728
  :param pulumi.Input[str] cluster_placement_group_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the cluster placement group of the Autonomous Serverless Database.
@@ -2425,9 +2416,7 @@ class _AutonomousDatabaseState:
2425
2416
  """
2426
2417
  The character set for the autonomous database. The default is AL32UTF8. Allowed values for an Autonomous Database on Serverless infrastructure as returned by [List Autonomous Database Character Sets](https://www.terraform.io/autonomousDatabaseCharacterSets)
2427
2418
 
2428
- For an Autonomous Database on dedicated infrastructure, the allowed values are:
2429
-
2430
- <<<<<<< ours
2419
+ For an Autonomous Database on dedicated infrastructure, the allowed values are
2431
2420
  AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSC5601, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P1, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS
2432
2421
  """
2433
2422
  return pulumi.get(self, "character_set")
@@ -2453,7 +2442,6 @@ class _AutonomousDatabaseState:
2453
2442
  def clone_type(self) -> Optional[pulumi.Input[str]]:
2454
2443
  """
2455
2444
  The Autonomous Database clone type. This parameter is not used to create a refreshable clone type, and for refreshable clones one must use the (source=CLONE_TO_REFRESHABLE) parameter.
2456
- >>>>>>> theirs
2457
2445
  * `FULL` - This option creates a new database that includes all source database data.
2458
2446
  * `METADATA` - This option creates a new database that includes the source database schema and select metadata, but not the source database data.
2459
2447
  """
@@ -4184,13 +4172,10 @@ class AutonomousDatabase(pulumi.CustomResource):
4184
4172
  :param pulumi.Input[int] backup_retention_period_in_days: (Updatable) Retention period, in days, for backups.
4185
4173
  :param pulumi.Input[str] character_set: The character set for the autonomous database. The default is AL32UTF8. Allowed values for an Autonomous Database on Serverless infrastructure as returned by [List Autonomous Database Character Sets](https://www.terraform.io/autonomousDatabaseCharacterSets)
4186
4174
 
4187
- For an Autonomous Database on dedicated infrastructure, the allowed values are:
4188
-
4189
- <<<<<<< ours
4175
+ For an Autonomous Database on dedicated infrastructure, the allowed values are
4190
4176
  AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSC5601, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P1, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS
4191
4177
  :param pulumi.Input[Sequence[pulumi.Input[int]]] clone_table_space_lists: A list of the source Autonomous Database's table space number(s) used to create this partial clone from the backup.
4192
4178
  :param pulumi.Input[str] clone_type: The Autonomous Database clone type. This parameter is not used to create a refreshable clone type, and for refreshable clones one must use the (source=CLONE_TO_REFRESHABLE) parameter.
4193
- >>>>>>> theirs
4194
4179
  * `FULL` - This option creates a new database that includes all source database data.
4195
4180
  * `METADATA` - This option creates a new database that includes the source database schema and select metadata, but not the source database data.
4196
4181
  :param pulumi.Input[str] compartment_id: (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment of the Autonomous Database.
@@ -4803,13 +4788,10 @@ class AutonomousDatabase(pulumi.CustomResource):
4803
4788
  :param pulumi.Input[int] backup_retention_period_in_days: (Updatable) Retention period, in days, for backups.
4804
4789
  :param pulumi.Input[str] character_set: The character set for the autonomous database. The default is AL32UTF8. Allowed values for an Autonomous Database on Serverless infrastructure as returned by [List Autonomous Database Character Sets](https://www.terraform.io/autonomousDatabaseCharacterSets)
4805
4790
 
4806
- For an Autonomous Database on dedicated infrastructure, the allowed values are:
4807
-
4808
- <<<<<<< ours
4791
+ For an Autonomous Database on dedicated infrastructure, the allowed values are
4809
4792
  AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSC5601, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P1, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS
4810
4793
  :param pulumi.Input[Sequence[pulumi.Input[int]]] clone_table_space_lists: A list of the source Autonomous Database's table space number(s) used to create this partial clone from the backup.
4811
4794
  :param pulumi.Input[str] clone_type: The Autonomous Database clone type. This parameter is not used to create a refreshable clone type, and for refreshable clones one must use the (source=CLONE_TO_REFRESHABLE) parameter.
4812
- >>>>>>> theirs
4813
4795
  * `FULL` - This option creates a new database that includes all source database data.
4814
4796
  * `METADATA` - This option creates a new database that includes the source database schema and select metadata, but not the source database data.
4815
4797
  :param pulumi.Input[str] cluster_placement_group_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the cluster placement group of the Autonomous Serverless Database.
@@ -5294,9 +5276,7 @@ class AutonomousDatabase(pulumi.CustomResource):
5294
5276
  """
5295
5277
  The character set for the autonomous database. The default is AL32UTF8. Allowed values for an Autonomous Database on Serverless infrastructure as returned by [List Autonomous Database Character Sets](https://www.terraform.io/autonomousDatabaseCharacterSets)
5296
5278
 
5297
- For an Autonomous Database on dedicated infrastructure, the allowed values are:
5298
-
5299
- <<<<<<< ours
5279
+ For an Autonomous Database on dedicated infrastructure, the allowed values are
5300
5280
  AL32UTF8, AR8ADOS710, AR8ADOS720, AR8APTEC715, AR8ARABICMACS, AR8ASMO8X, AR8ISO8859P6, AR8MSWIN1256, AR8MUSSAD768, AR8NAFITHA711, AR8NAFITHA721, AR8SAKHR706, AR8SAKHR707, AZ8ISO8859P9E, BG8MSWIN, BG8PC437S, BLT8CP921, BLT8ISO8859P13, BLT8MSWIN1257, BLT8PC775, BN8BSCII, CDN8PC863, CEL8ISO8859P14, CL8ISO8859P5, CL8ISOIR111, CL8KOI8R, CL8KOI8U, CL8MACCYRILLICS, CL8MSWIN1251, EE8ISO8859P2, EE8MACCES, EE8MACCROATIANS, EE8MSWIN1250, EE8PC852, EL8DEC, EL8ISO8859P7, EL8MACGREEKS, EL8MSWIN1253, EL8PC437S, EL8PC851, EL8PC869, ET8MSWIN923, HU8ABMOD, HU8CWI2, IN8ISCII, IS8PC861, IW8ISO8859P8, IW8MACHEBREWS, IW8MSWIN1255, IW8PC1507, JA16EUC, JA16EUCTILDE, JA16SJIS, JA16SJISTILDE, JA16VMS, KO16KSC5601, KO16KSCCS, KO16MSWIN949, LA8ISO6937, LA8PASSPORT, LT8MSWIN921, LT8PC772, LT8PC774, LV8PC1117, LV8PC8LR, LV8RST104090, N8PC865, NE8ISO8859P10, NEE8ISO8859P4, RU8BESTA, RU8PC855, RU8PC866, SE8ISO8859P3, TH8MACTHAIS, TH8TISASCII, TR8DEC, TR8MACTURKISHS, TR8MSWIN1254, TR8PC857, US7ASCII, US8PC437, UTF8, VN8MSWIN1258, VN8VN3, WE8DEC, WE8DG, WE8ISO8859P1, WE8ISO8859P15, WE8ISO8859P9, WE8MACROMAN8S, WE8MSWIN1252, WE8NCR4970, WE8NEXTSTEP, WE8PC850, WE8PC858, WE8PC860, WE8ROMAN8, ZHS16CGB231280, ZHS16GBK, ZHT16BIG5, ZHT16CCDC, ZHT16DBT, ZHT16HKSCS, ZHT16MSWIN950, ZHT32EUC, ZHT32SOPS, ZHT32TRIS
5301
5281
  """
5302
5282
  return pulumi.get(self, "character_set")
@@ -5314,7 +5294,6 @@ class AutonomousDatabase(pulumi.CustomResource):
5314
5294
  def clone_type(self) -> pulumi.Output[str]:
5315
5295
  """
5316
5296
  The Autonomous Database clone type. This parameter is not used to create a refreshable clone type, and for refreshable clones one must use the (source=CLONE_TO_REFRESHABLE) parameter.
5317
- >>>>>>> theirs
5318
5297
  * `FULL` - This option creates a new database that includes all source database data.
5319
5298
  * `METADATA` - This option creates a new database that includes the source database schema and select metadata, but not the source database data.
5320
5299
  """