pulumi-oci 2.19.0a1733984857__py3-none-any.whl → 2.20.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 (128) hide show
  1. pulumi_oci/__init__.py +56 -0
  2. pulumi_oci/bigdataservice/__init__.py +4 -0
  3. pulumi_oci/bigdataservice/_inputs.py +672 -6
  4. pulumi_oci/bigdataservice/bds_instance.py +169 -7
  5. pulumi_oci/bigdataservice/bds_instance_api_key.py +66 -3
  6. pulumi_oci/bigdataservice/bds_instance_identity_configuration.py +859 -0
  7. pulumi_oci/bigdataservice/bds_instance_patch_action.py +4 -0
  8. pulumi_oci/bigdataservice/get_bds_cluster_versions.py +123 -0
  9. pulumi_oci/bigdataservice/get_bds_instance.py +48 -1
  10. pulumi_oci/bigdataservice/get_bds_instance_api_key.py +17 -1
  11. pulumi_oci/bigdataservice/get_bds_instance_api_keys.py +3 -0
  12. pulumi_oci/bigdataservice/get_bds_instance_identity_configuration.py +322 -0
  13. pulumi_oci/bigdataservice/get_bds_instance_identity_configurations.py +207 -0
  14. pulumi_oci/bigdataservice/outputs.py +1466 -98
  15. pulumi_oci/blockchain/get_blockchain_platform.py +1 -1
  16. pulumi_oci/blockchain/outputs.py +2 -2
  17. pulumi_oci/core/outputs.py +4 -0
  18. pulumi_oci/database/autonomous_container_database.py +47 -0
  19. pulumi_oci/database/autonomous_database.py +94 -0
  20. pulumi_oci/database/exadb_vm_cluster.py +104 -0
  21. pulumi_oci/database/get_autonomous_container_database.py +15 -1
  22. pulumi_oci/database/get_autonomous_database.py +29 -1
  23. pulumi_oci/database/outputs.py +36 -0
  24. pulumi_oci/dataflow/application.py +75 -33
  25. pulumi_oci/dataflow/get_application.py +15 -1
  26. pulumi_oci/dataflow/outputs.py +7 -0
  27. pulumi_oci/datascience/_inputs.py +32 -12
  28. pulumi_oci/datascience/get_job_run.py +3 -3
  29. pulumi_oci/datascience/get_job_runs.py +2 -2
  30. pulumi_oci/datascience/job_run.py +7 -7
  31. pulumi_oci/datascience/model_deployment.py +2 -0
  32. pulumi_oci/datascience/outputs.py +62 -26
  33. pulumi_oci/desktops/_inputs.py +9 -9
  34. pulumi_oci/desktops/desktop_pool.py +84 -35
  35. pulumi_oci/desktops/get_desktop_pool.py +12 -1
  36. pulumi_oci/desktops/outputs.py +13 -6
  37. pulumi_oci/disasterrecovery/_inputs.py +46 -30
  38. pulumi_oci/disasterrecovery/dr_plan.py +194 -23
  39. pulumi_oci/disasterrecovery/get_dr_plan.py +54 -4
  40. pulumi_oci/disasterrecovery/get_dr_plans.py +23 -1
  41. pulumi_oci/disasterrecovery/outputs.py +113 -21
  42. pulumi_oci/fleetappsmanagement/__init__.py +19 -0
  43. pulumi_oci/fleetappsmanagement/_inputs.py +5334 -378
  44. pulumi_oci/fleetappsmanagement/compliance_policy_rule.py +830 -0
  45. pulumi_oci/fleetappsmanagement/fleet.py +112 -67
  46. pulumi_oci/fleetappsmanagement/fleet_credential.py +44 -36
  47. pulumi_oci/fleetappsmanagement/fleet_property.py +35 -35
  48. pulumi_oci/fleetappsmanagement/fleet_resource.py +37 -37
  49. pulumi_oci/fleetappsmanagement/get_announcements.py +4 -4
  50. pulumi_oci/fleetappsmanagement/get_compliance_policies.py +199 -0
  51. pulumi_oci/fleetappsmanagement/get_compliance_policy.py +253 -0
  52. pulumi_oci/fleetappsmanagement/get_compliance_policy_rule.py +324 -0
  53. pulumi_oci/fleetappsmanagement/get_compliance_policy_rules.py +243 -0
  54. pulumi_oci/fleetappsmanagement/get_compliance_record_counts.py +144 -0
  55. pulumi_oci/fleetappsmanagement/get_compliance_records.py +279 -0
  56. pulumi_oci/fleetappsmanagement/get_fleet.py +29 -15
  57. pulumi_oci/fleetappsmanagement/get_fleet_compliance_report.py +8 -8
  58. pulumi_oci/fleetappsmanagement/get_fleet_credential.py +7 -7
  59. pulumi_oci/fleetappsmanagement/get_fleet_credentials.py +61 -17
  60. pulumi_oci/fleetappsmanagement/get_fleet_products.py +6 -6
  61. pulumi_oci/fleetappsmanagement/get_fleet_properties.py +8 -8
  62. pulumi_oci/fleetappsmanagement/get_fleet_property.py +11 -11
  63. pulumi_oci/fleetappsmanagement/get_fleet_resource.py +11 -11
  64. pulumi_oci/fleetappsmanagement/get_fleet_resources.py +10 -10
  65. pulumi_oci/fleetappsmanagement/get_fleet_targets.py +8 -8
  66. pulumi_oci/fleetappsmanagement/get_fleets.py +16 -16
  67. pulumi_oci/fleetappsmanagement/get_inventory_resources.py +12 -12
  68. pulumi_oci/fleetappsmanagement/get_maintenance_window.py +8 -8
  69. pulumi_oci/fleetappsmanagement/get_maintenance_windows.py +31 -12
  70. pulumi_oci/fleetappsmanagement/get_managed_entity_counts.py +144 -0
  71. pulumi_oci/fleetappsmanagement/get_onboarding_policies.py +2 -2
  72. pulumi_oci/fleetappsmanagement/get_onboardings.py +2 -2
  73. pulumi_oci/fleetappsmanagement/get_patch.py +363 -0
  74. pulumi_oci/fleetappsmanagement/get_patches.py +335 -0
  75. pulumi_oci/fleetappsmanagement/get_platform_configuration.py +296 -0
  76. pulumi_oci/fleetappsmanagement/get_platform_configurations.py +221 -0
  77. pulumi_oci/fleetappsmanagement/get_properties.py +9 -9
  78. pulumi_oci/fleetappsmanagement/get_property.py +4 -4
  79. pulumi_oci/fleetappsmanagement/get_runbook.py +8 -8
  80. pulumi_oci/fleetappsmanagement/get_runbooks.py +16 -16
  81. pulumi_oci/fleetappsmanagement/get_scheduler_definition.py +10 -10
  82. pulumi_oci/fleetappsmanagement/get_scheduler_definition_scheduled_fleets.py +2 -2
  83. pulumi_oci/fleetappsmanagement/get_scheduler_definitions.py +33 -11
  84. pulumi_oci/fleetappsmanagement/get_scheduler_job_counts.py +144 -0
  85. pulumi_oci/fleetappsmanagement/get_scheduler_job_job_activity_resources.py +245 -0
  86. pulumi_oci/fleetappsmanagement/get_scheduler_job_job_activity_steps.py +245 -0
  87. pulumi_oci/fleetappsmanagement/get_task_record.py +3 -3
  88. pulumi_oci/fleetappsmanagement/maintenance_window.py +44 -44
  89. pulumi_oci/fleetappsmanagement/onboarding.py +108 -20
  90. pulumi_oci/fleetappsmanagement/outputs.py +11222 -2736
  91. pulumi_oci/fleetappsmanagement/patch.py +978 -0
  92. pulumi_oci/fleetappsmanagement/platform_configuration.py +687 -0
  93. pulumi_oci/fleetappsmanagement/property.py +27 -27
  94. pulumi_oci/fleetappsmanagement/runbook.py +1173 -0
  95. pulumi_oci/fleetappsmanagement/scheduler_definition.py +30 -30
  96. pulumi_oci/fleetappsmanagement/task_record.py +754 -0
  97. pulumi_oci/fleetsoftwareupdate/fsu_collection.py +28 -0
  98. pulumi_oci/fleetsoftwareupdate/fsu_cycle.py +56 -0
  99. pulumi_oci/fleetsoftwareupdate/get_fsu_collection.py +15 -1
  100. pulumi_oci/fleetsoftwareupdate/get_fsu_cycle.py +29 -1
  101. pulumi_oci/fleetsoftwareupdate/outputs.py +33 -0
  102. pulumi_oci/generativeai/dedicated_ai_cluster.py +21 -0
  103. pulumi_oci/goldengate/__init__.py +7 -0
  104. pulumi_oci/goldengate/_inputs.py +665 -0
  105. pulumi_oci/goldengate/connection.py +7 -7
  106. pulumi_oci/goldengate/get_pipeline.py +408 -0
  107. pulumi_oci/goldengate/get_pipeline_running_processes.py +144 -0
  108. pulumi_oci/goldengate/get_pipeline_schema_tables.py +207 -0
  109. pulumi_oci/goldengate/get_pipeline_schemas.py +163 -0
  110. pulumi_oci/goldengate/get_pipelines.py +213 -0
  111. pulumi_oci/goldengate/get_recipes.py +188 -0
  112. pulumi_oci/goldengate/get_trail_files.py +4 -2
  113. pulumi_oci/goldengate/get_trail_sequences.py +4 -2
  114. pulumi_oci/goldengate/outputs.py +1500 -0
  115. pulumi_oci/goldengate/pipeline.py +928 -0
  116. pulumi_oci/pulumi-plugin.json +1 -1
  117. pulumi_oci/stackmonitoring/_inputs.py +94 -14
  118. pulumi_oci/stackmonitoring/get_metric_extensions.py +22 -3
  119. pulumi_oci/stackmonitoring/metric_extension.py +8 -0
  120. pulumi_oci/stackmonitoring/outputs.py +166 -24
  121. pulumi_oci/visualbuilder/_inputs.py +57 -202
  122. pulumi_oci/visualbuilder/get_vb_instance.py +15 -29
  123. pulumi_oci/visualbuilder/outputs.py +114 -400
  124. pulumi_oci/visualbuilder/vb_instance.py +62 -59
  125. {pulumi_oci-2.19.0a1733984857.dist-info → pulumi_oci-2.20.0.dist-info}/METADATA +3 -3
  126. {pulumi_oci-2.19.0a1733984857.dist-info → pulumi_oci-2.20.0.dist-info}/RECORD +128 -98
  127. {pulumi_oci-2.19.0a1733984857.dist-info → pulumi_oci-2.20.0.dist-info}/WHEEL +0 -0
  128. {pulumi_oci-2.19.0a1733984857.dist-info → pulumi_oci-2.20.0.dist-info}/top_level.txt +0 -0
pulumi_oci/bigdataservice/bds_instance_api_key.py CHANGED
@@ -23,11 +23,14 @@ class BdsInstanceApiKeyArgs:
23
23
  key_alias: pulumi.Input[str],
24
24
  passphrase: pulumi.Input[str],
25
25
  user_id: pulumi.Input[str],
26
- default_region: Optional[pulumi.Input[str]] = None):
26
+ default_region: Optional[pulumi.Input[str]] = None,
27
+ domain_ocid: Optional[pulumi.Input[str]] = None):
27
28
  """
28
29
  The set of arguments for constructing a BdsInstanceApiKey resource.
29
30
  :param pulumi.Input[str] bds_instance_id: The OCID of the cluster.
31
+ <<<<<<< ours
30
32
  :param pulumi.Input[str] key_alias: User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
33
+ >>>>>>> theirs
31
34
  :param pulumi.Input[str] passphrase: Base64 passphrase used to secure the private key which will be created on user behalf.
32
35
  :param pulumi.Input[str] user_id: The OCID of the user for whom this new generated API key pair will be created.
33
36
 
@@ -35,6 +38,7 @@ class BdsInstanceApiKeyArgs:
35
38
  ** IMPORTANT **
36
39
  Any change to a property that does not support update will force the destruction and recreation of the resource with the new property values
37
40
  :param pulumi.Input[str] default_region: The name of the region to establish the Object Storage endpoint. See https://docs.oracle.com/en-us/iaas/api/#/en/identity/20160918/Region/ for additional information.
41
+ :param pulumi.Input[str] domain_ocid: Identity domain OCID , where user is present. For default domain , this field will be optional.
38
42
  """
39
43
  pulumi.set(__self__, "bds_instance_id", bds_instance_id)
40
44
  pulumi.set(__self__, "key_alias", key_alias)
@@ -42,12 +46,15 @@ class BdsInstanceApiKeyArgs:
42
46
  pulumi.set(__self__, "user_id", user_id)
43
47
  if default_region is not None:
44
48
  pulumi.set(__self__, "default_region", default_region)
49
+ if domain_ocid is not None:
50
+ pulumi.set(__self__, "domain_ocid", domain_ocid)
45
51
 
46
52
  @property
47
53
  @pulumi.getter(name="bdsInstanceId")
48
54
  def bds_instance_id(self) -> pulumi.Input[str]:
49
55
  """
50
56
  The OCID of the cluster.
57
+ <<<<<<< ours
51
58
  """
52
59
  return pulumi.get(self, "bds_instance_id")
53
60
 
@@ -60,6 +67,7 @@ class BdsInstanceApiKeyArgs:
60
67
  def key_alias(self) -> pulumi.Input[str]:
61
68
  """
62
69
  User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
70
+ >>>>>>> theirs
63
71
  """
64
72
  return pulumi.get(self, "key_alias")
65
73
 
@@ -107,12 +115,25 @@ class BdsInstanceApiKeyArgs:
107
115
  def default_region(self, value: Optional[pulumi.Input[str]]):
108
116
  pulumi.set(self, "default_region", value)
109
117
 
118
+ @property
119
+ @pulumi.getter(name="domainOcid")
120
+ def domain_ocid(self) -> Optional[pulumi.Input[str]]:
121
+ """
122
+ Identity domain OCID , where user is present. For default domain , this field will be optional.
123
+ """
124
+ return pulumi.get(self, "domain_ocid")
125
+
126
+ @domain_ocid.setter
127
+ def domain_ocid(self, value: Optional[pulumi.Input[str]]):
128
+ pulumi.set(self, "domain_ocid", value)
129
+
110
130
 
111
131
  @pulumi.input_type
112
132
  class _BdsInstanceApiKeyState:
113
133
  def __init__(__self__, *,
114
134
  bds_instance_id: Optional[pulumi.Input[str]] = None,
115
135
  default_region: Optional[pulumi.Input[str]] = None,
136
+ domain_ocid: Optional[pulumi.Input[str]] = None,
116
137
  fingerprint: Optional[pulumi.Input[str]] = None,
117
138
  key_alias: Optional[pulumi.Input[str]] = None,
118
139
  passphrase: Optional[pulumi.Input[str]] = None,
@@ -124,9 +145,12 @@ class _BdsInstanceApiKeyState:
124
145
  """
125
146
  Input properties used for looking up and filtering BdsInstanceApiKey resources.
126
147
  :param pulumi.Input[str] bds_instance_id: The OCID of the cluster.
148
+ <<<<<<< ours
127
149
  :param pulumi.Input[str] default_region: The name of the region to establish the Object Storage endpoint. See https://docs.oracle.com/en-us/iaas/api/#/en/identity/20160918/Region/ for additional information.
150
+ :param pulumi.Input[str] domain_ocid: Identity domain OCID , where user is present. For default domain , this field will be optional.
128
151
  :param pulumi.Input[str] fingerprint: The fingerprint that corresponds to the public API key requested.
129
152
  :param pulumi.Input[str] key_alias: User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
153
+ >>>>>>> theirs
130
154
  :param pulumi.Input[str] passphrase: Base64 passphrase used to secure the private key which will be created on user behalf.
131
155
  :param pulumi.Input[str] pemfilepath: The full path and file name of the private key used for authentication. This location will be automatically selected on the BDS local file system.
132
156
  :param pulumi.Input[str] state: The current status of the API key.
@@ -142,6 +166,8 @@ class _BdsInstanceApiKeyState:
142
166
  pulumi.set(__self__, "bds_instance_id", bds_instance_id)
143
167
  if default_region is not None:
144
168
  pulumi.set(__self__, "default_region", default_region)
169
+ if domain_ocid is not None:
170
+ pulumi.set(__self__, "domain_ocid", domain_ocid)
145
171
  if fingerprint is not None:
146
172
  pulumi.set(__self__, "fingerprint", fingerprint)
147
173
  if key_alias is not None:
@@ -164,6 +190,7 @@ class _BdsInstanceApiKeyState:
164
190
  def bds_instance_id(self) -> Optional[pulumi.Input[str]]:
165
191
  """
166
192
  The OCID of the cluster.
193
+ <<<<<<< ours
167
194
  """
168
195
  return pulumi.get(self, "bds_instance_id")
169
196
 
@@ -183,6 +210,18 @@ class _BdsInstanceApiKeyState:
183
210
  def default_region(self, value: Optional[pulumi.Input[str]]):
184
211
  pulumi.set(self, "default_region", value)
185
212
 
213
+ @property
214
+ @pulumi.getter(name="domainOcid")
215
+ def domain_ocid(self) -> Optional[pulumi.Input[str]]:
216
+ """
217
+ Identity domain OCID , where user is present. For default domain , this field will be optional.
218
+ """
219
+ return pulumi.get(self, "domain_ocid")
220
+
221
+ @domain_ocid.setter
222
+ def domain_ocid(self, value: Optional[pulumi.Input[str]]):
223
+ pulumi.set(self, "domain_ocid", value)
224
+
186
225
  @property
187
226
  @pulumi.getter
188
227
  def fingerprint(self) -> Optional[pulumi.Input[str]]:
@@ -200,6 +239,7 @@ class _BdsInstanceApiKeyState:
200
239
  def key_alias(self) -> Optional[pulumi.Input[str]]:
201
240
  """
202
241
  User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
242
+ >>>>>>> theirs
203
243
  """
204
244
  return pulumi.get(self, "key_alias")
205
245
 
@@ -291,6 +331,7 @@ class BdsInstanceApiKey(pulumi.CustomResource):
291
331
  opts: Optional[pulumi.ResourceOptions] = None,
292
332
  bds_instance_id: Optional[pulumi.Input[str]] = None,
293
333
  default_region: Optional[pulumi.Input[str]] = None,
334
+ domain_ocid: Optional[pulumi.Input[str]] = None,
294
335
  key_alias: Optional[pulumi.Input[str]] = None,
295
336
  passphrase: Optional[pulumi.Input[str]] = None,
296
337
  user_id: Optional[pulumi.Input[str]] = None,
@@ -311,7 +352,8 @@ class BdsInstanceApiKey(pulumi.CustomResource):
311
352
  key_alias=bds_instance_api_key_key_alias,
312
353
  passphrase=bds_instance_api_key_passphrase,
313
354
  user_id=test_user["id"],
314
- default_region=bds_instance_api_key_default_region)
355
+ default_region=bds_instance_api_key_default_region,
356
+ domain_ocid=bds_instance_api_key_domain_ocid)
315
357
  ```
316
358
 
317
359
  ## Import
@@ -325,8 +367,11 @@ class BdsInstanceApiKey(pulumi.CustomResource):
325
367
  :param str resource_name: The name of the resource.
326
368
  :param pulumi.ResourceOptions opts: Options for the resource.
327
369
  :param pulumi.Input[str] bds_instance_id: The OCID of the cluster.
370
+ <<<<<<< ours
328
371
  :param pulumi.Input[str] default_region: The name of the region to establish the Object Storage endpoint. See https://docs.oracle.com/en-us/iaas/api/#/en/identity/20160918/Region/ for additional information.
372
+ :param pulumi.Input[str] domain_ocid: Identity domain OCID , where user is present. For default domain , this field will be optional.
329
373
  :param pulumi.Input[str] key_alias: User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
374
+ >>>>>>> theirs
330
375
  :param pulumi.Input[str] passphrase: Base64 passphrase used to secure the private key which will be created on user behalf.
331
376
  :param pulumi.Input[str] user_id: The OCID of the user for whom this new generated API key pair will be created.
332
377
 
@@ -356,7 +401,8 @@ class BdsInstanceApiKey(pulumi.CustomResource):
356
401
  key_alias=bds_instance_api_key_key_alias,
357
402
  passphrase=bds_instance_api_key_passphrase,
358
403
  user_id=test_user["id"],
359
- default_region=bds_instance_api_key_default_region)
404
+ default_region=bds_instance_api_key_default_region,
405
+ domain_ocid=bds_instance_api_key_domain_ocid)
360
406
  ```
361
407
 
362
408
  ## Import
@@ -384,6 +430,7 @@ class BdsInstanceApiKey(pulumi.CustomResource):
384
430
  opts: Optional[pulumi.ResourceOptions] = None,
385
431
  bds_instance_id: Optional[pulumi.Input[str]] = None,
386
432
  default_region: Optional[pulumi.Input[str]] = None,
433
+ domain_ocid: Optional[pulumi.Input[str]] = None,
387
434
  key_alias: Optional[pulumi.Input[str]] = None,
388
435
  passphrase: Optional[pulumi.Input[str]] = None,
389
436
  user_id: Optional[pulumi.Input[str]] = None,
@@ -400,6 +447,7 @@ class BdsInstanceApiKey(pulumi.CustomResource):
400
447
  raise TypeError("Missing required property 'bds_instance_id'")
401
448
  __props__.__dict__["bds_instance_id"] = bds_instance_id
402
449
  __props__.__dict__["default_region"] = default_region
450
+ __props__.__dict__["domain_ocid"] = domain_ocid
403
451
  if key_alias is None and not opts.urn:
404
452
  raise TypeError("Missing required property 'key_alias'")
405
453
  __props__.__dict__["key_alias"] = key_alias
@@ -428,6 +476,7 @@ class BdsInstanceApiKey(pulumi.CustomResource):
428
476
  opts: Optional[pulumi.ResourceOptions] = None,
429
477
  bds_instance_id: Optional[pulumi.Input[str]] = None,
430
478
  default_region: Optional[pulumi.Input[str]] = None,
479
+ domain_ocid: Optional[pulumi.Input[str]] = None,
431
480
  fingerprint: Optional[pulumi.Input[str]] = None,
432
481
  key_alias: Optional[pulumi.Input[str]] = None,
433
482
  passphrase: Optional[pulumi.Input[str]] = None,
@@ -444,9 +493,12 @@ class BdsInstanceApiKey(pulumi.CustomResource):
444
493
  :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
445
494
  :param pulumi.ResourceOptions opts: Options for the resource.
446
495
  :param pulumi.Input[str] bds_instance_id: The OCID of the cluster.
496
+ <<<<<<< ours
447
497
  :param pulumi.Input[str] default_region: The name of the region to establish the Object Storage endpoint. See https://docs.oracle.com/en-us/iaas/api/#/en/identity/20160918/Region/ for additional information.
498
+ :param pulumi.Input[str] domain_ocid: Identity domain OCID , where user is present. For default domain , this field will be optional.
448
499
  :param pulumi.Input[str] fingerprint: The fingerprint that corresponds to the public API key requested.
449
500
  :param pulumi.Input[str] key_alias: User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
501
+ >>>>>>> theirs
450
502
  :param pulumi.Input[str] passphrase: Base64 passphrase used to secure the private key which will be created on user behalf.
451
503
  :param pulumi.Input[str] pemfilepath: The full path and file name of the private key used for authentication. This location will be automatically selected on the BDS local file system.
452
504
  :param pulumi.Input[str] state: The current status of the API key.
@@ -464,6 +516,7 @@ class BdsInstanceApiKey(pulumi.CustomResource):
464
516
 
465
517
  __props__.__dict__["bds_instance_id"] = bds_instance_id
466
518
  __props__.__dict__["default_region"] = default_region
519
+ __props__.__dict__["domain_ocid"] = domain_ocid
467
520
  __props__.__dict__["fingerprint"] = fingerprint
468
521
  __props__.__dict__["key_alias"] = key_alias
469
522
  __props__.__dict__["passphrase"] = passphrase
@@ -479,6 +532,7 @@ class BdsInstanceApiKey(pulumi.CustomResource):
479
532
  def bds_instance_id(self) -> pulumi.Output[str]:
480
533
  """
481
534
  The OCID of the cluster.
535
+ <<<<<<< ours
482
536
  """
483
537
  return pulumi.get(self, "bds_instance_id")
484
538
 
@@ -490,6 +544,14 @@ class BdsInstanceApiKey(pulumi.CustomResource):
490
544
  """
491
545
  return pulumi.get(self, "default_region")
492
546
 
547
+ @property
548
+ @pulumi.getter(name="domainOcid")
549
+ def domain_ocid(self) -> pulumi.Output[str]:
550
+ """
551
+ Identity domain OCID , where user is present. For default domain , this field will be optional.
552
+ """
553
+ return pulumi.get(self, "domain_ocid")
554
+
493
555
  @property
494
556
  @pulumi.getter
495
557
  def fingerprint(self) -> pulumi.Output[str]:
@@ -503,6 +565,7 @@ class BdsInstanceApiKey(pulumi.CustomResource):
503
565
  def key_alias(self) -> pulumi.Output[str]:
504
566
  """
505
567
  User friendly identifier used to uniquely differentiate between different API keys associated with this Big Data Service cluster. Only ASCII alphanumeric characters with no spaces allowed.
568
+ >>>>>>> theirs
506
569
  """
507
570
  return pulumi.get(self, "key_alias")
508
571