Skip to content

Commit 8131026

Browse files
NagaRajuPasunuriNagaRajuPasunuri
authored
Merge pull request #1970 from oracle/release_gh
Releasing version 5.16.0
2 parents 528beef + fd3584b commit 8131026

File tree

164 files changed

+11217
-428
lines changed

Some content is hidden

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

164 files changed

+11217
-428
lines changed

‎CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 5.16.0 (October 11, 2023)
2+
3+
### Added
4+
- Support for Resource Usage Tracking Enhancement | ADB-C@C
5+
- Support for PDB Mgmt v2
6+
- Support for VCN Flow Logs for Telesis - Network command center
7+
- Support for DIS: Import / Export
8+
- Support for Marketplace Publisher Service, enhance Marketplace and Marketplace Publishing Services
9+
### Bug Fix
10+
- Deprecating OCVS v20200501 API support
11+
- Only trigger recreation while change subnet_id for endpoint config on native vcn cluster
12+
113
## 5.15.0 (October 04, 2023)
214

315
### Added

‎examples/database/exadata_cc/adbd/acd.tf

+5
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,9 @@ resource "oci_database_autonomous_container_database" "autonomous_container_data
2525
patch_model = "RELEASE_UPDATES"
2626
service_level_agreement_type = "STANDARD"
2727
version_preference = "LATEST_RELEASE_UPDATE"
28+
}
29+
30+
data "oci_database_autonomous_container_database_resource_usage" "test_autonomous_container_database_resource_usages" {
31+
#Required
32+
autonomous_container_database_id = oci_database_autonomous_container_database.autonomous_container_database.id
2833
}

‎examples/database/exadata_cc/adbd/datasources.tf

+13
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,17 @@ data "oci_database_autonomous_virtual_machines" "test_autonomous_virtual_machine
2323

2424
#Optional
2525
state = var.autonomous_virtual_machine_state
26+
}
27+
28+
data "oci_database_autonomous_vm_cluster_acd_resource_usages" "test_autonomous_vm_cluster_acd_resource_usages" {
29+
#Required
30+
autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id
31+
32+
#Optional
33+
compartment_id = var.compartment_ocid
34+
}
35+
36+
data "oci_database_autonomous_vm_cluster_resource_usage" "test_autonomous_vm_cluster_resource_usages" {
37+
#Required
38+
autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id
2639
}

‎examples/database/pluggable_databases/LocalClone.tf

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
33

4-
resource "oci_database_pluggable_databases_local_clone" "test_pluggable_databases_local_clone" {
5-
cloned_pdb_name = "NewSalesPdb"
4+
resource "oci_database_pluggable_database" "test_pluggable_databases_local_clone" {
5+
pdb_name = "localClonePdb"
6+
container_database_id = "${data.oci_database_database.t.id}"
67
lifecycle {
78
ignore_changes = ["defined_tags"]
89
}
910
pdb_admin_password = "BEstrO0ng_#11"
10-
pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database.id}"
11-
target_tde_wallet_password = "BEstrO0ng_#11"
11+
tde_wallet_password = "BEstrO0ng_#11"
12+
pdb_creation_type_details {
13+
creation_type = "LOCAL_CLONE_PDB"
14+
source_pluggable_database_id = "${data.oci_database_pluggable_database.test_pluggable_database.id}"
15+
}
1216
}

‎examples/database/pluggable_databases/RemoteClone.tf

