Skip to content

Commit cafd3e8

Browse files
NagaRajuPasunuriNagaRajuPasunuri
authored
Merge pull request #2320 from oracle/release_gh
Releasing version 6.29.0
2 parents 97b6ff8 + d7e4fa4 commit cafd3e8

File tree

274 files changed

+8434
-346
lines changed

Some content is hidden

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

274 files changed

+8434
-346
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 6.29.0 (March 06, 2025)
2+
3+
### Added
4+
- Support for Long-term backup retention Phase 1
5+
- Support for Allow admins to specify user Quotas for their filesystems
6+
- OpenSearch API update for Major version upgrade
7+
- Support for Oracle Database @ Azure in ExaDB-XS service
8+
- Support for Cross Region Replication
9+
- Container Instance : Remoed unsupported COMMAND
10+
111
## 6.28.0 (February 28, 2025)
212

313
### Added

‎examples/database/db_systems/db_exadbxs/exadb_vm_cluster.tf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ resource "oci_database_exadb_vm_cluster" "test_exadb_vm_cluster" {
1414
shape = "EXADBXS"
1515
ssh_public_keys = [var.ssh_public_key]
1616
subnet_id = oci_core_subnet.exadbxs_client_subnet.id
17+
subscription_id = var.subscription_id
1718
backup_subnet_id = oci_core_subnet.exadbxs_backup_subnet.id
1819

1920
node_config {

‎examples/database/db_systems/db_exadbxs/exascale_db_storage_vault.tf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ resource "oci_database_exascale_db_storage_vault" "test_exascale_db_storage_vaul
1010
total_size_in_gbs = 800
1111
}
1212
additional_flash_cache_in_percent = 20
13+
cluster_placement_group_id = var.cpg_id
14+
subscription_id = var.subscription_id
1315
}
1416

