Skip to content

Commit dd2e646

Browse files
authored
Merge pull request #2230 from oracle/release_gh
Releasing version 6.15.0
2 parents f000974 + b231ef9 commit dd2e646

File tree

611 files changed

+30412
-2005
lines changed

Some content is hidden

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

611 files changed

+30412
-2005
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
## 6.15.0 (October 23, 2024)
2+
3+
### Added
4+
- Support for FSS Resource Locking
5+
- Support for ADB-S: Customer Managed Keys via Azure Key Vault and AWS KMS
6+
- Compute support for ZPR
7+
- nlb-cp zpr support
8+
- Support for Add DB 23ai support to Globally Distributed Autonomous Database
9+
- Support for OCI Data Science Model Store Backup and Retention
10+
- Support for FC Redundancy Project
11+
12+
### Bug Fix
13+
- For the ACD Version selection using env variable and vmNetwork should not consider state for calculating hash
14+
- Fixed the timestamp issue to corrected form
15+
116
## 6.14.0 (October 16, 2024)
217

318
### Added

examples/compute/instance/instance.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,11 @@ resource "oci_core_instance" "test_instance" {
153153
"freeformkey${count.index}" = "freeformvalue${count.index}"
154154
}
155155

156+
security_attributes = {
157+
"oracle-zpr.sensitivity.value" = "low"
158+
"oracle-zpr.sensitivity.mode" = "enforce"
159+
}
160+
156161
preemptible_instance_config {
157162
preemption_action {
158163
type = "TERMINATE"

examples/compute/vnic/vnic.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ resource "oci_core_instance" "test_instance" {
9494
create_vnic_details {
9595
subnet_id = oci_core_subnet.test_subnet.id
9696
hostname_label = "testinstance"
97+
98+
security_attributes = {
99+
"oracle-zpr.sensitivity.value" = "low"
100+
"oracle-zpr.sensitivity.mode" = "enforce"
101+
}
97102
}
98103

99104
metadata = {
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
variable "tenancy_ocid" {
5+
}
6+
7+
variable "user_ocid" {
8+
}
9+
10+
variable "fingerprint" {
11+
}
12+
13+
variable "private_key_path" {
14+
}
15+
16+
variable "region" {
17+
}
18+
19+
variable "compartment_ocid" {
20+
}
21+
22+
provider "oci" {
23+
tenancy_ocid = var.tenancy_ocid
24+
user_ocid = var.user_ocid
25+
fingerprint = var.fingerprint
26+
private_key_path = var.private_key_path
27+
region = var.region
28+
}
29+
30+
resource "oci_database_autonomous_database" "test_autonomous_database" {
31+
admin_password = "BEstrO0ng_#11"
32+
compartment_id = var.compartment_ocid
33+
cpu_core_count = "1"
34+
data_storage_size_in_tbs = "1"
35+
db_name = "Xsk5djnfdl23423"
36+
db_version = "19c"
37+
db_workload = "AJD"
38+
license_model = "LICENSE_INCLUDED"
39+
encryption_key {
40+
autonomous_database_provider = "ORACLE_MANAGED"
41+
}
42+
}
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
variable "tenancy_ocid" {
2+
}
3+
4+
variable "user_ocid" {
5+
}
6+
7+
variable "fingerprint" {
8+
}
9+
10+
variable "private_key_path" {
11+
}
12+
13+
variable "region" {
14+
}
15+
16+
provider "oci" {
17+
tenancy_ocid = var.tenancy_ocid
18+
user_ocid = var.user_ocid
19+
fingerprint = var.fingerprint
20+
private_key_path = var.private_key_path
21+
region = var.region
22+
}
23+
24+
resource "oci_database_autonomous_database" "autonomous_database" {
25+
#required
26+
admin_password = "Ka2P7jb1_3?*##DZ"
27+
compartment_id = "ocid1.tenancy.oc1..aaaaaaaayxnndmkzcpajuuptcojciksbdrlwofhbe3hve6lypcqfgx56ssva"
28+
cpu_core_count = "6"
29+
data_storage_size_in_tbs = "1"
30+
db_name = "testdbScheduledOperations"
31+
customer_contacts {
32+
email = "test1@oracle.com"
33+
}
34+
customer_contacts {
35+
email = "test2@oracle.com"
36+
}
37+
scheduled_operations {
38+
day_of_week {
39+
name = "MONDAY"
40+
}
41+
scheduled_start_time = "10:00"
42+
scheduled_stop_time = "18:00"
43+
}
44+
scheduled_operations {
45+
day_of_week {
46+
name = "TUESDAY"
47+
}
48+
scheduled_start_time = "10:00"
49+
scheduled_stop_time = "18:00"
50+
}
51+
scheduled_operations {
52+
day_of_week {
53+
name = "FRIDAY"
54+
}
55+
scheduled_start_time = "10:00"
56+
scheduled_stop_time = "18:00"
57+
}
58+
}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Overview
2-
This is a Terraform configuration that creates the Globally Distributed Database service on Oracle Cloud Infrastructure.
2+
This is a Terraform configuration that creates the Globally Distributed Database 19c service on Oracle Cloud Infrastructure.

examples/globally_distributed_database/oci_globally_distributed_database_private_endpoints.tf renamed to examples/globally_distributed_database/globally_distributed_database_19c/oci_globally_distributed_database_private_endpoints.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,10 @@ resource "oci_globally_distributed_database_private_endpoint" "this" {
99
description = "Test OCI Globally Distributed Database Private Endpoint"
1010
#freeform_tags = var.oci_globally_distributed_database_freeform_tags
1111
nsg_ids = var.nsg_ocids
12+
13+
lifecycle {
14+
ignore_changes = [
15+
sharded_databases,
16+
]
17+
}
1218
}

examples/globally_distributed_database/outputs.tf renamed to examples/globally_distributed_database/globally_distributed_database_19c/outputs.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ output "oci_globally_distributed_database_sharded_database_non_secret" {
1111
oci_globally_distributed_database_sharded_database = {
1212
catalog_details = [
1313
for catalog_detail in oci_globally_distributed_database_sharded_database.this.catalog_details : {
14-
admin_password = nonsensitive(catalog_detail.admin_password)
14+
//admin_password = nonsensitive(catalog_detail.admin_password)
1515
cloud_autonomous_vm_cluster_id = catalog_detail.cloud_autonomous_vm_cluster_id
1616
compute_count = catalog_detail.compute_count
1717
container_database_id = catalog_detail.container_database_id
@@ -58,7 +58,7 @@ output "oci_globally_distributed_database_sharded_database_non_secret" {
5858
private_endpoint = oci_globally_distributed_database_sharded_database.this.private_endpoint
5959
shard_details = [
6060
for shard_detail in oci_globally_distributed_database_sharded_database.this.shard_details : {
61-
admin_password = nonsensitive(shard_detail.admin_password)
61+
//admin_password = nonsensitive(shard_detail.admin_password)
6262
cloud_autonomous_vm_cluster_id = shard_detail.cloud_autonomous_vm_cluster_id
6363
compute_count = shard_detail.compute_count
6464
container_database_id = shard_detail.container_database_id
@@ -94,6 +94,7 @@ output "oci_globally_distributed_database_sharded_database_non_secret" {
9494
data_source_sharded_database = data.oci_globally_distributed_database_sharded_database.this
9595
data_source_sharded_databases = data.oci_globally_distributed_database_sharded_databases.this
9696
}
97+
sensitive = true
9798
}
9899

99100
output "oci_globally_distributed_database_sharded_database" {

0 commit comments

Comments
 (0)