Skip to content

Commit dd2e646

Browse files
MaxrovrMaxrovr
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 = {

‎examples/database/adb/encryption_key/autonomous_database_encryption_key.tf

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+
}

‎examples/database/adb/scheduled_operation/autonomous_database_scheduled_operations.tf

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+
}

‎examples/globally_distributed_database/datasources.tf renamed to ‎examples/globally_distributed_database/globally_distributed_database_19c/datasources.tf

File renamed without changes.

‎examples/globally_distributed_database/description.md renamed to ‎examples/globally_distributed_database/globally_distributed_database_19c/description.md

Lines changed: 1 addition & 1 deletion
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/oci_globally_distributed_database_sharded_databases.tf renamed to ‎examples/globally_distributed_database/globally_distributed_database_19c/oci_globally_distributed_database_sharded_databases.tf

File renamed without changes.

‎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" {

‎examples/globally_distributed_database/provider.tf renamed to ‎examples/globally_distributed_database/globally_distributed_database_19c/provider.tf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,5 @@ provider "oci" {
1010
region = var.region
1111
}
1212

13-
provider "local" {
14-
version = ">=1.3.0" # Need this version of the local provider to support base64 encoded inputs
15-
}
13+
1614

‎examples/globally_distributed_database/terraform.auto.tfvars.example renamed to ‎examples/globally_distributed_database/globally_distributed_database_19c/terraform.auto.tfvars.example

File renamed without changes.

‎examples/globally_distributed_database/terraform.tfvars.template renamed to ‎examples/globally_distributed_database/globally_distributed_database_19c/terraform.tfvars.template

File renamed without changes.

‎examples/globally_distributed_database/variables.tf renamed to ‎examples/globally_distributed_database/globally_distributed_database_19c/variables.tf

File renamed without changes.

‎examples/globally_distributed_database/globally_distributed_database_23ai/datasources.tf

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
data "oci_globally_distributed_database_private_endpoint" "this" {
2+
#Required
3+
private_endpoint_id = oci_globally_distributed_database_private_endpoint.this.id
4+
}
5+
6+
data "oci_globally_distributed_database_private_endpoints" "this" {
7+
#Required
8+
compartment_id = oci_globally_distributed_database_private_endpoint.this.compartment_id
9+
10+
#Optional
11+
display_name = oci_globally_distributed_database_private_endpoint.this.display_name
12+
state = oci_globally_distributed_database_private_endpoint.this.state
13+
}
14+
15+
data "oci_globally_distributed_database_sharded_database" "this" {
16+
#Required
17+
sharded_database_id = oci_globally_distributed_database_sharded_database.this.id
18+
19+
#Optional
20+
metadata = "test" //oci_globally_distributed_database_sharded_database.this.metadata
21+
}
22+
23+
data "oci_globally_distributed_database_sharded_databases" "this" {
24+
#Required
25+
compartment_id = oci_globally_distributed_database_sharded_database.this.compartment_id
26+
27+
#Optional
28+
display_name = oci_globally_distributed_database_sharded_database.this.display_name
29+
state = oci_globally_distributed_database_sharded_database.this.state
30+
}

‎examples/globally_distributed_database/globally_distributed_database_23ai/description.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Overview
2+
This is a Terraform configuration that creates the Globally Distributed Database 23ai service on Oracle Cloud Infrastructure.

‎examples/globally_distributed_database/globally_distributed_database_23ai/oci_globally_distributed_database_private_endpoints.tf

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
resource "oci_globally_distributed_database_private_endpoint" "this" {
2+
#Required
3+
compartment_id = var.compartment_ocid
4+
display_name = "GloballyDistributedDB23ai-PrivateEndpoint-Example"
5+
subnet_id = var.subnet_ocid
6+
7+
#Optional
8+
#defined_tags = var.oci_globally_distributed_database_defined_tags_value
9+
description = "Test OCI Globally Distributed Database 23ai Private Endpoint"
10+
#freeform_tags = var.oci_globally_distributed_database_freeform_tags
11+
nsg_ids = var.nsg_ocids
12+
13+
lifecycle {
14+
ignore_changes = [
15+
sharded_databases,
16+
]
17+
}
18+
}

