Skip to content

Commit e26355e

Browse files
MaxrovrMaxrovr
committed
Merge remote-tracking branch 'bb/master' into release_gh
# Conflicts: # CHANGELOG.md
2 parents b48832f + 29bd4b4 commit e26355e

File tree

600 files changed

+33686
-1321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

600 files changed

+33686
-1321
lines changed

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## 7.8.0 (Unreleased)
2+
3+
### Added
4+
- Support for [Elastic Pool Support for Child Tenancies] Terraform Support in Prod Region ADB-S: Elastic Pool Support for Child Tenancies
5+
- Support for PKCS11 Library Integration for Azure key store | ExaDB-D
6+
- Support for Support for customer-initiated collection of diagnostic information
7+
- Support for AWS for ADBD
8+
- Support for HeatWave Service: Bring Your Own Key (BYOK)
9+
- Support for all DBaaS Verticals to onboard to System Tags| DBAAS Platform
10+
- Support for MultiCloud Data Plane Integration for Database services dbmulticloud changes
11+
### Bug Fix
12+
- Corrected Cloud Database Management Integration Test and added Example Test
13+
114
## 7.7.0 (June 25, 2025)
215

316
### Added

‎examples/database/atp-d/data_sources.tf‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
data "oci_identity_availability_domain" "ad" {
2+
compartment_id = var.compartment_ocid
3+
ad_number = 1
4+
}
5+
6+
data "oci_database_cloud_autonomous_vm_cluster" "test_cloud_autonomous_vm_cluster" {
7+
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
8+
}
9+
10+
data "oci_database_cloud_autonomous_vm_clusters" "test_cloud_autonomous_vm_clusters" {
11+
compartment_id = var.compartment_ocid
12+
}
13+
14+
data "oci_database_autonomous_container_databases" "test_autonomous_container_databases" {
15+
#Required
16+
compartment_id = var.compartment_ocid
17+
18+
#Optional
19+
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
20+
availability_domain = data.oci_identity_availability_domain.ad.name
21+
display_name = "example-container-database"
22+
state = "AVAILABLE"
23+
}
24+
25+
data "oci_database_autonomous_databases" "autonomous_databases" {
26+
#Required
27+
compartment_id = var.compartment_ocid
28+
29+
#Optional
30+
autonomous_container_database_id = oci_database_autonomous_container_database.test_autonomous_container_database.id
31+
display_name = oci_database_autonomous_database.test_autonomous_database.display_name
32+
db_workload = "OLTP"
33+
}
34+
35+
36+
data "oci_database_cloud_exadata_infrastructure_un_allocated_resource" "test_cloud_exadata_infrastructure_un_allocated_resources" {
37+
#Required
38+
cloud_exadata_infrastructure_id = oci_database_cloud_exadata_infrastructure.test_cloud_exadata_infrastructure.id
39+
40+
#Optional
41+
db_servers = var.cloud_exadata_infrastructure_un_allocated_resource_db_servers
42+
}
43+
44+
data "oci_database_autonomous_container_database_resource_usage" "test_autonomous_container_database_resource_usages" {
45+
#Required
46+
autonomous_container_database_id = oci_database_autonomous_container_database.test_autonomous_container_database.id
47+
}
48+
49+
data "oci_database_cloud_autonomous_vm_cluster_acd_resource_usages" "test_cloud_autonomous_vm_cluster_acd_resource_usages" {
50+
#Required
51+
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
52+
53+
#Optional
54+
compartment_id = var.compartment_ocid
55+
}
56+
57+
data "oci_database_cloud_autonomous_vm_cluster_resource_usage" "test_cloud_autonomous_vm_cluster_resource_usages" {
58+
#Required
59+
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
60+
}
61+
62+
data "oci_database_autonomous_database_software_image" "test_autonomous_database_software_image" {
63+
autonomous_database_software_image_id = oci_database_autonomous_database_software_image.autonomous_database_software_image.id
64+
}

