Skip to content

Commit 677e6e4

Browse files
authored
Releasing version 6.0.0
Releasing version 6.0.0
2 parents a9ce84b + 2a5a1a9 commit 677e6e4

File tree

343 files changed

+19866
-14263
lines changed

Some content is hidden

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

343 files changed

+19866
-14263
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions

examples/database/db_systems/db_vm/db_vm_amd/main.tf

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ variable "db_admin_password" {
5555
}
5656

5757
variable "db_version" {
58-
default = "19.0.0.0"
58+
default = "19.24.0.0"
5959
}
6060

6161
variable "db_disk_redundancy" {
@@ -146,17 +146,13 @@ data "oci_database_databases" "databases" {
146146
db_home_id = data.oci_database_db_homes.db_homes.db_homes[0].db_home_id
147147
}
148148

149-
d
150-
151-
152-
153-
ata "oci_database_db_versions" "test_db_versions_by_db_system_id" {
149+
data "oci_database_db_versions" "test_db_versions_by_db_system_id" {
154150
compartment_id = var.compartment_ocid
155151
db_system_id = oci_database_db_system.test_db_system.id
156152
}
157153

158154
resource "oci_database_backup" "test_backup" {
159-
database_id = "${data.oci_database_databases.databases.databases.0.id}"
155+
database_id = data.oci_database_databases.databases.databases.0.id
160156
display_name = "Monthly Backup"
161157
}
162158

@@ -303,6 +299,7 @@ resource "oci_database_db_system" "test_db_system" {
303299
# kms_key_id = var.kms_key_id
304300
# vault_id = var.vault_id
305301
db_name = "aTFdbVm"
302+
db_unique_name = "aTFdbVm_xyz"
306303
character_set = var.character_set
307304
ncharacter_set = var.n_character_set
308305
db_workload = var.db_workload
@@ -313,7 +310,7 @@ resource "oci_database_db_system" "test_db_system" {
313310
}
314311
}
315312

316-
db_version = "19.15.0.0"
313+
db_version = "19.24.0.0"
317314
display_name = "MyTFDBHomeVm"
318315
}
319316

@@ -360,12 +357,12 @@ resource "oci_database_db_system" "db_system_bkup" {
360357
display_name = "tfDbSystemFromBackupWithCustImg"
361358

362359
db_home {
363-
db_version = "19.15.0.0"
360+
db_version = "19.24.0.0"
364361
# database_software_image_id = var.test_database_software_image_ocid
365362
database {
366363
admin_password = "BEstrO0ng_#11"
367364
backup_tde_password = "BEstrO0ng_#11"
368-
backup_id = "${oci_database_backup.test_backup.id}"
365+
backup_id = oci_database_backup.test_backup.id
369366
db_name = "dbback"
370367
}
371368
}

examples/jms/fleet_advanced_feature_configuration/main.tf

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,21 @@ variable "fleet_id" {
1111
default = "example-fleet-id"
1212
}
1313

14+
variable "analytic_bucket_name" {
15+
default= "example-analytic-bucket-name"
16+
}
17+
18+
variable "analytic_namespace" {
19+
default= "example-analytic-namespace"
20+
}
21+
22+
variable "log_group_ocid" {
23+
default = "example-log-group-id"
24+
}
25+
26+
variable "inventory_log_ocid" {
27+
default = "example-inventory-log-id"
28+
}
1429
provider "oci" {
1530
tenancy_ocid = var.tenancy_ocid
1631
user_ocid = var.user_ocid
@@ -19,6 +34,68 @@ provider "oci" {
1934
region = var.region
2035
}
2136

37+
resource "oci_jms_fleet_advanced_feature_configuration" "example_fleet_advanced_feature_configuration" {
38+
#Required
39+
fleet_id = var.fleet_id
40+
41+
#Optional
42+
advanced_usage_tracking {
43+
is_enabled = "false"
44+
}
45+
analytic_bucket_name = var.analytic_bucket_name
46+
analytic_namespace = var.analytic_namespace
47+
crypto_event_analysis {
48+
is_enabled = "false"
49+
summarized_events_log {
50+
log_group_id = var.log_group_ocid
51+
log_id = var.inventory_log_ocid
52+
}
53+
}
54+
java_migration_analysis {
55+
is_enabled = "false"
56+
}
57+
jfr_recording {
58+
is_enabled = "false"
59+
}
60+
lcm {
61+
is_enabled = "false"
62+
post_installation_actions {
63+
add_logging_handler = "false"
64+
disabled_tls_versions = ["TLS_1_0"]
65+
global_logging_level = "ALL"
66+
minimum_key_size_settings {
67+
certpath {
68+
key_size = "2048"
69+
name = "RSA"
70+
}
71+
jar {
72+
key_size = "2048"
73+
name = "RSA"
74+
}
75+
tls {
76+
key_size = "2048"
77+
name = "RSA"
78+
}
79+
}
80+
proxies {
81+
ftp_proxy_host = "ftpProxyHost"
82+
ftp_proxy_port = "10"
83+
http_proxy_host = "httpProxyHost"
84+
http_proxy_port = "10"
85+
https_proxy_host = "httpsProxyHost"
86+
https_proxy_port = "10"
87+
socks_proxy_host = "socksProxyHost"
88+
socks_proxy_port = "10"
89+
use_system_proxies = "false"
90+
}
91+
should_replace_certificates_operating_system = "false"
92+
}
93+
}
94+
performance_tuning_analysis {
95+
is_enabled = "false"
96+
}
97+
}
98+
2299
data "oci_jms_fleet_advanced_feature_configuration" "test_fleet_advanced_feature_configuration" {
23100
#Required
24101
fleet_id = var.fleet_id
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
// It needs to be run against the destination region, for example,
2+
// if mysql/main.tf created the backup in IAD, and the copy should go to PHX,
3+
// then this needs to be run against the PHX endpoint.
4+
5+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
6+
// Licensed under the Mozilla Public License v2.0
7+
8+
variable "tenancy_ocid" {
9+
}
10+
11+
variable "user_ocid" {
12+
}
13+
14+
variable "fingerprint" {
15+
}
16+
17+
variable "private_key_path" {
18+
}
19+
20+
variable "region" {
21+
// Define the region where destination backup will be created.
22+
// Example: region = "us-phoenix-1"
23+
}
24+
25+
variable "source_region" {
26+
// Define the region where the source backup is created.
27+
// Example: source_region = "us-ashburn-1"
28+
}
29+
30+
variable "source_backup_id" {
31+
// Define the source backup ID to be copied when using resource
32+
// oci_mysql_mysql_backup.test_mysql_backup_cross_region_backup_copy
33+
}
34+
35+
variable "compartment_ocid" {
36+
}
37+
38+
provider "oci" {
39+
tenancy_ocid = var.tenancy_ocid
40+
user_ocid = var.user_ocid
41+
fingerprint = var.fingerprint
42+
private_key_path = var.private_key_path
43+
region = var.region
44+
}
45+
46+
resource "oci_mysql_mysql_backup" "test_mysql_backup_cross_region_backup_copy" {
47+
# Required
48+
source_details {
49+
region = var.source_region
50+
backup_id = var.source_backup_id
51+
compartment_id = var.compartment_ocid
52+
}
53+
54+
# Optional
55+
display_name = "CrossRegionBackupCopy"
56+
description = "test backup copy created by terraform"
57+
}

examples/mysql/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ variable "private_key_path" {
1313
}
1414

1515
variable "region" {
16-
}
16+
// Define the region where destination backup will be created.
17+
}
1718

1819
variable "compartment_ocid" {
1920
}

examples/zips/adm.zip

0 Bytes
Binary file not shown.

examples/zips/aiAnomalyDetection.zip

0 Bytes
Binary file not shown.

examples/zips/aiDocument.zip

0 Bytes
Binary file not shown.

examples/zips/aiLanguage.zip

0 Bytes
Binary file not shown.

examples/zips/aiVision.zip

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)