‎examples/globally_distributed_database/globally_distributed_database_23ai/oci_globally_distributed_database_sharded_databases.tf

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
2+
// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved.
3+
// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
4+
// Code generated. DO NOT EDIT.
5+
6+
resource "oci_globally_distributed_database_sharded_database" "this" {
7+
#Required
8+
catalog_details {
9+
#Required
10+
admin_password = var.ogdd_sharded_database_catalog_details_admin_password
11+
cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_catalog_details_cloud_autonomous_vm_cluster_id
12+
compute_count = var.ogdd_sharded_database_catalog_details_compute_count
13+
data_storage_size_in_gbs = var.ogdd_sharded_database_catalog_details_data_storage_size_in_gbs
14+
is_auto_scaling_enabled = var.ogdd_sharded_database_catalog_details_is_auto_scaling_enabled
15+
peer_cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_catalog_details_peer_cloud_autonomous_vm_cluster_id
16+
}
17+
18+
character_set = var.ogdd_sharded_database_character_set
19+
compartment_id = var.compartment_ocid
20+
db_deployment_type = var.ogdd_sharded_database_db_deployment_type
21+
db_version = var.ogdd_sharded_database_db_version
22+
db_workload = var.ogdd_sharded_database_db_workload
23+
display_name = "GloballyDistributedDB23ai-Sharded-Database-Example"
24+
listener_port = var.ogdd_sharded_database_listener_port
25+
listener_port_tls = var.listener_port_tls
26+
ncharacter_set = var.ogdd_sharded_database_ncharacter_set
27+
ons_port_local = var.ogdd_sharded_database_ons_port_local
28+
ons_port_remote = var.ogdd_sharded_database_ons_port_remote
29+
prefix = var.ogdd_sharded_database_prefix
30+
replication_method = var.oci_globally_distributed_database_replication_method
31+
replication_factor = var.oci_globally_distributed_database_replication_factor
32+
replication_unit = var.oci_globally_distributed_database_replication_unit
33+
34+
shard_details {
35+
#Required
36+
admin_password = var.ogdd_sharded_database_shard_details_admin_password
37+
cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_shard_details_cloud_autonomous_vm_cluster_id
38+
compute_count = var.ogdd_sharded_database_shard_details_compute_count
39+
data_storage_size_in_gbs = var.ogdd_sharded_database_shard_details_data_storage_size_in_gbs
40+
is_auto_scaling_enabled = var.ogdd_sharded_database_shard_details_is_auto_scaling_enabled
41+
peer_cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_shard_details_peer_cloud_autonomous_vm_cluster_id
42+
shard_space = var.ogdd_sharded_database_shard_details_shard_space
43+
encryption_key_details {
44+
vault_id = var.vault_id
45+
kms_key_id = var.kms_key_id
46+
kms_key_version_id = var.kms_key_version_id
47+
}
48+
}
49+
50+
shard_details {
51+
#Required
52+
admin_password = var.ogdd_sharded_database_shard_details_admin_password
53+
//cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_shard_details_cloud_autonomous_vm_cluster_id
54+
cloud_autonomous_vm_cluster_id = "ocid of the cluster id"
55+
compute_count = var.ogdd_sharded_database_shard_details_compute_count
56+
data_storage_size_in_gbs = var.ogdd_sharded_database_shard_details_data_storage_size_in_gbs
57+
is_auto_scaling_enabled = var.ogdd_sharded_database_shard_details_is_auto_scaling_enabled
58+
peer_cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_shard_details_peer_cloud_autonomous_vm_cluster_id
59+
shard_space = var.ogdd_sharded_database_shard_details_shard_space
60+
encryption_key_details {
61+
vault_id = var.vault_id
62+
kms_key_id = var.kms_key_id
63+
kms_key_version_id = var.kms_key_version_id
64+
}
65+
}
66+
shard_details {
67+
#Required
68+
admin_password = var.ogdd_sharded_database_shard_details_admin_password
69+
//cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_shard_details_cloud_autonomous_vm_cluster_id
70+
cloud_autonomous_vm_cluster_id = "ocid of the cluster id"
71+
compute_count = var.ogdd_sharded_database_shard_details_compute_count
72+
data_storage_size_in_gbs = var.ogdd_sharded_database_shard_details_data_storage_size_in_gbs
73+
is_auto_scaling_enabled = var.ogdd_sharded_database_shard_details_is_auto_scaling_enabled
74+
peer_cloud_autonomous_vm_cluster_id = var.ogdd_sharded_database_shard_details_peer_cloud_autonomous_vm_cluster_id
75+
shard_space = var.ogdd_sharded_database_shard_details_shard_space
76+
encryption_key_details {
77+
vault_id = var.vault_id
78+
kms_key_id = var.kms_key_id
79+
kms_key_version_id = var.kms_key_version_id
80+
}
81+
}
82+
83+
sharding_method = var.ogdd_sharded_database_sharding_method
84+
chunks = var.ogdd_sharded_database_chunks
85+
cluster_certificate_common_name = var.ogdd_sharded_database_cluster_certificate_common_name
86+
#defined_tags = var.oci_globally_distributed_database_defined_tags_value
87+
#freeform_tags = var.oci_globally_distributed_database_freeform_tags
88+
89+
# POST OPERATIONS
90+
# POST operations will only be performed if the corresponding trigger is not NULL, is != 0 and is greater than the previous value.
91+
92+
configure_sharding_trigger = var.oci_globally_distributed_database_configure_sharding_trigger
93+
download_gsm_certificate_signing_request_trigger = var.oci_globally_distributed_database_download_gsm_certificate_signing_request_trigger
94+
generate_gsm_certificate_signing_request_trigger = var.oci_globally_distributed_database_generate_gsm_certificate_signing_request_trigger
95+
get_connection_string_trigger = var.oci_globally_distributed_database_get_connection_string_trigger
96+
start_database_trigger = var.oci_globally_distributed_database_start_database_trigger
97+
stop_database_trigger = var.oci_globally_distributed_database_stop_database_trigger
98+
validate_network_trigger = var.oci_globally_distributed_database_validate_network_trigger
99+
upload_signed_certificate_and_generate_wallet_trigger = var.oci_globally_distributed_database_upload_signed_certificate_and_generate_wallet
100+
ca_signed_certificate = null//file(var.oci_globally_distributed_database_ca_signed_certificate)
101+
configure_gsms_trigger = var.oci_globally_distributed_database_configure_gsms_trigger
102+
configure_gsms_trigger_old_gsm_names = var.oci_globally_distributed_database_configure_gsms_trigger_old_gsm_names
103+
configure_gsms_trigger_is_latest_gsm_image = var.oci_globally_distributed_database_configure_gsms_trigger_is_latest_gsm_image
104+
generate_wallet_trigger = var.oci_globally_distributed_database_generate_wallet
105+
generate_wallet_password = var.oci_globally_distributed_database_generate_wallet_password
106+
107+
# PATCH Operations
108+
/*
109+
patch_operations {
110+
#Required
111+
operation = var.oci_globally_distributed_database_patch_operation_operation
112+
selection = var.oci_globally_distributed_database_patch_operation_selection
113+
114+
#Optional
115+
value = var.oci_globally_distributed_database_patch_operation_value
116+
}
117+
*/
118+
119+
depends_on = [oci_globally_distributed_database_private_endpoint.this]
120+
}
121+

0 commit comments

Comments
 (0)