Skip to content

Commit fad14b7

Browse files
MaxrovrMaxrovr
authored
Merge pull request #2287 from oracle/release_gh
Releasing version 6.24.0
2 parents 4b6f943 + dfbe08d commit fad14b7

File tree

410 files changed

+19237
-246
lines changed

Some content is hidden

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

410 files changed

+19237
-246
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
## 6.23.0 (Unreleased)
1+
## 6.24.0 (January 29, 2025)
2+
3+
### Added
4+
- Support for External HSM Support ExaDB-C@C
5+
- Support for Ops Insights : Support External MySQL Databases
6+
- Support for DBM : Support External MySQL Databases
7+
- Support for OPSI News Reports - Actionable Insights
8+
- Support DR for cloud native applications running on OKE
9+
### Bug Fix
10+
to use the correct Id for updating options config resource
11+
12+
## 6.23.0 (January 29, 2025)
213

314
### Added
415
- Support for VCNIP - BYOASN (Bring Your Own ASN)

‎GNUmakefile‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,13 @@ check-module-name:
164164
@sh -c "'$(CURDIR)/scripts/gomodnamecheck.sh'"
165165

166166
buildpyEnv:
167-
cd ./terraform-test-resources/dev_tools/teamcity_scripts/python_script; @echo $(SCRIPT_ARG) ; sh run_python_script.sh
167+
cd ./terraform-test-resources/dev_tools/teamcity_scripts/python_script; @echo $(SCRIPT_ARG) ; sh run_python_script.sh
168+
169+
buildpyEnv:
170+
@if [ -d "./terraform-test-resources" ]; then \
171+
cd ./terraform-test-resources/dev_tools/teamcity_scripts/python_script; \
172+
echo $(SCRIPT_ARG); \
173+
sh run_python_script.sh; \
174+
else \
175+
echo "Skipping script execution: terraform-test-resources submodule not found."; \
176+
fi

‎examples/database/exadata_cc/vm_cluster.tf‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ resource "oci_database_vm_cluster" "test_vm_cluster" {
187187
cpu_core_count = "4"
188188
display_name = "testVmCluster"
189189
exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
190-
gi_version = data.oci_database_gi_versions.gi_version.gi_versions.0.version
190+
gi_version = "23.0.0.0.0"
191191
ssh_public_keys = [var.ssh_public_key]
192192
vm_cluster_network_id = oci_database_vm_cluster_network.test_vm_cluster_network.id
193193
db_servers = [data.oci_database_db_servers.test_db_servers.db_servers.0.id, data.oci_database_db_servers.test_db_servers.db_servers.1.id]
@@ -269,7 +269,7 @@ data "oci_database_vm_cluster_recommended_network" "test_vm_cluster_recommended_
269269
resource "oci_database_db_home" "test_db_home_vm_cluster" {
270270
vm_cluster_id = oci_database_vm_cluster.test_vm_cluster.id
271271
source = "VM_CLUSTER_NEW"
272-
db_version = "12.1.0.2"
272+
db_version = "19.0.0.0"
273273
display_name = "createdDbHome"
274274
}
275275

@@ -295,6 +295,11 @@ resource "oci_database_database" "test_exacc_database"{
295295
type = "NFS"
296296
}
297297
}
298+
encryption_key_location_details {
299+
#Required
300+
hsm_password = "hsmPassword"
301+
provider_type = "EXTERNAL"
302+
}
298303
}
299304
db_home_id = oci_database_db_home.test_db_home_vm_cluster.id
300305
source = "NONE"
@@ -339,9 +344,9 @@ data "oci_database_vm_clusters" "test_vm_clusters" {
339344
#Optional
340345
exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
341346
}
342-
347+
/*
343348
resource "local_file" "test_vm_cluster_network_downloaded_config_file" {
344349
content = data.oci_database_vm_cluster_network_download_config_file.test_vm_cluster_network_download_config_file.content
345350
filename = "${path.module}/vm_cluster_config.txt"
346351
}
347-
352+
*/

