Skip to content

Commit 3e2f15f

Browse files
MaxrovrMaxrovr
authored
Releasing version 4.49.0
Releasing version 4.49.0
2 parents b056a6c + ec5cdc0 commit 3e2f15f

File tree

262 files changed

+8915
-136
lines changed

Some content is hidden

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

262 files changed

+8915
-136
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 4.49.0 (Unreleased)
2+
3+
### Added
4+
- Support for Non-CDB to PDB Conversion
5+
- support to provide database software image as user input while creating db system from backup
6+
- Support for db_unique_name and SID for primary and standby in DG association
7+
- Support for Logging Analytics Cedar Release
8+
- Support for VM Node Subsetting
9+
110
## 4.48.0 (October 13, 2021)
211

312
### Added

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ variable "node_count" {
8585
default = "1"
8686
}
8787

88+
variable "test_database_software_image_ocid" {
89+
90+
}
91+
8892
provider "oci" {
8993
tenancy_ocid = var.tenancy_ocid
9094
user_ocid = var.user_ocid
@@ -129,6 +133,11 @@ data "oci_database_db_versions" "test_db_versions_by_db_system_id" {
129133
db_system_id = oci_database_db_system.test_db_system.id
130134
}
131135

136+
resource "oci_database_backup" "test_backup" {
137+
database_id = "${data.oci_database_databases.databases.databases.0.id}"
138+
display_name = "Monthly Backup"
139+
}
140+
132141
data "oci_database_db_system_shapes" "test_db_system_shapes" {
133142
availability_domain = data.oci_identity_availability_domain.ad.name
134143
compartment_id = var.compartment_ocid
@@ -306,3 +315,29 @@ resource "oci_database_db_system" "test_db_system" {
306315
}
307316
}
308317

318+
resource "oci_database_db_system" "db_system_bkup" {
319+
source = "DB_BACKUP"
320+
availability_domain = data.oci_identity_availability_domain.ad.name
321+
compartment_id = var.compartment_ocid
322+
subnet_id = oci_core_subnet.subnet.id
323+
database_edition = var.db_edition
324+
disk_redundancy = var.db_disk_redundancy
325+
shape = var.db_system_shape
326+
ssh_public_keys = [var.ssh_public_key]
327+
hostname = var.hostname
328+
data_storage_size_in_gb = var.data_storage_size_in_gb
329+
license_model = var.license_model
330+
node_count = data.oci_database_db_system_shapes.test_db_system_shapes.db_system_shapes[0]["minimum_node_count"]
331+
display_name = "tfDbSystemFromBackupWithCustImg"
332+
333+
db_home {
334+
db_version = "12.1.0.2"
335+
database_software_image_id = var.test_database_software_image_ocid
336+
database {
337+
admin_password = "BEstrO0ng_#11"
338+
backup_tde_password = "BEstrO0ng_#11"
339+
backup_id = "${oci_database_backup.test_backup.id}"
340+
db_name = "dbback"
341+
}
342+
}
343+
}

‎examples/database/exadata_cc/vm_cluster.tf‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ resource "oci_database_vm_cluster" "test_vm_cluster" {
9090
gi_version = data.oci_database_gi_versions.gi_version.gi_versions.0.version
9191
ssh_public_keys = [var.ssh_public_key]
9292
vm_cluster_network_id = oci_database_vm_cluster_network.test_vm_cluster_network.id
93-
93+
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]
9494
#Optional
9595
defined_tags = {
9696
"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "updatedvalue"
@@ -108,6 +108,12 @@ resource "oci_database_vm_cluster" "test_vm_cluster" {
108108
memory_size_in_gbs = "60"
109109
}
110110

111+
data "oci_database_db_servers" "test_db_servers" {
112+
#Required
113+
compartment_id = var.compartment_id
114+
exadata_infrastructure_id = oci_database_exadata_infrastructure.test_exadata_infrastructure.id
115+
}
116+
111117
data "oci_database_vm_cluster_recommended_network" "test_vm_cluster_recommended_network" {
112118
#Required
113119
compartment_id = var.compartment_id

‎examples/log_analytics/files/TFSource1.zip‎ renamed to ‎examples/log_analytics/import_custom_content/files/TFSource1.zip‎

File renamed without changes.

‎examples/log_analytics/import_custom_content.tf‎ renamed to ‎examples/log_analytics/import_custom_content/import_custom_content.tf‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,30 @@
55
* This example shows how to import custom content
66
*/
77

8+
variable "tenancy_ocid" {}
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
variable "region" {}
14+
15+
provider "oci" {
16+
tenancy_ocid = var.tenancy_ocid
17+
user_ocid = var.user_ocid
18+
fingerprint = var.fingerprint
19+
private_key_path = var.private_key_path
20+
region = var.region
21+
}
22+
23+
# Fetch namespace name from object store GET /n
24+
data "oci_objectstorage_namespace" "ns" {
25+
compartment_id = var.compartment_ocid
26+
}
27+
828
# Create a custom content
929
resource "oci_log_analytics_log_analytics_import_custom_content" "importCustomContentNew" {
1030
namespace = data.oci_objectstorage_namespace.ns.namespace
1131
import_custom_content_file = "./files/TFSource1.zip"
12-
1332
}
1433

1534
# Create a custom content with overwrite false
@@ -26,4 +45,4 @@ resource "oci_log_analytics_log_analytics_import_custom_content" "importCustomCo
2645
namespace = data.oci_objectstorage_namespace.ns.namespace
2746
import_custom_content_file = "./files/TFSource1.zip"
2847
is_overwrite = "true"
29-
}
48+
}

‎examples/log_analytics/object_collection_rule.tf‎ renamed to ‎examples/log_analytics/object_collection_rule/object_collection_rule.tf‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,26 @@
55
* This example shows how to manage log analytics object collection rule resource
66
*/
77

8+
variable "tenancy_ocid" {}
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
variable "region" {}
14+
15+
provider "oci" {
16+
tenancy_ocid = var.tenancy_ocid
17+
user_ocid = var.user_ocid
18+
fingerprint = var.fingerprint
19+
private_key_path = var.private_key_path
20+
region = var.region
21+
}
22+
23+
# Fetch namespace name from object store GET /n
24+
data "oci_objectstorage_namespace" "ns" {
25+
compartment_id = var.compartment_ocid
26+
}
27+
828
variable "log_analytics_log_group_id" {}
929
variable "log_analytics_entity_id" {}
1030
variable "object_collection_rule_bucket_name" {}
@@ -45,6 +65,9 @@ variable "object_collection_rule_char_encoding_override_match_value" {
4565
variable "object_collection_rule_char_encoding_override_property_value" {
4666
default = "utf-16"
4767
}
68+
variable "object_collection_rule_object_name_filter" {
69+
default = "*"
70+
}
4871

4972
# Create a object collection rule with required parameters
5073
resource "oci_log_analytics_log_analytics_object_collection_rule" "objectCollectionRuleRequired" {
@@ -90,6 +113,7 @@ resource "oci_log_analytics_log_analytics_object_collection_rule" "objectCollect
90113
property_name = "logSourceName"
91114
property_value = var.object_collection_rule_log_source_override_property_value
92115
}
116+
object_name_filters = [var.object_collection_rule_object_name_filter]
93117
}
94118

95119
# Get details of above created object collection rule with optional parameters
@@ -102,4 +126,4 @@ data "oci_log_analytics_log_analytics_object_collection_rule" "objectCollectionR
102126
data "oci_log_analytics_log_analytics_object_collection_rules" "objectCollectionRulessList" {
103127
compartment_id = var.compartment_ocid
104128
namespace = data.oci_objectstorage_namespace.ns.namespace
105-
}
129+
}