1517
data "oci_database_exascale_db_storage_vaults" "test_exascale_db_storage_vaults" {

‎examples/database/db_systems/db_exadbxs/variables.tf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,12 @@ variable "db_name" {
1919

2020
variable "test_db_password" {
2121
default = "BEstrO0ng_#11"
22+
}
23+
24+
variable "cpg_id" {
25+
default = null
26+
}
27+
28+
variable "subscription_id" {
29+
default = null
2230
}

‎examples/database/db_systems/db_vm/db_backup/data.tf‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# $Header$
2+
#
3+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
4+
# NAME
5+
# data.tf - Data Source file
6+
#
7+
# USAGE
8+
# Example & Backward Compatibility Path: database/db_systems/db_vm/db_backup
9+
# NOTES
10+
# Terraform Integration Test: TestDatabaseBackupResource_basic
11+
# FILES
12+
#
13+
# DESCRIPTION
14+
#
15+
# MODIFIED MM/DD/YY
16+
# escabrer 11/1/2024 - Created
17+
18+
19+
data "oci_identity_availability_domains" "test_availability_domains" {
20+
compartment_id = var.tenancy_ocid
21+
}
22+
23+
data "oci_core_services" "test_services" {
24+
filter {
25+
name = "name"
26+
regex = "true"
27+
values = [".*Oracle.*Services.*Network"]
28+
}
29+
}
30+
31+
data "oci_database_db_homes" "test_db_system" {
32+
compartment_id = var.compartment_id
33+
db_system_id = oci_database_db_system.test_db_system.id
34+
filter {
35+
name = "display_name"
36+
values = ["tfDbHome"]
37+
}
38+
}
39+
40+
data "oci_database_databases" "test_db_system" {
41+
compartment_id = var.compartment_id
42+
db_home_id = data.oci_database_db_homes.test_db_system.db_homes.0.db_home_id
43+
}

‎examples/database/db_systems/db_vm/db_backup/main.tf‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# $Header$
2+
#
3+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
4+
# NAME
5+
# main.tf - Resources file
6+
#
7+
# USAGE
8+
# Example & Backward Compatibility Path: database/db_systems/db_vm/db_backup
9+
# NOTES
10+
# Terraform Integration Test: TestDatabaseBackupResource_basic
11+
# FILES
12+
#
13+
# DESCRIPTION
14+
#
15+
# MODIFIED MM/DD/YY
16+
# escabrer 11/1/2024 - Created
17+
18+
19+
resource "oci_recovery_protection_policy" "test_protection_policy" {
20+
display_name = "tfRecoveryServiceSubnetProtectionPolicyExample"
21+
backup_retention_period_in_days = "14"
22+
compartment_id = var.compartment_id
23+
}
24+
25+
resource "oci_recovery_recovery_service_subnet" "test_recovery_service_subnet_registration" {
26+
display_name = "tfRecoveryServiceSubnetRegistrationExample"
27+
compartment_id = var.compartment_id
28+
subnets = [oci_core_subnet.test_private_subnet.id]
29+
vcn_id = oci_core_vcn.test_vcn.id
30+
}
31+
32+
resource "oci_database_db_system" "test_db_system" {
33+
display_name = "tfDbSystemWithDatabaseBackupExample"
34+
availability_domain = data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name
35+
compartment_id = var.compartment_id
36+
cpu_core_count = "2"
37+
data_storage_size_in_gb = "256"
38+
database_edition = "ENTERPRISE_EDITION"
39+
db_home {
40+
database {
41+
admin_password = "BEstrO0ng_#11"
42+
db_backup_config {
43+
auto_backup_enabled = "true"
44+
auto_backup_window = "SLOT_TWO"
45+
backup_deletion_policy = "DELETE_IMMEDIATELY"
46+
backup_destination_details {
47+
dbrs_policy_id = oci_recovery_protection_policy.test_protection_policy.id
48+
type = "DBRS"
49+
}
50+
run_immediate_full_backup = "true"
51+
}
52+
db_name = "tfDb"
53+
}
54+
db_version = "19.0.0.0"
55+
display_name = "tfDbHome"
56+
}
57+
disk_redundancy = "NORMAL"
58+
domain = oci_core_subnet.test_subnet.subnet_domain_name
59+
hostname = "tf-oracle-db"
60+
license_model = "LICENSE_INCLUDED"
61+
node_count = "1"
62+
shape = "VM.Standard2.2"
63+
ssh_public_keys = [var.ssh_public_key]
64+
subnet_id = oci_core_subnet.test_subnet.id
65+
depends_on = [oci_recovery_recovery_service_subnet.test_recovery_service_subnet_registration]
66+
}

‎examples/database/db_systems/db_vm/db_backup/network.tf‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
# $Header$
2+
#
3+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
4+
# NAME
5+
# network.tf - Resources file
6+
#
7+
# USAGE
8+
# Example & Backward Compatibility Path: database/db_systems/db_vm/db_backup
9+
# NOTES
10+
# Terraform Integration Test: TestDatabaseBackupResource_basic
11+
# FILES
12+
#
13+
# DESCRIPTION
14+
#
15+
# MODIFIED MM/DD/YY
16+
# escabrer 11/1/2024 - Created
17+
18+
19+
resource "oci_core_vcn" "test_vcn" {
20+
display_name = "tfVcnForDatabaseBackupExample"
21+
cidr_block = "10.0.0.0/16"
22+
compartment_id = var.compartment_id
23+
dns_label = "tfvcn"
24+
}
25+
26+
resource "oci_core_route_table" "test_route_table" {
27+
display_name = "tfRouteTable"
28+
compartment_id = var.compartment_id
29+
route_rules {
30+
cidr_block = "0.0.0.0/0"
31+
description = "Internal traffic for OCI Services"
32+
network_entity_id = oci_core_internet_gateway.test_internet_gateway.id
33+
}
34+
vcn_id = oci_core_vcn.test_vcn.id
35+
}
36+
37+
resource "oci_core_internet_gateway" "test_internet_gateway" {
38+
display_name = "tfInternetGateway"
39+
compartment_id = var.compartment_id
40+
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")
41+
enabled = "true"
42+
freeform_tags = {
43+
"Department" = "Finance"
44+
}
45+
lifecycle {
46+
ignore_changes = [defined_tags]
47+
}
48+
vcn_id = oci_core_vcn.test_vcn.id
49+
}
50+
51+
resource "oci_core_subnet" "test_subnet" {
52+
display_name = "tfPublicSubnet"
53+
cidr_block = "10.0.0.0/24"
54+
compartment_id = var.compartment_id
55+
dhcp_options_id = oci_core_vcn.test_vcn.default_dhcp_options_id
56+
dns_label = "tfpublicsubnet"
57+
route_table_id = oci_core_route_table.test_route_table.id
58+
security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id]
59+
vcn_id = oci_core_vcn.test_vcn.id
60+
}
61+
62+
resource "oci_core_security_list" "test_private_subnet_security_list" {
63+
display_name = "tfRecoveryServiceSecurityList"
64+
compartment_id = var.compartment_id
65+
egress_security_rules {
66+
destination = "0.0.0.0/0"
67+
protocol = "all"
68+
}
69+
ingress_security_rules {
70+
protocol = "6"
71+
source = "10.0.0.0/16"
72+
source_type = "CIDR_BLOCK"
73+
tcp_options {
74+
min = "8005"
75+
max = "8005"
76+
}
77+
}
78+
ingress_security_rules {
79+
protocol = "6"
80+
source = "10.0.0.0/16"
81+
source_type = "CIDR_BLOCK"
82+
tcp_options {
83+
min = "2484"
84+
max = "2484"
85+
}
86+
}
87+
vcn_id = oci_core_vcn.test_vcn.id
88+
}
89+
90+
resource "oci_core_service_gateway" "test_service_gateway" {
91+
display_name = "tfRecoveryServiceServiceGateway"
92+
compartment_id = var.compartment_id
93+
services {
94+
service_id = data.oci_core_services.test_services.services.0.id
95+
}
96+
vcn_id = oci_core_vcn.test_vcn.id
97+
}
98+
99+
resource "oci_core_route_table" "test_private_subnet_route_table" {
100+
display_name = "tfRecoveryServicePrivateSubnetRouteTable"
101+
compartment_id = var.compartment_id
102+
route_rules {
103+
description = "Recovery Service traffic for OCI Services"
104+
destination = data.oci_core_services.test_services.services[0].cidr_block
105+
destination_type = "SERVICE_CIDR_BLOCK"
106+
network_entity_id = oci_core_service_gateway.test_service_gateway.id
107+
}
108+
vcn_id = oci_core_vcn.test_vcn.id
109+
}
110+
111+
resource "oci_core_subnet" "test_private_subnet" {
112+
display_name = "tfPrivateSubnet"
113+
cidr_block = "10.0.1.0/24"
114+
compartment_id = var.compartment_id
115+
dhcp_options_id = oci_core_vcn.test_vcn.default_dhcp_options_id
116+
dns_label = "tfprivatesubnet"
117+
prohibit_public_ip_on_vnic = "true"
118+
route_table_id = oci_core_route_table.test_private_subnet_route_table.id
119+
security_list_ids = [oci_core_security_list.test_private_subnet_security_list.id]
120+
vcn_id = oci_core_vcn.test_vcn.id
121+
}

‎examples/database/db_systems/db_vm/db_backup/provider.tf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# $Header$
2+
#
3+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
4+
# NAME
5+
# provider.tf - Resources file
6+
#
7+
# USAGE
8+
# Example & Backward Compatibility Path: database/db_systems/db_vm/db_backup
9+
# NOTES
10+
# Terraform Integration Test: TestDatabaseBackupResource_basic
11+
# FILES
12+
#
13+
# DESCRIPTION
14+
#
15+
# MODIFIED MM/DD/YY
16+
# escabrer 11/1/2024 - Created
17+
18+
19+
provider "oci" {
20+
auth = "SecurityToken"
21+
config_file_profile = "terraform-federation-test"
22+
region = var.region
23+
tenancy_ocid = var.compartment_id
24+
}

‎examples/database/db_systems/db_vm/db_backup/tags.tf‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# $Header$
2+
#
3+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
4+
# NAME
5+
# tags.tf - Resources file
6+
#
7+
# USAGE
8+
# Example & Backward Compatibility Path: database/db_systems/db_vm/db_backup
9+
# NOTES
10+
# Terraform Integration Test: TestDatabaseBackupResource_basic
11+
# FILES
12+
#
13+
# DESCRIPTION
14+
#
15+
# MODIFIED MM/DD/YY
16+
# escabrer 11/1/2024 - Created
17+
18+
19+
resource "oci_identity_tag_namespace" "tag-namespace1" {
20+
#Required
21+
compartment_id = var.tenancy_ocid
22+
description = "example tag namespace"
23+
name = var.defined_tag_namespace_name != "" ? var.defined_tag_namespace_name : "example-tag-namespace-all"
24+
25+
is_retired = false
26+
}
27+
28+
resource "oci_identity_tag" "tag1" {
29+
#Required
30+
description = "example tag"
31+
name = "example-tag"
32+
tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
33+
34+
is_retired = false
35+
}

‎examples/database/db_systems/db_vm/db_backup/variables.tf‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# $Header$
2+
#
3+
# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
4+
# NAME
5+
# variables.tf - Resources file
6+
#
7+
# USAGE
8+
# Example & Backward Compatibility Path: database/db_systems/db_vm/db_backup
9+
# NOTES
10+
# Terraform Integration Test: TestDatabaseBackupResource_basic
11+
# FILES
12+
#
13+
# DESCRIPTION
14+
#
15+
# MODIFIED MM/DD/YY
16+
# escabrer 11/1/2024 - Created
17+
18+
19+
variable "tenancy_ocid" {
20+
type = string
21+
}
22+
23+
variable "ssh_public_key" {
24+
type = string
25+
}
26+
27+
variable "region" {
28+
type = string
29+
}
30+
31+
variable "compartment_id" {
32+
type = string
33+
}
34+
35+
variable defined_tag_namespace_name {
36+
default = ""
37+
}

0 commit comments

Comments
 (0)