‎examples/databasemanagement/mysql/external/main.tf‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
variable "tenancy_ocid" {}
2+
variable "user_ocid" {}
3+
variable "fingerprint" {}
4+
variable "private_key_path" {}
5+
variable "region" {}
6+
7+
provider "oci" {
8+
//version = "5.36.0"
9+
tenancy_ocid = var.tenancy_ocid
10+
user_ocid = var.user_ocid
11+
fingerprint = var.fingerprint
12+
private_key_path = var.private_key_path
13+
region = var.region
14+
}
15+
16+
variable "compartment_id" {
17+
default = "ocid1.test.oc1..<unique_ID>EXAMPLE-compartmentId-Value"
18+
}
19+
20+
/*Creates an external MySQL database resource */
21+
resource "oci_database_management_external_my_sql_database" "test_external_my_sql_database" {
22+
#Required
23+
compartment_id = var.compartment_id
24+
db_name = "ExampleNameTest"
25+
}
26+
27+
data "oci_database_management_external_my_sql_databases" "test_external_my_sql_databases" {
28+
#Required
29+
compartment_id = var.compartment_id
30+
31+
#Optional
32+
name = "ExampleNameTest"
33+
}
34+
35+
/*Creates a database connecotor resource. Connector requires an external MySQL database to associate with. */
36+
resource "oci_database_management_external_my_sql_database_connector" "test_external_my_sql_database_connector" {
37+
#Required
38+
compartment_id = "ocid1.test.oc1..<unique_ID>EXAMPLE-compartmentId-Value"
39+
connector_details {
40+
#Required
41+
credential_type = "MYSQL_EXTERNAL_NON_SSL_CREDENTIALS"
42+
display_name = "EXAMPLE-Name-Test"
43+
external_database_id = "ocid1.test.oc1..<unique_ID>EXAMPLE-externalDatabase-Value"
44+
host_name = "exampleHost"
45+
macs_agent_id = "ocid1.test.oc1..<unique_ID>EXAMPLE-agent-Value"
46+
network_protocol = "TCP"
47+
port = "10"
48+
ssl_secret_id = "ocid1.test.oc1..<unique_ID>EXAMPLE-secret-Value"
49+
}
50+
is_test_connection_param = "false"
51+
}
52+
53+
data "oci_database_management_external_my_sql_database_connectors" "test_external_my_sql_database_connectors" {
54+
#Required
55+
compartment_id = var.compartment_id
56+
57+
#Optional
58+
name = "ExampleTest"
59+
}
60+
61+
/*To enable/disable database management, provide an external MySQL database OCID and connector OCID.
62+
"true" to enable and "false" to disable. In this example database management is being enabled for the external MySQL database
63+
using the given connector.*/
64+
resource "oci_database_management_external_my_sql_database_external_mysql_databases_management" "test_external_my_sql_database_external_mysql_databases_management" {
65+
#Required
66+
67+
external_my_sql_database_id = "ocid1.test.oc1..<unique_ID>EXAMPLE-database-Value"
68+
69+
enable_external_mysql_database = "true"
70+
71+
#Optional
72+
connector_id ="ocid1.test.oc1..<unique_ID>EXAMPLE-connector-Value"
73+
}

‎examples/databasemanagement/mysql/main.tf‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
22
// Licensed under the Mozilla Public License v2.0
3-
3+
44
variable "tenancy_ocid" {}
5+
variable "start_time" {}
6+
variable "end_time" {}
57
variable "user_ocid" {}
68
variable "fingerprint" {}
79
variable "private_key_path" {}
810
variable "region" {}
911

1012
provider "oci" {
13+
// version = "5.36.0"
1114
tenancy_ocid = var.tenancy_ocid
1215
user_ocid = var.user_ocid
1316
fingerprint = var.fingerprint
@@ -16,7 +19,8 @@ provider "oci" {
1619
}
1720

1821
variable "compartment_id" {
19-
default = "<compartment.ocid>"
22+
23+
default = "ocid1.test.oc1..<unique_ID>EXAMPLE-compartment-Value"
2024
}
2125

2226
# List managed MySQL database resources in a compartment
@@ -42,6 +46,14 @@ data "oci_database_management_managed_my_sql_database_sql_data" "test_managed_my
4246
#Required
4347
managed_my_sql_database_id = data.oci_database_management_managed_my_sql_databases.test_managed_my_sql_databases.managed_my_sql_database_collection.0.items.0.id
4448
filter_column = "COUNT_STAR"
45-
start_time = replace(timeadd(timestamp(), "-2h"), "/Z/", ".000Z")
46-
end_time = replace(timestamp(), "/Z/", ".000Z")
47-
}
49+
50+
// The start_time and end_time of the time range to retrieve the SQL data of a Managed Database
51+
//in UTC in ISO-8601 format, for example "2024-04-14T17:23:13.000Z".
52+
start_time = var.start_time
53+
end_time = var.end_time
54+
55+
56+
}
57+
58+
59+

‎examples/disaster_recovery/dr_oke/bucket.tf‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
variable "bucket_name" {
2+
default = "testBucketName_1"
3+
}
4+
5+
variable "bucket_namespace" {
6+
default = "ansh8lvru1zp"
7+
}
8+
9+
data "oci_identity_tenancy" "test_tenancy" {
10+
#Required
11+
tenancy_id = var.tenancy_ocid
12+
}
13+
14+
data "oci_objectstorage_namespace" "test_namespace" {
15+
16+
#Optional
17+
compartment_id = var.compartment_id
18+
}
19+
20+
data "oci_objectstorage_bucket" "test_bucket" {
21+
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
22+
name = var.bucket_name
23+
}
24+
25+
data "oci_objectstorage_bucket" "test_member_bucket" {
26+
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
27+
name = "example-bucket-source"
28+
}

