pulumi-oci 2.25.0a1740032973__py3-none-any.whl → 2.26.0__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 (218) hide show
  1. pulumi_oci/__init__.py +102 -0
  2. pulumi_oci/config/__init__.pyi +2 -0
  3. pulumi_oci/config/vars.py +4 -0
  4. pulumi_oci/containerengine/_inputs.py +74 -35
  5. pulumi_oci/containerengine/cluster.py +4 -0
  6. pulumi_oci/containerengine/container_instance.py +2 -4
  7. pulumi_oci/containerengine/outputs.py +180 -21
  8. pulumi_oci/containerinstances/outputs.py +0 -14
  9. pulumi_oci/core/_inputs.py +21 -33
  10. pulumi_oci/core/outputs.py +13 -21
  11. pulumi_oci/database/__init__.py +1 -0
  12. pulumi_oci/database/_inputs.py +1246 -57
  13. pulumi_oci/database/application_vip.py +59 -10
  14. pulumi_oci/database/autonomous_container_database.py +92 -0
  15. pulumi_oci/database/autonomous_database.py +90 -22
  16. pulumi_oci/database/backup.py +153 -5
  17. pulumi_oci/database/backup_destination.py +84 -0
  18. pulumi_oci/database/cloud_exadata_infrastructure.py +126 -0
  19. pulumi_oci/database/cloud_vm_cluster.py +163 -30
  20. pulumi_oci/database/data_guard_association.py +49 -0
  21. pulumi_oci/database/db_node.py +64 -8
  22. pulumi_oci/database/db_system.py +111 -8
  23. pulumi_oci/database/exadata_infrastructure.py +157 -3
  24. pulumi_oci/database/exadata_infrastructure_configure_exascale_management.py +1615 -0
  25. pulumi_oci/database/exadb_vm_cluster.py +84 -7
  26. pulumi_oci/database/exascale_db_storage_vault.py +147 -0
  27. pulumi_oci/database/external_container_database.py +4 -4
  28. pulumi_oci/database/external_non_container_database.py +4 -4
  29. pulumi_oci/database/external_pluggable_database.py +4 -4
  30. pulumi_oci/database/get_application_vip.py +16 -2
  31. pulumi_oci/database/get_autonomous_container_database.py +43 -1
  32. pulumi_oci/database/get_autonomous_database.py +29 -1
  33. pulumi_oci/database/get_autonomous_databases.py +0 -26
  34. pulumi_oci/database/get_backup_destination.py +43 -1
  35. pulumi_oci/database/get_backups.py +136 -10
  36. pulumi_oci/database/get_cloud_exadata_infrastructure.py +43 -1
  37. pulumi_oci/database/get_cloud_vm_cluster.py +59 -3
  38. pulumi_oci/database/get_cloud_vm_clusters.py +28 -6
  39. pulumi_oci/database/get_data_guard_association.py +12 -1
  40. pulumi_oci/database/get_database_software_images.py +20 -1
  41. pulumi_oci/database/get_db_node.py +31 -4
  42. pulumi_oci/database/get_db_server.py +15 -1
  43. pulumi_oci/database/get_exadata_infrastructure.py +57 -1
  44. pulumi_oci/database/get_exadb_vm_cluster.py +29 -1
  45. pulumi_oci/database/get_exadb_vm_clusters.py +25 -3
  46. pulumi_oci/database/get_exascale_db_storage_vault.py +43 -1
  47. pulumi_oci/database/get_exascale_db_storage_vaults.py +47 -3
  48. pulumi_oci/database/get_external_container_database.py +1 -1
  49. pulumi_oci/database/get_external_non_container_database.py +1 -1
  50. pulumi_oci/database/get_external_pluggable_database.py +1 -1
  51. pulumi_oci/database/get_flex_components.py +28 -6
  52. pulumi_oci/database/get_maintenance_runs.py +20 -1
  53. pulumi_oci/database/get_vm_cluster.py +60 -4
  54. pulumi_oci/database/get_vm_clusters.py +25 -3
  55. pulumi_oci/database/outputs.py +2260 -87
  56. pulumi_oci/database/pluggable_database.py +13 -13
  57. pulumi_oci/database/vm_cluster.py +172 -18
  58. pulumi_oci/database/vm_cluster_add_virtual_network.py +114 -2
  59. pulumi_oci/database/vm_cluster_remove_virtual_machine.py +114 -2
  60. pulumi_oci/datasafe/__init__.py +7 -0
  61. pulumi_oci/datasafe/_inputs.py +301 -0
  62. pulumi_oci/datasafe/discovery_mod.py +49 -0
  63. pulumi_oci/datasafe/get_discovery_job.py +15 -1
  64. pulumi_oci/datasafe/get_masking_report.py +46 -4
  65. pulumi_oci/datasafe/get_masking_report_masking_errors.py +166 -0
  66. pulumi_oci/datasafe/get_security_assessment_finding.py +31 -1
  67. pulumi_oci/datasafe/get_security_assessment_findings.py +43 -3
  68. pulumi_oci/datasafe/get_sensitive_column_analytics.py +370 -0
  69. pulumi_oci/datasafe/get_sensitive_data_model.py +15 -1
  70. pulumi_oci/datasafe/get_sensitive_type_group.py +253 -0
  71. pulumi_oci/datasafe/get_sensitive_type_group_grouped_sensitive_types.py +166 -0
  72. pulumi_oci/datasafe/get_sensitive_type_groups.py +294 -0
  73. pulumi_oci/datasafe/outputs.py +676 -3
  74. pulumi_oci/datasafe/sensitive_data_model.py +49 -0
  75. pulumi_oci/datasafe/sensitive_type_group.py +563 -0
  76. pulumi_oci/datasafe/sensitive_type_group_grouped_sensitive_type.py +287 -0
  77. pulumi_oci/datascience/__init__.py +4 -0
  78. pulumi_oci/datascience/_inputs.py +1160 -41
  79. pulumi_oci/datascience/get_model.py +29 -1
  80. pulumi_oci/datascience/get_model_custom_metadata_artifact_content.py +151 -0
  81. pulumi_oci/datascience/get_model_defined_metadata_artifact_content.py +151 -0
  82. pulumi_oci/datascience/get_model_version_set.py +15 -1
  83. pulumi_oci/datascience/get_model_version_sets.py +25 -3
  84. pulumi_oci/datascience/get_models.py +25 -3
  85. pulumi_oci/datascience/get_pipeline.py +15 -1
  86. pulumi_oci/datascience/model.py +64 -0
  87. pulumi_oci/datascience/model_custom_metadata_artifact.py +418 -0
  88. pulumi_oci/datascience/model_defined_metadata_artifact.py +418 -0
  89. pulumi_oci/datascience/model_version_set.py +28 -0
  90. pulumi_oci/datascience/outputs.py +4343 -2164
  91. pulumi_oci/datascience/pipeline.py +48 -141
  92. pulumi_oci/datascience/pipeline_run.py +32 -0
  93. pulumi_oci/dblm/__init__.py +17 -0
  94. pulumi_oci/dblm/_inputs.py +275 -0
  95. pulumi_oci/dblm/get_vulnerability.py +242 -0
  96. pulumi_oci/dblm/get_vulnerability_aggregated_vulnerability_data.py +220 -0
  97. pulumi_oci/dblm/get_vulnerability_notifications.py +144 -0
  98. pulumi_oci/dblm/get_vulnerability_resources.py +258 -0
  99. pulumi_oci/dblm/get_vulnerability_scan.py +267 -0
  100. pulumi_oci/dblm/get_vulnerability_scans.py +270 -0
  101. pulumi_oci/dblm/get_vulnerability_vulnerabilities.py +258 -0
  102. pulumi_oci/dblm/outputs.py +1294 -0
  103. pulumi_oci/dblm/vulnerability_scan.py +521 -0
  104. pulumi_oci/email/dkim.py +120 -20
  105. pulumi_oci/email/get_dkim.py +40 -1
  106. pulumi_oci/email/outputs.py +29 -0
  107. pulumi_oci/filestorage/__init__.py +3 -0
  108. pulumi_oci/filestorage/_inputs.py +49 -0
  109. pulumi_oci/filestorage/file_system.py +133 -0
  110. pulumi_oci/filestorage/file_system_quota_rule.py +593 -0
  111. pulumi_oci/filestorage/filesystem_snapshot_policy.py +28 -0
  112. pulumi_oci/filestorage/get_file_system_quota_rule.py +248 -0
  113. pulumi_oci/filestorage/get_file_system_quota_rules.py +210 -0
  114. pulumi_oci/filestorage/get_filesystem_snapshot_policy.py +15 -1
  115. pulumi_oci/filestorage/get_outbound_connector.py +15 -1
  116. pulumi_oci/filestorage/get_replication.py +15 -1
  117. pulumi_oci/filestorage/get_replication_target.py +15 -1
  118. pulumi_oci/filestorage/get_snapshot.py +15 -1
  119. pulumi_oci/filestorage/mount_target.py +28 -0
  120. pulumi_oci/filestorage/outbound_connector.py +28 -0
  121. pulumi_oci/filestorage/outputs.py +263 -0
  122. pulumi_oci/filestorage/replication.py +28 -0
  123. pulumi_oci/filestorage/snapshot.py +28 -0
  124. pulumi_oci/goldengate/connection.py +561 -162
  125. pulumi_oci/goldengate/database_registration.py +14 -14
  126. pulumi_oci/goldengate/get_connection.py +117 -6
  127. pulumi_oci/goldengate/outputs.py +96 -10
  128. pulumi_oci/jms/__init__.py +4 -0
  129. pulumi_oci/jms/_inputs.py +196 -0
  130. pulumi_oci/jms/get_fleet_error_analytics.py +163 -0
  131. pulumi_oci/jms/get_fleet_errors.py +264 -0
  132. pulumi_oci/jms/get_fleet_performance_tuning_analysis_results.py +23 -1
  133. pulumi_oci/jms/get_jms_plugins.py +23 -1
  134. pulumi_oci/jms/get_plugin_error_analytics.py +163 -0
  135. pulumi_oci/jms/get_plugin_errors.py +264 -0
  136. pulumi_oci/jms/outputs.py +566 -6
  137. pulumi_oci/mysql/_inputs.py +1239 -10
  138. pulumi_oci/mysql/channel.py +28 -0
  139. pulumi_oci/mysql/get_channel.py +15 -1
  140. pulumi_oci/mysql/get_mysql_backup.py +15 -1
  141. pulumi_oci/mysql/get_mysql_configuration.py +15 -1
  142. pulumi_oci/mysql/get_mysql_db_system.py +15 -1
  143. pulumi_oci/mysql/mysql_backup.py +28 -0
  144. pulumi_oci/mysql/mysql_configuration.py +106 -0
  145. pulumi_oci/mysql/mysql_db_system.py +36 -0
  146. pulumi_oci/mysql/outputs.py +2008 -35
  147. pulumi_oci/opensearch/__init__.py +3 -0
  148. pulumi_oci/opensearch/_inputs.py +101 -0
  149. pulumi_oci/opensearch/cluster.py +76 -29
  150. pulumi_oci/opensearch/get_opensearch_cluster.py +12 -1
  151. pulumi_oci/opensearch/get_opensearch_cluster_pipeline.py +433 -0
  152. pulumi_oci/opensearch/get_opensearch_cluster_pipelines.py +218 -0
  153. pulumi_oci/opensearch/opensearch_cluster_pipeline.py +1172 -0
  154. pulumi_oci/opensearch/outputs.py +425 -0
  155. pulumi_oci/provider.py +20 -0
  156. pulumi_oci/psql/_inputs.py +258 -0
  157. pulumi_oci/psql/backup.py +129 -28
  158. pulumi_oci/psql/db_system.py +10 -0
  159. pulumi_oci/psql/get_backup.py +47 -2
  160. pulumi_oci/psql/get_backups.py +3 -0
  161. pulumi_oci/psql/get_configurations.py +23 -1
  162. pulumi_oci/psql/get_db_system.py +1 -1
  163. pulumi_oci/psql/get_db_systems.py +1 -1
  164. pulumi_oci/psql/outputs.py +541 -5
  165. pulumi_oci/pulumi-plugin.json +1 -1
  166. pulumi_oci/redis/redis_cluster.py +7 -7
  167. pulumi_oci/stackmonitoring/__init__.py +8 -0
  168. pulumi_oci/stackmonitoring/_inputs.py +372 -1
  169. pulumi_oci/stackmonitoring/get_defined_monitoring_templates.py +185 -0
  170. pulumi_oci/stackmonitoring/get_metric_extension.py +1 -1
  171. pulumi_oci/stackmonitoring/get_monitored_resource_type.py +15 -1
  172. pulumi_oci/stackmonitoring/get_monitoring_template.py +380 -0
  173. pulumi_oci/stackmonitoring/get_monitoring_template_alarm_condition.py +318 -0
  174. pulumi_oci/stackmonitoring/get_monitoring_template_alarm_conditions.py +262 -0
  175. pulumi_oci/stackmonitoring/get_monitoring_templates.py +289 -0
  176. pulumi_oci/stackmonitoring/metric_extension.py +4 -4
  177. pulumi_oci/stackmonitoring/monitored_resource_type.py +30 -0
  178. pulumi_oci/stackmonitoring/monitoring_template.py +954 -0
  179. pulumi_oci/stackmonitoring/monitoring_template_alarm_condition.py +780 -0
  180. pulumi_oci/stackmonitoring/monitoring_template_monitoring_template_on_given_resources_management.py +253 -0
  181. pulumi_oci/stackmonitoring/outputs.py +1305 -118
  182. pulumi_oci/tenantmanagercontrolplane/__init__.py +33 -0
  183. pulumi_oci/tenantmanagercontrolplane/_inputs.py +685 -0
  184. pulumi_oci/tenantmanagercontrolplane/get_assigned_subscription.py +478 -0
  185. pulumi_oci/tenantmanagercontrolplane/get_assigned_subscription_line_items.py +144 -0
  186. pulumi_oci/tenantmanagercontrolplane/get_assigned_subscriptions.py +188 -0
  187. pulumi_oci/tenantmanagercontrolplane/get_domain.py +253 -0
  188. pulumi_oci/tenantmanagercontrolplane/get_domain_governance.py +281 -0
  189. pulumi_oci/tenantmanagercontrolplane/get_domain_governances.py +226 -0
  190. pulumi_oci/tenantmanagercontrolplane/get_domains.py +226 -0
  191. pulumi_oci/tenantmanagercontrolplane/get_link.py +197 -0
  192. pulumi_oci/tenantmanagercontrolplane/get_links.py +191 -0
  193. pulumi_oci/tenantmanagercontrolplane/get_organization.py +211 -0
  194. pulumi_oci/tenantmanagercontrolplane/get_organization_tenancies.py +144 -0
  195. pulumi_oci/tenantmanagercontrolplane/get_organization_tenancy.py +233 -0
  196. pulumi_oci/tenantmanagercontrolplane/get_organizations.py +147 -0
  197. pulumi_oci/tenantmanagercontrolplane/get_recipient_invitation.py +295 -0
  198. pulumi_oci/tenantmanagercontrolplane/get_recipient_invitations.py +213 -0
  199. pulumi_oci/tenantmanagercontrolplane/get_sender_invitation.py +295 -0
  200. pulumi_oci/tenantmanagercontrolplane/get_sender_invitations.py +235 -0
  201. pulumi_oci/tenantmanagercontrolplane/get_subscription.py +464 -0
  202. pulumi_oci/tenantmanagercontrolplane/get_subscription_available_regions.py +144 -0
  203. pulumi_oci/tenantmanagercontrolplane/get_subscription_line_items.py +144 -0
  204. pulumi_oci/tenantmanagercontrolplane/get_subscription_mapping.py +211 -0
  205. pulumi_oci/tenantmanagercontrolplane/get_subscription_mappings.py +210 -0
  206. pulumi_oci/tenantmanagercontrolplane/get_subscriptions.py +188 -0
  207. pulumi_oci/tenantmanagercontrolplane/outputs.py +3257 -0
  208. pulumi_oci/tenantmanagercontrolplane/subscription_mapping.py +409 -0
  209. pulumi_oci/vault/__init__.py +1 -1
  210. pulumi_oci/vault/_inputs.py +92 -0
  211. pulumi_oci/vault/get_secret.py +40 -1
  212. pulumi_oci/vault/{get_secret_version.py → get_secret_version_sdk_v2.py} +32 -77
  213. pulumi_oci/vault/outputs.py +210 -0
  214. pulumi_oci/vault/secret.py +122 -0
  215. {pulumi_oci-2.25.0a1740032973.dist-info → pulumi_oci-2.26.0.dist-info}/METADATA +1 -1
  216. {pulumi_oci-2.25.0a1740032973.dist-info → pulumi_oci-2.26.0.dist-info}/RECORD +218 -150
  217. {pulumi_oci-2.25.0a1740032973.dist-info → pulumi_oci-2.26.0.dist-info}/WHEEL +1 -1
  218. {pulumi_oci-2.25.0a1740032973.dist-info → pulumi_oci-2.26.0.dist-info}/top_level.txt +0 -0