‎examples/database/atp-d/exadata.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,4 +166,8 @@ resource "oci_core_network_security_group" "test_network_security_group" {
166166

167167
data "oci_database_cloud_autonomous_vm_cluster" "test_cloud_autonomous_vm_cluster" {
168168
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
169+
}
170+
171+
data "oci_database_cloud_autonomous_vm_clusters" "test_cloud_autonomous_vm_clusters" {
172+
compartment_id = var.compartment_ocid
169173
}

‎examples/database/atp-d/main.tf‎

Lines changed: 3 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

4-
provider "oci" {
5-
tenancy_ocid = var.tenancy_ocid
6-
user_ocid = var.user_ocid
7-
fingerprint = var.fingerprint
8-
private_key_path = var.private_key_path
9-
region = var.region
10-
}
11-
124
resource "oci_database_autonomous_container_database" "test_autonomous_container_database" {
135
#Required
146
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
157
display_name = "example-container-database"
168
patch_model = "RELEASE_UPDATES"
17-
db_version = "19.26.0.1.0"
9+
db_version = var.acd_db_version
1810
db_name = "ACDNAME"
1911

2012
#Optional
@@ -78,7 +70,7 @@ resource "oci_database_autonomous_database_software_image" "autonomous_database_
7870
resource "random_string" "db_unique_name_adsi_acd" {
7971
length = 8
8072
special = false
81-
number = false
73+
numeric = false
8274
}
8375

8476
resource "oci_database_autonomous_container_database" "autonomous_container_database_from_adsi" {
@@ -100,9 +92,6 @@ resource "oci_database_autonomous_container_database" "autonomous_container_data
10092
version_preference = "LATEST_RELEASE_UPDATE"
10193
is_dst_file_update_enabled = false
10294
}
103-
variable "cloud_exadata_infrastructure_un_allocated_resource_db_servers" {
104-
default = []
105-
}
10695

10796
resource "random_string" "autonomous_database_admin_password" {
10897
length = 16
@@ -166,79 +155,12 @@ resource "oci_database_autonomous_database" "test_autonomous_database_developer"
166155
is_dev_tier = "true"
167156
}
168157

169-
data "oci_database_autonomous_container_databases" "test_autonomous_container_databases" {
170-
#Required
171-
compartment_id = var.compartment_ocid
172-
173-
#Optional
174-
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
175-
availability_domain = data.oci_identity_availability_domain.ad.name
176-
display_name = "example-container-database"
177-
state = "AVAILABLE"
178-
}
179-
180-
data "oci_database_autonomous_databases" "autonomous_databases" {
181-
#Required
182-
compartment_id = var.compartment_ocid
183-
184-
#Optional
185-
autonomous_container_database_id = oci_database_autonomous_container_database.test_autonomous_container_database.id
186-
display_name = oci_database_autonomous_database.test_autonomous_database.display_name
187-
db_workload = "OLTP"
188-
}
189-
190-
output "autonomous_database_admin_password" {
191-
value = random_string.autonomous_database_admin_password.result
192-
}
193-
194-
output "autonomous_database_high_connection_string" {
195-
value = lookup(
196-
oci_database_autonomous_database.test_autonomous_database.connection_strings[0].all_connection_strings,
197-
"high",
198-
"unavailable",
199-
)
200-
}
201-
202-
output "autonomous_databases" {
203-
value = data.oci_database_autonomous_databases.autonomous_databases.autonomous_databases
204-
}
205-
206-
output "autonomous_container_databases" {
207-
value = data.oci_database_autonomous_container_databases.test_autonomous_container_databases.autonomous_container_databases
208-
}
209-
210-
data "oci_database_cloud_exadata_infrastructure_un_allocated_resource" "test_cloud_exadata_infrastructure_un_allocated_resources" {
211-
#Required
212-
cloud_exadata_infrastructure_id = oci_database_cloud_exadata_infrastructure.test_cloud_exadata_infrastructure.id
213-
214-
#Optional
215-
db_servers = var.cloud_exadata_infrastructure_un_allocated_resource_db_servers
216-
}
217-
218-
data "oci_database_autonomous_container_database_resource_usage" "test_autonomous_container_database_resource_usages" {
219-
#Required
220-
autonomous_container_database_id = oci_database_autonomous_container_database.test_autonomous_container_database.id
221-
}
222-
223-
data "oci_database_cloud_autonomous_vm_cluster_acd_resource_usages" "test_cloud_autonomous_vm_cluster_acd_resource_usages" {
224-
#Required
225-
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
226-
227-
#Optional
228-
compartment_id = var.compartment_ocid
229-
}
230-
231-
data "oci_database_cloud_autonomous_vm_cluster_resource_usage" "test_cloud_autonomous_vm_cluster_resource_usages" {
232-
#Required
233-
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
234-
}
235-
236158
resource "oci_database_autonomous_container_database" "test_autonomous_container_database_primary" {
237159
#Required
238160
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster_primary.id
239161
display_name = "PrimaryACD"
240162
patch_model = "RELEASE_UPDATES"
241-
db_version = "19.26.0.1.0"
163+
db_version = var.acd_db_version
242164
db_name = "PRIMARY"
243165

244166
#Optional
@@ -304,4 +226,3 @@ resource "oci_database_autonomous_container_database_dataguard_association" "tes
304226
peer_autonomous_container_database_display_name = "StandbyACD"
305227
peer_autonomous_container_database_compartment_id = var.compartment_ocid
306228
}
307-

‎examples/database/atp-d/outputs.tf‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
output "autonomous_database_admin_password" {
2+
value = random_string.autonomous_database_admin_password.result
3+
}
4+
5+
output "autonomous_database_high_connection_string" {
6+
value = lookup(
7+
oci_database_autonomous_database.test_autonomous_database.connection_strings[0].all_connection_strings,
8+
"high",
9+
"unavailable",
10+
)
11+
}
12+
13+
output "autonomous_databases" {
14+
value = data.oci_database_autonomous_databases.autonomous_databases.autonomous_databases
15+
}
16+
17+
output "autonomous_container_databases" {
18+
value = data.oci_database_autonomous_container_databases.test_autonomous_container_databases.autonomous_container_databases
19+
}

‎examples/database/atp-d/providers.tf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
provider "oci" {
2+
tenancy_ocid = var.tenancy_ocid
3+
user_ocid = var.user_ocid
4+
fingerprint = var.fingerprint
5+
private_key_path = var.private_key_path
6+
region = var.region
7+
}

‎examples/database/atp-d/variables.tf‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,18 @@ variable "cloud_exadata_infrastructure_compute_count" {
5151

5252
variable "cloud_exadata_infrastructure_storage_count" {
5353
default = "3"
54+
}
55+
56+
variable "cloud_exadata_infrastructure_un_allocated_resource_db_servers" {
57+
default = []
58+
}
59+
60+
variable "acd_db_version" {
61+
default = "19.26.0.1.0"
62+
}
63+
64+
variable "tenant_subscription_id" {
65+
default = null
66+
variable "cloud_exadata_infrastructure_un_allocated_resource_db_servers" {
67+
default = []
5468
}

‎examples/database/database_software_image/database_software_image.tf‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ variable defined_tag_namespace_name {
2121
default = ""
2222
}
2323

24-
resource "oci_identity_tag_namespace" "tag-namespace1" {
24+
resource "oci_identity_tag_namespace" "tag-namespace" {
2525
#Required
2626
compartment_id = "${var.tenancy_ocid}"
2727
description = "example tag namespace"
@@ -30,20 +30,20 @@ resource "oci_identity_tag_namespace" "tag-namespace1" {
3030
is_retired = false
3131
}
3232

33-
resource "oci_identity_tag" "tag1" {
33+
resource "oci_identity_tag" "tag" {
3434
#Required
3535
description = "example tag"
3636
name = "example-tag"
37-
tag_namespace_id = "${oci_identity_tag_namespace.tag-namespace1.id}"
37+
tag_namespace_id = "${oci_identity_tag_namespace.tag-namespace.id}"
3838

3939
is_retired = false
4040
}
4141

4242
resource "oci_database_database_software_image" "test_database_software_image" {
43-
compartment_id = "${var.compartment_id}"
44-
database_software_image_one_off_patches = ["31113249", "27929509"]
43+
compartment_id = var.compartment_id
44+
database_software_image_one_off_patches = ["31113249", "34672698", "34697081", "37102264", "37213431", "37260974", "37497089"]
4545
database_version = "19.0.0.0"
46-
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}"
46+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace.name}.${oci_identity_tag.tag.name}", "value")}"
4747
display_name = "image1"
4848

4949
freeform_tags = {
@@ -378,5 +378,13 @@ Patch description: "OCW RELEASE UPDATE 19.6.0.0.0 (30489227)"
378378
379379
EOF
380380

381-
patch_set = "19.6.0.0"
381+
patch_set = "19.26.0.0"
382+
}
383+
384+
data "oci_database_database_software_image" "test_database_software_image" {
385+
database_software_image_id = oci_database_database_software_image.test_database_software_image.id
386+
}
387+
388+
data "oci_database_database_software_images" "test_database_software_images" {
389+
compartment_id = var.compartment_id
382390
}

‎examples/database/db_systems/db_exacs/azure/datasources.tf‎

Whitespace-only changes.

‎examples/database/db_systems/db_exacs/azure/provider.tf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
provider "oci" {
5+
tenancy_ocid = var.tenancy_ocid
6+
user_ocid = var.user_ocid
7+
fingerprint = var.fingerprint
8+
private_key_path = var.private_key_path
9+
region = var.region
10+
}

0 commit comments

Comments
 (0)