‎examples/disaster_recovery/dr_oke/dr_oke.tf‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
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+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "compartment_id" {
10+
default = "ocid1.tenancy.oc1..aaaaaaaahowp4zu5z3p3to5mj7vjtlo7zqi2qmbjiij73vfulltlmvtf624a"
11+
}
12+
variable "disassociate_trigger" {
13+
default = 0
14+
}
15+
16+
variable "dr_protection_group_association_peer_region" {
17+
default = "us-ashburn-1"
18+
}
19+
20+
variable "dr_protection_group_association_role" {
21+
default = "STANDBY"
22+
}
23+
24+
variable "dr_protection_group_defined_tags_value" {
25+
default = "value"
26+
}
27+
28+
variable "dr_protection_group_display_name" {
29+
default = "displayName"
30+
}
31+
32+
variable "dr_protection_group_freeform_tags" {
33+
default = { "Department" = "Finance" }
34+
}
35+
36+
variable "dr_protection_group_members_member_type_oke_cluster" {
37+
default = "OKE_CLUSTER"
38+
}
39+
40+
variable "dr_protection_group_state" {
41+
default = "ACTIVE"
42+
}
43+
44+
provider "oci" {
45+
tenancy_ocid = var.tenancy_ocid
46+
user_ocid = var.user_ocid
47+
fingerprint = var.fingerprint
48+
private_key_path = var.private_key_path
49+
region = var.region
50+
}
51+
52+
resource "oci_disaster_recovery_dr_protection_group" "test_peer" {
53+
#Required
54+
compartment_id = var.compartment_id
55+
display_name = var.dr_protection_group_display_name
56+
log_location {
57+
#Required
58+
bucket = data.oci_objectstorage_bucket.test_bucket.name
59+
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
60+
}
61+
62+
# Add OKE as a member
63+
members {
64+
#Required
65+
member_id = data.oci_containerengine_clusters.test_clusters.clusters[0].id
66+
member_type = var.dr_protection_group_members_member_type_oke_cluster
67+
peer_cluster_id = data.oci_containerengine_clusters.peer_clusters.clusters[0].id
68+
}
69+
}
70+
71+
resource "oci_disaster_recovery_dr_protection_group" "test_dr_protection_group" {
72+
#Required
73+
compartment_id = var.compartment_id
74+
display_name = var.dr_protection_group_display_name
75+
log_location {
76+
#Required
77+
bucket = data.oci_objectstorage_bucket.test_bucket.name
78+
namespace = data.oci_objectstorage_namespace.test_namespace.namespace
79+
}
80+
81+
lifecycle {
82+
ignore_changes = [defined_tags]
83+
}
84+
85+
#Optional
86+
members {
87+
#Required
88+
member_id = data.oci_containerengine_clusters.peer_clusters.clusters[0].id
89+
member_type = var.dr_protection_group_members_member_type_oke_cluster
90+
peer_cluster_id = data.oci_containerengine_clusters.test_clusters.clusters[0].id
91+
}
92+
93+
association {
94+
#Required
95+
role = var.dr_protection_group_association_role
96+
97+
#Optional
98+
peer_id = oci_disaster_recovery_dr_protection_group.test_peer.id
99+
peer_region = var.dr_protection_group_association_peer_region
100+
}
101+
102+
#Optional
103+
disassociate_trigger = var.disassociate_trigger
104+
105+
defined_tags = map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "${var.dr_protection_group_defined_tags_value}")
106+
freeform_tags = var.dr_protection_group_freeform_tags
107+
}
108+
109+
data "oci_disaster_recovery_dr_protection_groups" "test_dr_protection_groups" {
110+
#Required
111+
compartment_id = var.compartment_id
112+
113+
#Optional
114+
display_name = var.dr_protection_group_display_name
115+
dr_protection_group_id = oci_disaster_recovery_dr_protection_group.test_dr_protection_group.id
116+
state = var.dr_protection_group_state
117+
}

‎examples/disaster_recovery/dr_oke/oke_cluster.tf‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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 "primary_cluster_name" {
5+
description = "Primary OKE cluster"
6+
type = string
7+
default = "myCluster"
8+
}
9+
10+
variable "peer_cluster_name" {
11+
description = "Peer OKE cluster"
12+
type = string
13+
default = "peerCluster"
14+
}
15+
16+
data "oci_containerengine_clusters" "test_clusters" {
17+
#Required
18+
compartment_id = var.compartment_id
19+
20+
#Optional
21+
name = var.primary_cluster_name
22+
}
23+
24+
data "oci_containerengine_clusters" "peer_clusters" {
25+
#Required
26+
compartment_id = var.compartment_id
27+
28+
#Optional
29+
name = var.peer_cluster_name
30+
}

0 commit comments

Comments
 (0)