@@ -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]:
@@ -613,11 +613,13 @@ class AutonomousContainerDatabaseArgs:
613
613
  @pulumi.input_type
614
614
  class _AutonomousContainerDatabaseState:
615
615
  def __init__(__self__, *,
616
+ associated_backup_configuration_details: Optional[pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseAssociatedBackupConfigurationDetailArgs']]]] = None,
616
617
  autonomous_exadata_infrastructure_id: Optional[pulumi.Input[str]] = None,
617
618
  autonomous_vm_cluster_id: Optional[pulumi.Input[str]] = None,
618
619
  availability_domain: Optional[pulumi.Input[str]] = None,
619
620
  available_cpus: Optional[pulumi.Input[float]] = None,
620
621
  backup_config: Optional[pulumi.Input['AutonomousContainerDatabaseBackupConfigArgs']] = None,
622
+ backup_destination_properties_lists: Optional[pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseBackupDestinationPropertiesListArgs']]]] = None,
621
623
  cloud_autonomous_vm_cluster_id: Optional[pulumi.Input[str]] = None,
622
624
  compartment_id: Optional[pulumi.Input[str]] = None,
623
625
  compute_model: Optional[pulumi.Input[str]] = None,
@@ -662,6 +664,7 @@ class _AutonomousContainerDatabaseState:
662
664
  provisionable_cpuses: Optional[pulumi.Input[Sequence[pulumi.Input[float]]]] = None,
663
665
  provisioned_cpus: Optional[pulumi.Input[float]] = None,
664
666
  reclaimable_cpus: Optional[pulumi.Input[float]] = None,
667
+ recovery_appliance_details: Optional[pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseRecoveryApplianceDetailArgs']]]] = None,
665
668
  reserved_cpus: Optional[pulumi.Input[float]] = None,
666
669
  role: Optional[pulumi.Input[str]] = None,
667
670
  rotate_key_trigger: Optional[pulumi.Input[bool]] = None,
@@ -677,11 +680,13 @@ class _AutonomousContainerDatabaseState:
677
680
  vm_failover_reservation: Optional[pulumi.Input[int]] = None):
678
681
  """
679
682
  Input properties used for looking up and filtering AutonomousContainerDatabase resources.
683
+ :param pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseAssociatedBackupConfigurationDetailArgs']]] associated_backup_configuration_details: A backup config object holds information about preferred backup destinations only. This object holds information about the associated backup destinations, such as secondary backup destinations created for local backups or remote replicated backups.
680
684
  :param pulumi.Input[str] autonomous_exadata_infrastructure_id: **No longer used.** This parameter is no longer used for Autonomous Database on dedicated Exadata infrasture. Specify a `cloudAutonomousVmClusterId` instead. Using this parameter will cause the operation to fail.
681
685
  :param pulumi.Input[str] autonomous_vm_cluster_id: The OCID of the Autonomous VM Cluster.
682
686
  :param pulumi.Input[str] availability_domain: The availability domain of the Autonomous Container Database
683
687
  :param pulumi.Input[float] available_cpus: Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database.<br> For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. See [Compute Models in Autonomous Database on Dedicated Exadata Infrastructure](https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak) for more details.
684
688
  :param pulumi.Input['AutonomousContainerDatabaseBackupConfigArgs'] backup_config: (Updatable) Backup options for the Autonomous Container Database.
689
+ :param pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseBackupDestinationPropertiesListArgs']]] backup_destination_properties_lists: This list describes the backup destination properties associated with the Autonomous Container Database (ACD) 's preferred backup destination. The object at a given index is associated with the destination present at the same index in the backup destination details list of the ACD Backup Configuration.
685
690
  :param pulumi.Input[str] cloud_autonomous_vm_cluster_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the cloud Autonomous Exadata VM Cluster.
686
691
  :param pulumi.Input[str] compartment_id: (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment containing the Autonomous Container Database.
687
692
  :param pulumi.Input[str] compute_model: The compute model of the Autonomous Container Database. For Autonomous Database on Dedicated Exadata Infrastructure, the CPU type (ECPUs or OCPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. ECPU compute model is the recommended model and OCPU compute model is legacy. See [Compute Models in Autonomous Database on Dedicated Exadata Infrastructure](https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak) for more details.
@@ -722,9 +727,12 @@ class _AutonomousContainerDatabaseState:
722
727
  :param pulumi.Input[str] protection_mode: The protection mode of this Autonomous Data Guard association. For more information, see [Oracle Data Guard Protection Modes](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-protection-modes.htm#SBYDB02000) in the Oracle Data Guard documentation.
723
728
  :param pulumi.Input[Sequence[pulumi.Input[float]]] provisionable_cpuses: An array of CPU values that can be used to successfully provision a single Autonomous Database.
724
729
  :param pulumi.Input[float] provisioned_cpus: The number of CPUs provisioned in an Autonomous Container Database.
730
+ <<<<<<< ours
725
731
  :param pulumi.Input[float] reclaimable_cpus: For Autonomous Databases on Dedicated Exadata Infrastructure:
726
732
  * These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database.
727
733
  * The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model.
734
+ >>>>>>> theirs
735
+ :param pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseRecoveryApplianceDetailArgs']]] recovery_appliance_details: Information about the recovery appliance configuration associated with the Autonomous Container Database.
728
736
  :param pulumi.Input[float] reserved_cpus: The number of CPUs reserved in an Autonomous Container Database.
729
737
  * These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database.
730
738
  * The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. See [Compute Models in Autonomous Database on Dedicated Exadata Infrastructure](https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak) for more details.
@@ -744,6 +752,8 @@ class _AutonomousContainerDatabaseState:
744
752
  :param pulumi.Input[str] version_preference: (Updatable) The next maintenance version preference.
745
753
  :param pulumi.Input[int] vm_failover_reservation: The percentage of CPUs to reserve for a single node Autonomous Database, in increments of 25.
746
754
  """
755
+ if associated_backup_configuration_details is not None:
756
+ pulumi.set(__self__, "associated_backup_configuration_details", associated_backup_configuration_details)
747
757
  if autonomous_exadata_infrastructure_id is not None:
748
758
  pulumi.set(__self__, "autonomous_exadata_infrastructure_id", autonomous_exadata_infrastructure_id)
749
759
  if autonomous_vm_cluster_id is not None:
@@ -754,6 +764,8 @@ class _AutonomousContainerDatabaseState:
754
764
  pulumi.set(__self__, "available_cpus", available_cpus)
755
765
  if backup_config is not None:
756
766
  pulumi.set(__self__, "backup_config", backup_config)
767
+ if backup_destination_properties_lists is not None:
768
+ pulumi.set(__self__, "backup_destination_properties_lists", backup_destination_properties_lists)
757
769
  if cloud_autonomous_vm_cluster_id is not None:
758
770
  pulumi.set(__self__, "cloud_autonomous_vm_cluster_id", cloud_autonomous_vm_cluster_id)
759
771
  if compartment_id is not None:
@@ -842,6 +854,8 @@ class _AutonomousContainerDatabaseState:
842
854
  pulumi.set(__self__, "provisioned_cpus", provisioned_cpus)
843
855
  if reclaimable_cpus is not None:
844
856
  pulumi.set(__self__, "reclaimable_cpus", reclaimable_cpus)
857
+ if recovery_appliance_details is not None:
858
+ pulumi.set(__self__, "recovery_appliance_details", recovery_appliance_details)
845
859
  if reserved_cpus is not None:
846
860
  pulumi.set(__self__, "reserved_cpus", reserved_cpus)
847
861
  if role is not None:
@@ -869,6 +883,18 @@ class _AutonomousContainerDatabaseState:
869
883
  if vm_failover_reservation is not None:
870
884
  pulumi.set(__self__, "vm_failover_reservation", vm_failover_reservation)
871
885
 
886
+ @property
887
+ @pulumi.getter(name="associatedBackupConfigurationDetails")
888
+ def associated_backup_configuration_details(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseAssociatedBackupConfigurationDetailArgs']]]]:
889
+ """
890
+ A backup config object holds information about preferred backup destinations only. This object holds information about the associated backup destinations, such as secondary backup destinations created for local backups or remote replicated backups.
891
+ """
892
+ return pulumi.get(self, "associated_backup_configuration_details")
893
+
894
+ @associated_backup_configuration_details.setter
895
+ def associated_backup_configuration_details(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseAssociatedBackupConfigurationDetailArgs']]]]):
896
+ pulumi.set(self, "associated_backup_configuration_details", value)
897
+
872
898
  @property
873
899
  @pulumi.getter(name="autonomousExadataInfrastructureId")
874
900
  def autonomous_exadata_infrastructure_id(self) -> Optional[pulumi.Input[str]]:
@@ -929,6 +955,18 @@ class _AutonomousContainerDatabaseState:
929
955
  def backup_config(self, value: Optional[pulumi.Input['AutonomousContainerDatabaseBackupConfigArgs']]):
930
956
  pulumi.set(self, "backup_config", value)
931
957
 
958
+ @property
959
+ @pulumi.getter(name="backupDestinationPropertiesLists")
960
+ def backup_destination_properties_lists(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseBackupDestinationPropertiesListArgs']]]]:
961
+ """
962
+ This list describes the backup destination properties associated with the Autonomous Container Database (ACD) 's preferred backup destination. The object at a given index is associated with the destination present at the same index in the backup destination details list of the ACD Backup Configuration.
963
+ """
964
+ return pulumi.get(self, "backup_destination_properties_lists")
965
+
966
+ @backup_destination_properties_lists.setter
967
+ def backup_destination_properties_lists(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseBackupDestinationPropertiesListArgs']]]]):
968
+ pulumi.set(self, "backup_destination_properties_lists", value)
969
+
932
970
  @property
933
971
  @pulumi.getter(name="cloudAutonomousVmClusterId")
934
972
  def cloud_autonomous_vm_cluster_id(self) -> Optional[pulumi.Input[str]]:
@@ -1429,6 +1467,7 @@ class _AutonomousContainerDatabaseState:
1429
1467
  def provisioned_cpus(self) -> Optional[pulumi.Input[float]]:
1430
1468
  """
1431
1469
  The number of CPUs provisioned in an Autonomous Container Database.
1470
+ <<<<<<< ours
1432
1471
  """
1433
1472
  return pulumi.get(self, "provisioned_cpus")
1434
1473
 
@@ -1443,6 +1482,7 @@ class _AutonomousContainerDatabaseState:
1443
1482
  For Autonomous Databases on Dedicated Exadata Infrastructure:
1444
1483
  * These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database.
1445
1484
  * The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model.
1485
+ >>>>>>> theirs
1446
1486
  """
1447
1487
  return pulumi.get(self, "reclaimable_cpus")
1448
1488
 
@@ -1450,6 +1490,18 @@ class _AutonomousContainerDatabaseState:
1450
1490
  def reclaimable_cpus(self, value: Optional[pulumi.Input[float]]):
1451
1491
  pulumi.set(self, "reclaimable_cpus", value)
1452
1492
 
1493
+ @property
1494
+ @pulumi.getter(name="recoveryApplianceDetails")
1495
+ def recovery_appliance_details(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseRecoveryApplianceDetailArgs']]]]:
1496
+ """
1497
+ Information about the recovery appliance configuration associated with the Autonomous Container Database.
1498
+ """
1499
+ return pulumi.get(self, "recovery_appliance_details")
1500
+
1501
+ @recovery_appliance_details.setter
1502
+ def recovery_appliance_details(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['AutonomousContainerDatabaseRecoveryApplianceDetailArgs']]]]):
1503
+ pulumi.set(self, "recovery_appliance_details", value)
1504
+
1453
1505
  @property
1454
1506
  @pulumi.getter(name="reservedCpus")
1455
1507
  def reserved_cpus(self) -> Optional[pulumi.Input[float]]:
@@ -1829,8 +1881,10 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
1829
1881
  __props__.__dict__["vault_id"] = vault_id
1830
1882
  __props__.__dict__["version_preference"] = version_preference
1831
1883
  __props__.__dict__["vm_failover_reservation"] = vm_failover_reservation
1884
+ __props__.__dict__["associated_backup_configuration_details"] = None
1832
1885
  __props__.__dict__["availability_domain"] = None
1833
1886
  __props__.__dict__["available_cpus"] = None
1887
+ __props__.__dict__["backup_destination_properties_lists"] = None
1834
1888
  __props__.__dict__["compute_model"] = None
1835
1889
  __props__.__dict__["dst_file_version"] = None
1836
1890
  __props__.__dict__["infrastructure_type"] = None
@@ -1847,6 +1901,7 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
1847
1901
  __props__.__dict__["provisionable_cpuses"] = None
1848
1902
  __props__.__dict__["provisioned_cpus"] = None
1849
1903
  __props__.__dict__["reclaimable_cpus"] = None
1904
+ __props__.__dict__["recovery_appliance_details"] = None
1850
1905
  __props__.__dict__["reserved_cpus"] = None
1851
1906
  __props__.__dict__["role"] = None
1852
1907
  __props__.__dict__["state"] = None
@@ -1864,11 +1919,13 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
1864
1919
  def get(resource_name: str,
1865
1920
  id: pulumi.Input[str],
1866
1921
  opts: Optional[pulumi.ResourceOptions] = None,
1922
+ associated_backup_configuration_details: Optional[pulumi.Input[Sequence[pulumi.Input[Union['AutonomousContainerDatabaseAssociatedBackupConfigurationDetailArgs', 'AutonomousContainerDatabaseAssociatedBackupConfigurationDetailArgsDict']]]]] = None,
1867
1923
  autonomous_exadata_infrastructure_id: Optional[pulumi.Input[str]] = None,
1868
1924
  autonomous_vm_cluster_id: Optional[pulumi.Input[str]] = None,
1869
1925
  availability_domain: Optional[pulumi.Input[str]] = None,
1870
1926
  available_cpus: Optional[pulumi.Input[float]] = None,
1871
1927
  backup_config: Optional[pulumi.Input[Union['AutonomousContainerDatabaseBackupConfigArgs', 'AutonomousContainerDatabaseBackupConfigArgsDict']]] = None,
1928
+ backup_destination_properties_lists: Optional[pulumi.Input[Sequence[pulumi.Input[Union['AutonomousContainerDatabaseBackupDestinationPropertiesListArgs', 'AutonomousContainerDatabaseBackupDestinationPropertiesListArgsDict']]]]] = None,
1872
1929
  cloud_autonomous_vm_cluster_id: Optional[pulumi.Input[str]] = None,
1873
1930
  compartment_id: Optional[pulumi.Input[str]] = None,
1874
1931
  compute_model: Optional[pulumi.Input[str]] = None,
@@ -1913,6 +1970,7 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
1913
1970
  provisionable_cpuses: Optional[pulumi.Input[Sequence[pulumi.Input[float]]]] = None,
1914
1971
  provisioned_cpus: Optional[pulumi.Input[float]] = None,
1915
1972
  reclaimable_cpus: Optional[pulumi.Input[float]] = None,
1973
+ recovery_appliance_details: Optional[pulumi.Input[Sequence[pulumi.Input[Union['AutonomousContainerDatabaseRecoveryApplianceDetailArgs', 'AutonomousContainerDatabaseRecoveryApplianceDetailArgsDict']]]]] = None,
1916
1974
  reserved_cpus: Optional[pulumi.Input[float]] = None,
1917
1975
  role: Optional[pulumi.Input[str]] = None,
1918
1976
  rotate_key_trigger: Optional[pulumi.Input[bool]] = None,
@@ -1933,11 +1991,13 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
1933
1991
  :param str resource_name: The unique name of the resulting resource.
1934
1992
  :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
1935
1993
  :param pulumi.ResourceOptions opts: Options for the resource.
1994
+ :param pulumi.Input[Sequence[pulumi.Input[Union['AutonomousContainerDatabaseAssociatedBackupConfigurationDetailArgs', 'AutonomousContainerDatabaseAssociatedBackupConfigurationDetailArgsDict']]]] associated_backup_configuration_details: A backup config object holds information about preferred backup destinations only. This object holds information about the associated backup destinations, such as secondary backup destinations created for local backups or remote replicated backups.
1936
1995
  :param pulumi.Input[str] autonomous_exadata_infrastructure_id: **No longer used.** This parameter is no longer used for Autonomous Database on dedicated Exadata infrasture. Specify a `cloudAutonomousVmClusterId` instead. Using this parameter will cause the operation to fail.
1937
1996
  :param pulumi.Input[str] autonomous_vm_cluster_id: The OCID of the Autonomous VM Cluster.
1938
1997
  :param pulumi.Input[str] availability_domain: The availability domain of the Autonomous Container Database
1939
1998
  :param pulumi.Input[float] available_cpus: Sum of CPUs available on the Autonomous VM Cluster + Sum of reclaimable CPUs available in the Autonomous Container Database.<br> For Autonomous Databases on Dedicated Exadata Infrastructure, the CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. See [Compute Models in Autonomous Database on Dedicated Exadata Infrastructure](https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak) for more details.
1940
1999
  :param pulumi.Input[Union['AutonomousContainerDatabaseBackupConfigArgs', 'AutonomousContainerDatabaseBackupConfigArgsDict']] backup_config: (Updatable) Backup options for the Autonomous Container Database.
2000
+ :param pulumi.Input[Sequence[pulumi.Input[Union['AutonomousContainerDatabaseBackupDestinationPropertiesListArgs', 'AutonomousContainerDatabaseBackupDestinationPropertiesListArgsDict']]]] backup_destination_properties_lists: This list describes the backup destination properties associated with the Autonomous Container Database (ACD) 's preferred backup destination. The object at a given index is associated with the destination present at the same index in the backup destination details list of the ACD Backup Configuration.
1941
2001
  :param pulumi.Input[str] cloud_autonomous_vm_cluster_id: The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the cloud Autonomous Exadata VM Cluster.
1942
2002
  :param pulumi.Input[str] compartment_id: (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment containing the Autonomous Container Database.
1943
2003
  :param pulumi.Input[str] compute_model: The compute model of the Autonomous Container Database. For Autonomous Database on Dedicated Exadata Infrastructure, the CPU type (ECPUs or OCPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. ECPU compute model is the recommended model and OCPU compute model is legacy. See [Compute Models in Autonomous Database on Dedicated Exadata Infrastructure](https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak) for more details.
@@ -1978,9 +2038,12 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
1978
2038
  :param pulumi.Input[str] protection_mode: The protection mode of this Autonomous Data Guard association. For more information, see [Oracle Data Guard Protection Modes](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-protection-modes.htm#SBYDB02000) in the Oracle Data Guard documentation.
1979
2039
  :param pulumi.Input[Sequence[pulumi.Input[float]]] provisionable_cpuses: An array of CPU values that can be used to successfully provision a single Autonomous Database.
1980
2040
  :param pulumi.Input[float] provisioned_cpus: The number of CPUs provisioned in an Autonomous Container Database.
2041
+ <<<<<<< ours
1981
2042
  :param pulumi.Input[float] reclaimable_cpus: For Autonomous Databases on Dedicated Exadata Infrastructure:
1982
2043
  * These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database.
1983
2044
  * The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model.
2045
+ >>>>>>> theirs
2046
+ :param pulumi.Input[Sequence[pulumi.Input[Union['AutonomousContainerDatabaseRecoveryApplianceDetailArgs', 'AutonomousContainerDatabaseRecoveryApplianceDetailArgsDict']]]] recovery_appliance_details: Information about the recovery appliance configuration associated with the Autonomous Container Database.
1984
2047
  :param pulumi.Input[float] reserved_cpus: The number of CPUs reserved in an Autonomous Container Database.
1985
2048
  * These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database.
1986
2049
  * The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model. See [Compute Models in Autonomous Database on Dedicated Exadata Infrastructure](https://docs.oracle.com/en/cloud/paas/autonomous-database/dedicated/adbak) for more details.
@@ -2004,11 +2067,13 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
2004
2067
 
2005
2068
  __props__ = _AutonomousContainerDatabaseState.__new__(_AutonomousContainerDatabaseState)
2006
2069
 
2070
+ __props__.__dict__["associated_backup_configuration_details"] = associated_backup_configuration_details
2007
2071
  __props__.__dict__["autonomous_exadata_infrastructure_id"] = autonomous_exadata_infrastructure_id
2008
2072
  __props__.__dict__["autonomous_vm_cluster_id"] = autonomous_vm_cluster_id
2009
2073
  __props__.__dict__["availability_domain"] = availability_domain
2010
2074
  __props__.__dict__["available_cpus"] = available_cpus
2011
2075
  __props__.__dict__["backup_config"] = backup_config
2076
+ __props__.__dict__["backup_destination_properties_lists"] = backup_destination_properties_lists
2012
2077
  __props__.__dict__["cloud_autonomous_vm_cluster_id"] = cloud_autonomous_vm_cluster_id
2013
2078
  __props__.__dict__["compartment_id"] = compartment_id
2014
2079
  __props__.__dict__["compute_model"] = compute_model
@@ -2053,6 +2118,7 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
2053
2118
  __props__.__dict__["provisionable_cpuses"] = provisionable_cpuses
2054
2119
  __props__.__dict__["provisioned_cpus"] = provisioned_cpus
2055
2120
  __props__.__dict__["reclaimable_cpus"] = reclaimable_cpus
2121
+ __props__.__dict__["recovery_appliance_details"] = recovery_appliance_details
2056
2122
  __props__.__dict__["reserved_cpus"] = reserved_cpus
2057
2123
  __props__.__dict__["role"] = role
2058
2124
  __props__.__dict__["rotate_key_trigger"] = rotate_key_trigger
@@ -2068,6 +2134,14 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
2068
2134
  __props__.__dict__["vm_failover_reservation"] = vm_failover_reservation
2069
2135
  return AutonomousContainerDatabase(resource_name, opts=opts, __props__=__props__)
2070
2136
 
2137
+ @property
2138
+ @pulumi.getter(name="associatedBackupConfigurationDetails")
2139
+ def associated_backup_configuration_details(self) -> pulumi.Output[Sequence['outputs.AutonomousContainerDatabaseAssociatedBackupConfigurationDetail']]:
2140
+ """
2141
+ A backup config object holds information about preferred backup destinations only. This object holds information about the associated backup destinations, such as secondary backup destinations created for local backups or remote replicated backups.
2142
+ """
2143
+ return pulumi.get(self, "associated_backup_configuration_details")
2144
+
2071
2145
  @property
2072
2146
  @pulumi.getter(name="autonomousExadataInfrastructureId")
2073
2147
  def autonomous_exadata_infrastructure_id(self) -> pulumi.Output[str]:
@@ -2108,6 +2182,14 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
2108
2182
  """
2109
2183
  return pulumi.get(self, "backup_config")
2110
2184
 
2185
+ @property
2186
+ @pulumi.getter(name="backupDestinationPropertiesLists")
2187
+ def backup_destination_properties_lists(self) -> pulumi.Output[Sequence['outputs.AutonomousContainerDatabaseBackupDestinationPropertiesList']]:
2188
+ """
2189
+ This list describes the backup destination properties associated with the Autonomous Container Database (ACD) 's preferred backup destination. The object at a given index is associated with the destination present at the same index in the backup destination details list of the ACD Backup Configuration.
2190
+ """
2191
+ return pulumi.get(self, "backup_destination_properties_lists")
2192
+
2111
2193
  @property
2112
2194
  @pulumi.getter(name="cloudAutonomousVmClusterId")
2113
2195
  def cloud_autonomous_vm_cluster_id(self) -> pulumi.Output[str]:
@@ -2440,6 +2522,7 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
2440
2522
  def provisioned_cpus(self) -> pulumi.Output[float]:
2441
2523
  """
2442
2524
  The number of CPUs provisioned in an Autonomous Container Database.
2525
+ <<<<<<< ours
2443
2526
  """
2444
2527
  return pulumi.get(self, "provisioned_cpus")
2445
2528
 
@@ -2450,9 +2533,18 @@ class AutonomousContainerDatabase(pulumi.CustomResource):
2450
2533
  For Autonomous Databases on Dedicated Exadata Infrastructure:
2451
2534
  * These are the CPUs that continue to be included in the count of CPUs available to the Autonomous Container Database even after one of its Autonomous Database is terminated or scaled down. You can release them to the available CPUs at its parent Autonomous VM Cluster level by restarting the Autonomous Container Database.
2452
2535
  * The CPU type (OCPUs or ECPUs) is determined by the parent Autonomous Exadata VM Cluster's compute model.
2536
+ >>>>>>> theirs
2453
2537
  """
2454
2538
  return pulumi.get(self, "reclaimable_cpus")
2455
2539
 
2540
+ @property
2541
+ @pulumi.getter(name="recoveryApplianceDetails")
2542
+ def recovery_appliance_details(self) -> pulumi.Output[Sequence['outputs.AutonomousContainerDatabaseRecoveryApplianceDetail']]:
2543
+ """
2544
+ Information about the recovery appliance configuration associated with the Autonomous Container Database.
2545
+ """
2546
+ return pulumi.get(self, "recovery_appliance_details")
2547
+
2456
2548
  @property
2457
2549
  @pulumi.getter(name="reservedCpus")
2458
2550
  def reserved_cpus(self) -> pulumi.Output[float]: