Skip to content

Commit

Permalink
Merge pull request #1970 from oracle/release_gh
Browse files Browse the repository at this point in the history
Releasing version 5.16.0
  • Loading branch information
NagaRajuPasunuri authored Oct 11, 2023
2 parents 528beef + fd3584b commit 8131026
Show file tree
Hide file tree
Showing 164 changed files with 11,217 additions and 428 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## 5.16.0 (October 11, 2023)

### Added
- Support for Resource Usage Tracking Enhancement | ADB-C@C
- Support for PDB Mgmt v2
- Support for VCN Flow Logs for Telesis - Network command center
- Support for DIS: Import / Export
- Support for Marketplace Publisher Service, enhance Marketplace and Marketplace Publishing Services
### Bug Fix
- Deprecating OCVS v20200501 API support
- Only trigger recreation while change subnet_id for endpoint config on native vcn cluster

## 5.15.0 (October 04, 2023)

### Added
Expand Down
5 changes: 5 additions & 0 deletions examples/database/exadata_cc/adbd/acd.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,9 @@ resource "oci_database_autonomous_container_database" "autonomous_container_data
patch_model = "RELEASE_UPDATES"
service_level_agreement_type = "STANDARD"
version_preference = "LATEST_RELEASE_UPDATE"
}

data "oci_database_autonomous_container_database_resource_usage" "test_autonomous_container_database_resource_usages" {
#Required
autonomous_container_database_id = oci_database_autonomous_container_database.autonomous_container_database.id
}
13 changes: 13 additions & 0 deletions examples/database/exadata_cc/adbd/datasources.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,17 @@ data "oci_database_autonomous_virtual_machines" "test_autonomous_virtual_machine

#Optional
state = var.autonomous_virtual_machine_state
}

data "oci_database_autonomous_vm_cluster_acd_resource_usages" "test_autonomous_vm_cluster_acd_resource_usages" {
#Required
autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id

#Optional
compartment_id = var.compartment_ocid
}

data "oci_database_autonomous_vm_cluster_resource_usage" "test_autonomous_vm_cluster_resource_usages" {
#Required
autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id
}
12 changes: 8 additions & 4 deletions examples/database/pluggable_databases/LocalClone.tf
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
// Licensed under the Mozilla Public License v2.0

resource "oci_database_pluggable_databases_local_clone" "test_pluggable_databases_local_clone" {
cloned_pdb_name = "NewSalesPdb"
resource "oci_database_pluggable_database" "test_pluggable_databases_local_clone" {
pdb_name = "localClonePdb"
container_database_id = "${data.oci_database_database.t.id}"
lifecycle {
ignore_changes = ["defined_tags"]
}
pdb_admin_password = "BEstrO0ng_#11"
pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database.id}"
target_tde_wallet_password = "BEstrO0ng_#11"
tde_wallet_password = "BEstrO0ng_#11"
pdb_creation_type_details {
creation_type = "LOCAL_CLONE_PDB"
source_pluggable_database_id = "${data.oci_database_pluggable_database.test_pluggable_database.id}"
}
}
23 changes: 15 additions & 8 deletions examples/database/pluggable_databases/RemoteClone.tf
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,18 @@ resource "oci_database_db_system" "tClone" {
database_edition = "ENTERPRISE_EDITION"
availability_domain = "${data.oci_identity_availability_domains.ADsClone.availability_domains.0.name}"
disk_redundancy = "NORMAL"
shape = "VM.Standard1.1"
shape = "VM.Standard2.1"
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
display_name = "-tf-dbSystem-clone-001"
domain = "${oci_core_subnet.tClone.dns_label}.${oci_core_virtual_network.tClone.dns_label}.oraclevcn.com"
hostname = "myOracleDB" // this will be lowercased server side
data_storage_size_in_gb = "256"
license_model = "LICENSE_INCLUDED"
node_count = "1"
cpu_core_count = "${var.cpu_core_count}"
fault_domains = ["FAULT-DOMAIN-1"]
db_home {
db_version = "12.2.0.1"
db_version = "21.8.0.0"
display_name = "-tf-db-home-clone"
database {
admin_password = "BEstrO0ng_#11"
Expand Down Expand Up @@ -132,11 +133,17 @@ data "oci_database_database" "tClone" {
database_id = "${data.oci_database_databases.tClone.databases.0.id}"
}

resource "oci_database_pluggable_databases_remote_clone" "test_pluggable_databases_remote_clone" {
cloned_pdb_name = "NewSalesPdb"
resource "oci_database_pluggable_database" "test_pluggable_databases_remote_clone" {
pdb_name = "pdbRemoteClone"
container_database_id = "${data.oci_database_database.tClone.id}"
tde_wallet_password = "BEstrO0ng_#11"
pdb_admin_password = "BEstrO0ng_#11"
pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database.id}"
source_container_db_admin_password = "BEstrO0ng_#11"
target_container_database_id = "${data.oci_database_database.tClone.id}"
target_tde_wallet_password = "BEstrO0ng_#11"
pdb_creation_type_details {
creation_type = "REMOTE_CLONE_PDB"
refreshable_clone_details { is_refreshable_clone = true }
dblink_username = "DBLINKUSER"
dblink_user_password = "DBLINKPWD"
source_pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database.id}"
source_container_database_admin_password = "BEstrO0ng_#11"
}
}
23 changes: 21 additions & 2 deletions examples/database/pluggable_databases/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ resource "oci_database_db_system" "t" {
database_edition = "ENTERPRISE_EDITION"
availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
disk_redundancy = "NORMAL"
shape = "VM.Standard1.1"
shape = "VM.Standard2.1"
cpu_core_count = "${var.cpu_core_count}"
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
display_name = "-tf-dbSystem-001"
domain = "${oci_core_subnet.t.dns_label}.${oci_core_virtual_network.t.dns_label}.oraclevcn.com"
Expand All @@ -96,7 +97,7 @@ resource "oci_database_db_system" "t" {
node_count = "1"
fault_domains = ["FAULT-DOMAIN-1"]
db_home {
db_version = "12.2.0.1"
db_version = "21.8.0.0"
display_name = "-tf-db-home"
database {
admin_password = "BEstrO0ng_#11"
Expand Down Expand Up @@ -161,3 +162,21 @@ resource "oci_database_pluggable_database" "test_pluggable_database" {
pdb_name = "SalesPdb"
tde_wallet_password = "BEstrO0ng_#11"
}

resource "oci_database_pluggable_database" "test_pluggable_database2" {
container_database_id = "${data.oci_database_database.t.id}"
lifecycle {
ignore_changes = ["defined_tags"]
}
pdb_admin_password = "BEstrO0ng_#11"
pdb_name = "Pdb2"
tde_wallet_password = "BEstrO0ng_#11"
}

data "oci_database_pluggable_database" "test_pluggable_database" {
pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database.id}"
}

data "oci_database_pluggable_database" "test_pluggable_database2" {
pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database2.id}"
}
146 changes: 146 additions & 0 deletions examples/database/pluggable_databases/relocate.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
// Licensed under the Mozilla Public License v2.0

data "oci_identity_availability_domains" "ADsRelocate" {
compartment_id = "${var.compartment_id}"
}

resource "oci_core_virtual_network" "relocate" {
compartment_id = "${var.compartment_id}"
cidr_block = "10.1.0.0/16"
display_name = "-tf-vcn-clone"
dns_label = "tfvcnclone"
}

resource "oci_core_route_table" "relocate" {
compartment_id = "${var.compartment_id}"
vcn_id = "${oci_core_virtual_network.relocate.id}"
route_rules {
cidr_block = "0.0.0.0/0"
network_entity_id = "${oci_core_internet_gateway.relocate.id}"
}
}
resource "oci_core_internet_gateway" "relocate" {
compartment_id = "${var.compartment_id}"
vcn_id = "${oci_core_virtual_network.relocate.id}"
display_name = "-tf-internet-gateway-clone"
}

resource "oci_core_subnet" "relocate" {
availability_domain = "${data.oci_identity_availability_domains.ADsRelocate.availability_domains.0.name}"
cidr_block = "10.1.20.0/24"
display_name = "TFSubnetClone1"
compartment_id = "${var.compartment_id}"
vcn_id = "${oci_core_virtual_network.relocate.id}"
route_table_id = "${oci_core_route_table.relocate.id}"
dhcp_options_id = "${oci_core_virtual_network.relocate.default_dhcp_options_id}"
security_list_ids = ["${oci_core_virtual_network.relocate.default_security_list_id}"]
dns_label = "tfsubnetclone"
}
resource "oci_core_subnet" "t2Clone" {
availability_domain = "${data.oci_identity_availability_domains.ADsRelocate.availability_domains.0.name}"
cidr_block = "10.1.21.0/24"
display_name = "TFSubnetClone2"
compartment_id = "${var.compartment_id}"
vcn_id = "${oci_core_virtual_network.relocate.id}"
route_table_id = "${oci_core_route_table.relocate.id}"
dhcp_options_id = "${oci_core_virtual_network.relocate.default_dhcp_options_id}"
security_list_ids = ["${oci_core_virtual_network.relocate.default_security_list_id}"]
dns_label = "tfsubnetclone2"
}
resource "oci_core_network_security_group" "test_network_security_group_clone" {
compartment_id = "${var.compartment_id}"
vcn_id = "${oci_core_virtual_network.relocate.id}"
display_name = "displayName"
}

resource "oci_core_network_security_group" "test_network_security_group_clone2" {
compartment_id = "${var.compartment_id}"
vcn_id = "${oci_core_virtual_network.relocate.id}"
}

resource "oci_database_db_system" "relocate" {
compartment_id = "${var.compartment_id}"
subnet_id = "${oci_core_subnet.relocate.id}"
database_edition = "ENTERPRISE_EDITION"
availability_domain = "${data.oci_identity_availability_domains.ADsRelocate.availability_domains.0.name}"
disk_redundancy = "NORMAL"
shape = "VM.Standard2.1"
ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
display_name = "-tf-dbSystem-clone-001"
domain = "${oci_core_subnet.relocate.dns_label}.${oci_core_virtual_network.relocate.dns_label}.oraclevcn.com"
hostname = "myOracleDB" // this will be lowercased server side
data_storage_size_in_gb = "256"
license_model = "LICENSE_INCLUDED"
node_count = "1"
cpu_core_count = "${var.cpu_core_count}"
fault_domains = ["FAULT-DOMAIN-1"]
db_home {
db_version = "21.8.0.0"
display_name = "-tf-db-home-clone"
database {
admin_password = "BEstrO0ng_#11"
db_name = "aTFdbC"
character_set = "AL32UTF8"
defined_tags = "${map("example-tag-namespace-all.example-tag", "originalValue")}"
freeform_tags = {"Department" = "Finance"}
ncharacter_set = "AL16UTF16"
db_workload = "OLTP"
pdb_name = "pdbName"
}
}
db_system_options {
storage_management = "LVM"
}
defined_tags = "${map("example-tag-namespace-all.example-tag", "originalValue")}"
freeform_tags = {"Department" = "Finance"}
nsg_ids = ["${oci_core_network_security_group.test_network_security_group_clone.id}"]
lifecycle {
ignore_changes = [
db_home.0.db_version,
defined_tags,
db_home.0.database.0.defined_tags,
]
}
}
data "oci_database_db_systems" "relocate" {
compartment_id = "${var.compartment_id}"
filter {
name = "id"
values = ["${oci_database_db_system.relocate.id}"]
}
}
data "oci_database_db_homes" "relocate" {
compartment_id = "${var.compartment_id}"
db_system_id = "${oci_database_db_system.relocate.id}"
filter {
name = "db_system_id"
values = ["${oci_database_db_system.relocate.id}"]
}
}
data "oci_database_db_home" "relocate" {
db_home_id = "${data.oci_database_db_homes.relocate.db_homes.0.db_home_id}"
}
data "oci_database_databases" "relocate" {
compartment_id = "${var.compartment_id}"
db_home_id = "${data.oci_database_db_homes.relocate.db_homes.0.id}"
filter {
name = "db_name"
values = ["${oci_database_db_system.relocate.db_home.0.database.0.db_name}"]
}
}
data "oci_database_database" "relocate" {
database_id = "${data.oci_database_databases.relocate.databases.0.id}"
}

resource "oci_database_pluggable_databases_local_clone" "test_pluggable_databases_relocate" {
pdb_name = "pdbRelocate"
container_database_id = "${data.oci_database_database.relocate.id}"
tde_wallet_password = "BEstrO0ng_#11"
pdb_admin_password = "BEstrO0ng_#11"
pdb_creation_type_details {
creation_type = "RELOCATE"
source_pluggable_database_id = "${oci_database_pluggable_database.test_pluggable_database2.id}"
source_container_database_admin_password = "BEstrO0ng_#11"
}
}
4 changes: 4 additions & 0 deletions examples/database/pluggable_databases/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ variable "fingerprint" {
variable defined_tag_namespace_name {
default = ""
}

variable "cpu_core_count" {
default = "2"
}
25 changes: 25 additions & 0 deletions examples/dataintegration/workspace_export_requests/provider.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
// Licensed under the Mozilla Public License v2.0

variable "region" {
}

variable "tenancy_ocid" {
}

variable "user_ocid" {
}

variable "fingerprint" {
}

variable "private_key_path" {
}

provider "oci" {
region = var.region
tenancy_ocid = var.tenancy_ocid
user_ocid = var.user_ocid
fingerprint = var.fingerprint
private_key_path = var.private_key_path
}
Loading

0 comments on commit 8131026

Please sign in to comment.