‎examples/log_analytics/preferences/preferences.tf‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
/*
5+
* This example shows how to import custom content
6+
*/
7+
8+
variable "tenancy_ocid" {}
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
variable "region" {}
14+
15+
provider "oci" {
16+
tenancy_ocid = var.tenancy_ocid
17+
user_ocid = var.user_ocid
18+
fingerprint = var.fingerprint
19+
private_key_path = var.private_key_path
20+
region = var.region
21+
}
22+
23+
# Fetch namespace name from object store GET /n
24+
data "oci_objectstorage_namespace" "ns" {
25+
compartment_id = var.compartment_ocid
26+
}
27+
28+
# Update preferences
29+
resource "oci_log_analytics_log_analytics_preferences_management" "preferences" {
30+
namespace = data.oci_objectstorage_namespace.ns.namespace
31+
items {
32+
name = "DEFAULT_HOMEPAGE"
33+
value = "value1"
34+
}
35+
}
36+
37+
# Fetch updated preferences
38+
data "oci_log_analytics_log_analytics_preference" "preferenceList" {
39+
depends_on = [oci_log_analytics_log_analytics_preferences_management.preferences]
40+
namespace = data.oci_objectstorage_namespace.ns.namespace
41+
}

‎examples/log_analytics/unprocessed_data_bucket/unprocessed_data_bucket.tf‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
/*
5+
* This example shows how to manage log analytics unprocessed data bucket resource
6+
*/
7+
8+
variable "tenancy_ocid" {}
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
variable "region" {}
14+
15+
provider "oci" {
16+
tenancy_ocid = var.tenancy_ocid
17+
user_ocid = var.user_ocid
18+
fingerprint = var.fingerprint
19+
private_key_path = var.private_key_path
20+
region = var.region
21+
}
22+
23+
# Fetch namespace name from object store GET /n
24+
data "oci_objectstorage_namespace" "ns" {
25+
compartment_id = var.compartment_ocid
26+
}
27+
28+
variable "log_analytics_unprocessed_data_bucket_name" {
29+
default = "tf-unprocessed-data-bucket"
30+
}
31+
32+
variable "log_analytics_unprocessed_data_bucket_enabled" {
33+
default = "true"
34+
}
35+
36+
# Create a unprocessed data bucket
37+
resource "oci_log_analytics_log_analytics_unprocessed_data_bucket_management" "unprocessedDataBucket" {
38+
namespace = data.oci_objectstorage_namespace.ns.namespace
39+
bucket = var.log_analytics_unprocessed_data_bucket_name
40+
is_enabled = var.log_analytics_unprocessed_data_bucket_enabled
41+
}
42+
43+
# Get details of above created unprocessed data bucket
44+
data "oci_log_analytics_log_analytics_unprocessed_data_bucket" "unprocessedDataBucketDetails" {
45+
depends_on = [oci_log_analytics_log_analytics_unprocessed_data_bucket_management.unprocessedDataBucket]
46+
namespace = data.oci_objectstorage_namespace.ns.namespace
47+
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
88
github.com/hashicorp/terraform-exec v0.13.3
99
github.com/hashicorp/terraform-plugin-sdk v1.17.2
10-
github.com/oracle/oci-go-sdk/v49 v49.1.0
10+
github.com/oracle/oci-go-sdk/v49 v49.2.0
1111
github.com/stretchr/testify v1.7.0
1212
golang.org/x/mod v0.4.2
1313
gopkg.in/yaml.v2 v2.3.0

‎go.sum‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
302302
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
303303
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
304304
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
305-
github.com/oracle/oci-go-sdk/v49 v49.1.0 h1:hUjdP+BZahIBTjJmdio3/yGCJrcRd+mj06gHx5wnrHo=
306-
github.com/oracle/oci-go-sdk/v49 v49.1.0/go.mod h1:a73341zd+PThjefFMCR7tJZoFy7hqfXx72I1OUPs/pI=
305+
github.com/oracle/oci-go-sdk/v49 v49.2.0 h1:l4PUk81EKdTDD4mDg5wrELpdWFqYeE9KYejfNgtsyUI=
306+
github.com/oracle/oci-go-sdk/v49 v49.2.0/go.mod h1:E8q2DXmXnSozLdXHUFF+o3L2gzcWbiFIPFYOYWdqOfc=
307307
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
308308
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
309309
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -320,6 +320,8 @@ github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNX
320320
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
321321
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
322322
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
323+
github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b h1:br+bPNZsJWKicw/5rALEo67QHs5weyD5tf8WST+4sJ0=
324+
github.com/sony/gobreaker v0.4.2-0.20210216022020-dd874f9dd33b/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
323325
github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
324326
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
325327
github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=

0 commit comments

Comments
 (0)