+15-8
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,18 @@ resource "oci_database_db_system" "tClone" {
6565
database_edition = "ENTERPRISE_EDITION"
6666
availability_domain = "${data.oci_identity_availability_domains.ADsClone.availability_domains.0.name}"
6767
disk_redundancy = "NORMAL"
68-
shape = "VM.Standard1.1"
68+
shape = "VM.Standard2.1"
6969
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
7070
display_name = "-tf-dbSystem-clone-001"
7171
domain = "${oci_core_subnet.tClone.dns_label}.${oci_core_virtual_network.tClone.dns_label}.oraclevcn.com"
7272
hostname = "myOracleDB" // this will be lowercased server side
7373
data_storage_size_in_gb = "256"
7474
license_model = "LICENSE_INCLUDED"
7575
node_count = "1"
76+
cpu_core_count = "${var.cpu_core_count}"
7677
fault_domains = ["FAULT-DOMAIN-1"]
7778
db_home {
78-
db_version = "12.2.0.1"
79+
db_version = "21.8.0.0"
7980
display_name = "-tf-db-home-clone"
8081
database {
8182
admin_password = "BEstrO0ng_#11"
@@ -132,11 +133,17 @@ data "oci_database_database" "tClone" {
132133
database_id = "${data.oci_database_databases.tClone.databases.0.id}"
133134
}
134135

135-
resource "oci_database_pluggable_databases_remote_clone" "test_pluggable_databases_remote_clone" {
136-
cloned_pdb_name = "NewSalesPdb"
136+
resource "oci_database_pluggable_database" "test_pluggable_databases_remote_clone" {
137+
pdb_name = "pdbRemoteClone"
138+
container_database_id = "${data.oci_database_database.tClone.id}"
139+
tde_wallet_password = "BEstrO0ng_#11"
137140
pdb_admin_password = "BEstrO0ng_#11"
138-
pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database.id}"
139-
source_container_db_admin_password = "BEstrO0ng_#11"
140-
target_container_database_id = "${data.oci_database_database.tClone.id}"
141-
target_tde_wallet_password = "BEstrO0ng_#11"
141+
pdb_creation_type_details {
142+
creation_type = "REMOTE_CLONE_PDB"
143+
refreshable_clone_details { is_refreshable_clone = true }
144+
dblink_username = "DBLINKUSER"
145+
dblink_user_password = "DBLINKPWD"
146+
source_pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database.id}"
147+
source_container_database_admin_password = "BEstrO0ng_#11"
148+
}
142149
}

‎examples/database/pluggable_databases/main.tf

+21-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ resource "oci_database_db_system" "t" {
8686
database_edition = "ENTERPRISE_EDITION"
8787
availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
8888
disk_redundancy = "NORMAL"
89-
shape = "VM.Standard1.1"
89+
shape = "VM.Standard2.1"
90+
cpu_core_count = "${var.cpu_core_count}"
9091
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
9192
display_name = "-tf-dbSystem-001"
9293
domain = "${oci_core_subnet.t.dns_label}.${oci_core_virtual_network.t.dns_label}.oraclevcn.com"
@@ -96,7 +97,7 @@ resource "oci_database_db_system" "t" {
9697
node_count = "1"
9798
fault_domains = ["FAULT-DOMAIN-1"]
9899
db_home {
99-
db_version = "12.2.0.1"
100+
db_version = "21.8.0.0"
100101
display_name = "-tf-db-home"
101102
database {
102103
admin_password = "BEstrO0ng_#11"
@@ -161,3 +162,21 @@ resource "oci_database_pluggable_database" "test_pluggable_database" {
161162
pdb_name = "SalesPdb"
162163
tde_wallet_password = "BEstrO0ng_#11"
163164
}
165+
166+
resource "oci_database_pluggable_database" "test_pluggable_database2" {
167+
container_database_id = "${data.oci_database_database.t.id}"
168+
lifecycle {
169+
ignore_changes = ["defined_tags"]
170+
}
171+
pdb_admin_password = "BEstrO0ng_#11"
172+
pdb_name = "Pdb2"
173+
tde_wallet_password = "BEstrO0ng_#11"
174+
}
175+
176+
data "oci_database_pluggable_database" "test_pluggable_database" {
177+
pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database.id}"
178+
}
179+
180+
data "oci_database_pluggable_database" "test_pluggable_database2" {
181+
pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database2.id}"
182+
}

‎examples/database/pluggable_databases/relocate.tf

+146
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
data "oci_identity_availability_domains" "ADsRelocate" {
5+
compartment_id = "${var.compartment_id}"
6+
}
7+
8+
resource "oci_core_virtual_network" "relocate" {
9+
compartment_id = "${var.compartment_id}"
10+
cidr_block = "10.1.0.0/16"
11+
display_name = "-tf-vcn-clone"
12+
dns_label = "tfvcnclone"
13+
}
14+
15+
resource "oci_core_route_table" "relocate" {
16+
compartment_id = "${var.compartment_id}"
17+
vcn_id = "${oci_core_virtual_network.relocate.id}"
18+
route_rules {
19+
cidr_block = "0.0.0.0/0"
20+
network_entity_id = "${oci_core_internet_gateway.relocate.id}"
21+
}
22+
}
23+
resource "oci_core_internet_gateway" "relocate" {
24+
compartment_id = "${var.compartment_id}"
25+
vcn_id = "${oci_core_virtual_network.relocate.id}"
26+
display_name = "-tf-internet-gateway-clone"
27+
}
28+
29+
resource "oci_core_subnet" "relocate" {
30+
availability_domain = "${data.oci_identity_availability_domains.ADsRelocate.availability_domains.0.name}"
31+
cidr_block = "10.1.20.0/24"
32+
display_name = "TFSubnetClone1"
33+
compartment_id = "${var.compartment_id}"
34+
vcn_id = "${oci_core_virtual_network.relocate.id}"
35+
route_table_id = "${oci_core_route_table.relocate.id}"
36+
dhcp_options_id = "${oci_core_virtual_network.relocate.default_dhcp_options_id}"
37+
security_list_ids = ["${oci_core_virtual_network.relocate.default_security_list_id}"]
38+
dns_label = "tfsubnetclone"
39+
}
40+
resource "oci_core_subnet" "t2Clone" {
41+
availability_domain = "${data.oci_identity_availability_domains.ADsRelocate.availability_domains.0.name}"
42+
cidr_block = "10.1.21.0/24"
43+
display_name = "TFSubnetClone2"
44+
compartment_id = "${var.compartment_id}"
45+
vcn_id = "${oci_core_virtual_network.relocate.id}"
46+
route_table_id = "${oci_core_route_table.relocate.id}"
47+
dhcp_options_id = "${oci_core_virtual_network.relocate.default_dhcp_options_id}"
48+
security_list_ids = ["${oci_core_virtual_network.relocate.default_security_list_id}"]
49+
dns_label = "tfsubnetclone2"
50+
}
51+
resource "oci_core_network_security_group" "test_network_security_group_clone" {
52+
compartment_id = "${var.compartment_id}"
53+
vcn_id = "${oci_core_virtual_network.relocate.id}"
54+
display_name = "displayName"
55+
}
56+
57+
resource "oci_core_network_security_group" "test_network_security_group_clone2" {
58+
compartment_id = "${var.compartment_id}"
59+
vcn_id = "${oci_core_virtual_network.relocate.id}"
60+
}
61+
62+
resource "oci_database_db_system" "relocate" {
63+
compartment_id = "${var.compartment_id}"
64+
subnet_id = "${oci_core_subnet.relocate.id}"
65+
database_edition = "ENTERPRISE_EDITION"
66+
availability_domain = "${data.oci_identity_availability_domains.ADsRelocate.availability_domains.0.name}"
67+
disk_redundancy = "NORMAL"
68+
shape = "VM.Standard2.1"
69+
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
70+
display_name = "-tf-dbSystem-clone-001"
71+
domain = "${oci_core_subnet.relocate.dns_label}.${oci_core_virtual_network.relocate.dns_label}.oraclevcn.com"
72+
hostname = "myOracleDB" // this will be lowercased server side
73+
data_storage_size_in_gb = "256"
74+
license_model = "LICENSE_INCLUDED"
75+
node_count = "1"
76+
cpu_core_count = "${var.cpu_core_count}"
77+
fault_domains = ["FAULT-DOMAIN-1"]
78+
db_home {
79+
db_version = "21.8.0.0"
80+
display_name = "-tf-db-home-clone"
81+
database {
82+
admin_password = "BEstrO0ng_#11"
83+
db_name = "aTFdbC"
84+
character_set = "AL32UTF8"
85+
defined_tags = "${map("example-tag-namespace-all.example-tag", "originalValue")}"
86+
freeform_tags = {"Department" = "Finance"}
87+
ncharacter_set = "AL16UTF16"
88+
db_workload = "OLTP"
89+
pdb_name = "pdbName"
90+
}
91+
}
92+
db_system_options {
93+
storage_management = "LVM"
94+
}
95+
defined_tags = "${map("example-tag-namespace-all.example-tag", "originalValue")}"
96+
freeform_tags = {"Department" = "Finance"}
97+
nsg_ids = ["${oci_core_network_security_group.test_network_security_group_clone.id}"]
98+
lifecycle {
99+
ignore_changes = [
100+
db_home.0.db_version,
101+
defined_tags,
102+
db_home.0.database.0.defined_tags,
103+
]
104+
}
105+
}
106+
data "oci_database_db_systems" "relocate" {
107+
compartment_id = "${var.compartment_id}"
108+
filter {
109+
name = "id"
110+
values = ["${oci_database_db_system.relocate.id}"]
111+
}
112+
}
113+
data "oci_database_db_homes" "relocate" {
114+
compartment_id = "${var.compartment_id}"
115+
db_system_id = "${oci_database_db_system.relocate.id}"
116+
filter {
117+
name = "db_system_id"
118+
values = ["${oci_database_db_system.relocate.id}"]
119+
}
120+
}
121+
data "oci_database_db_home" "relocate" {
122+
db_home_id = "${data.oci_database_db_homes.relocate.db_homes.0.db_home_id}"
123+
}
124+
data "oci_database_databases" "relocate" {
125+
compartment_id = "${var.compartment_id}"
126+
db_home_id = "${data.oci_database_db_homes.relocate.db_homes.0.id}"
127+
filter {
128+
name = "db_name"
129+
values = ["${oci_database_db_system.relocate.db_home.0.database.0.db_name}"]
130+
}
131+
}
132+
data "oci_database_database" "relocate" {
133+
database_id = "${data.oci_database_databases.relocate.databases.0.id}"
134+
}
135+
136+
resource "oci_database_pluggable_databases_local_clone" "test_pluggable_databases_relocate" {
137+
pdb_name = "pdbRelocate"
138+
container_database_id = "${data.oci_database_database.relocate.id}"
139+
tde_wallet_password = "BEstrO0ng_#11"
140+
pdb_admin_password = "BEstrO0ng_#11"
141+
pdb_creation_type_details {
142+
creation_type = "RELOCATE"
143+
source_pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database2.id}"
144+
source_container_database_admin_password = "BEstrO0ng_#11"
145+
}
146+
}

‎examples/database/pluggable_databases/variables.tf

+4
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ variable "fingerprint" {
2323
variable defined_tag_namespace_name {
2424
default = ""
2525
}
26+
27+
variable "cpu_core_count" {
28+
default = "2"
29+
}

‎examples/dataintegration/workspace_export_requests/provider.tf

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "region" {
5+
}
6+
7+
variable "tenancy_ocid" {
8+
}
9+
10+
variable "user_ocid" {
11+
}
12+
13+
variable "fingerprint" {
14+
}
15+
16+
variable "private_key_path" {
17+
}
18+
19+
provider "oci" {
20+
region = var.region
21+
tenancy_ocid = var.tenancy_ocid
22+
user_ocid = var.user_ocid
23+
fingerprint = var.fingerprint
24+
private_key_path = var.private_key_path
25+
}

0 commit comments

Comments
 (0)