Skip to content

Commit 8b26b09

Browse files
ravinitpravinitp
authored
Merge pull request #1945 from oracle/release_gh
Releasing version 5.10.0
2 parents 2a4a184 + b03904c commit 8b26b09

File tree

96 files changed

+3965
-125
lines changed

Some content is hidden

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

96 files changed

+3965
-125
lines changed

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 5.10.0 (August 23, 2023)
2+
3+
### Added
4+
Support for BDS - Automated Patching for OS/Kernel, Node Maintenance, Add Master/Utility
5+
Support for Database In-Memory support for Autonomous Database | ADB-D and ADB on ExaC@C
6+
Support for BDS - Cluster Profiles for Kafka
7+
### Bug Fix
8+
Fix reference hashicorp/oci to oracle/oci in some documents
9+
110
## 5.9.0 (August 15, 2023)
211

312
### Added

‎examples/big_data_service/GetOsPatch/main.tf

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
2+
# Need to have this block even though it's empty; for import testing
3+
provider "oci" {
4+
}
5+
6+
variable "tenancy_ocid" {
7+
}
8+
9+
variable "ssh_public_key" {
10+
}
11+
12+
variable "region" {
13+
default = "us-ashburn-1"
14+
}
15+
16+
17+
data "oci_bds_bds_instance_get_os_patch" "test_bds_instance_get_os_patch" {
18+
bds_instance_id = "${oci_bds_bds_instance.test_bds_instance.id}"
19+
os_patch_version = "${var.os_patch_version}"
20+
}
21+
variable "compartment_id" {}
22+
variable "subnet_id" { }
23+
variable "os_patch_version" { default = "ol7.9-x86_64-1.24.0.100-0.0" }
24+
25+
resource "oci_bds_bds_instance" "test_bds_instance" {
26+
cluster_admin_password = "T3JhY2xlVGVhbVVTQSExMjM="
27+
cluster_public_key = "${var.ssh_public_key}"
28+
cluster_version = "ODH1"
29+
compartment_id = "${var.compartment_id}"
30+
compute_only_worker_node {
31+
block_volume_size_in_gbs = "150"
32+
number_of_nodes = "2"
33+
shape = "VM.Standard.E4.Flex"
34+
shape_config {
35+
memory_in_gbs = "32"
36+
ocpus = "3"
37+
}
38+
subnet_id = "${var.subnet_id}"
39+
}
40+
display_name = "displayName"
41+
edge_node {
42+
block_volume_size_in_gbs = "150"
43+
number_of_nodes = "2"
44+
shape = "VM.Standard.E4.Flex"
45+
shape_config {
46+
memory_in_gbs = "32"
47+
ocpus = "3"
48+
}
49+
subnet_id = "${var.subnet_id}"
50+
}
51+
is_high_availability = "true"
52+
is_secure = "true"
53+
master_node {
54+
block_volume_size_in_gbs = "150"
55+
number_of_nodes = "2"
56+
shape = "VM.Standard.E4.Flex"
57+
shape_config {
58+
memory_in_gbs = "32"
59+
ocpus = "3"
60+
}
61+
subnet_id = "${var.subnet_id}"
62+
}
63+
util_node {
64+
block_volume_size_in_gbs = "150"
65+
number_of_nodes = "2"
66+
shape = "VM.Standard.E4.Flex"
67+
shape_config {
68+
memory_in_gbs = "32"
69+
ocpus = "3"
70+
}
71+
subnet_id = "${var.subnet_id}"
72+
}
73+
worker_node {
74+
block_volume_size_in_gbs = "150"
75+
number_of_nodes = "3"
76+
shape = "VM.Standard2.4"
77+
subnet_id = "${var.subnet_id}"
78+
}
79+
}
80+
81+
resource "oci_core_subnet" "test_subnet" {
82+
cidr_block = "10.0.0.0/24"
83+
compartment_id = "${var.compartment_id}"
84+
lifecycle {
85+
ignore_changes = ["defined_tags"]
86+
}
87+
vcn_id = "${oci_core_vcn.test_vcn.id}"
88+
}
89+
90+
resource "oci_core_vcn" "test_vcn" {
91+
cidr_block = "10.0.0.0/16"
92+
compartment_id = "${var.compartment_id}"
93+
lifecycle {
94+
ignore_changes = ["defined_tags"]
95+
}
96+
}

‎examples/big_data_service/ListOsPatch/main.tf

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
2+
# Need to have this block even though it's empty; for import testing
3+
provider "oci" {
4+
}
5+
6+
variable "tenancy_ocid" {
7+
}
8+
9+
variable "ssh_public_key" {
10+
}
11+
12+
variable "region" {
13+
default = "us-ashburn-1"
14+
}
15+
16+
17+
data "oci_bds_bds_instance_list_os_patches" "test_bds_instance_list_os_patches" {
18+
bds_instance_id = "${oci_bds_bds_instance.test_bds_instance.id}"
19+
}
20+
variable "compartment_id" { }
21+
variable "subnet_id" { }
22+
23+
resource "oci_bds_bds_instance" "test_bds_instance" {
24+
cluster_admin_password = "T3JhY2xlVGVhbVVTQSExMjM="
25+
cluster_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpUa4zUZKyU3AkW9yoJTBDO550wpWZOXdHswfRq75gbJ2ZYlMtifvwiO3qUL/RIZSC6e1wA5OL2LQ97UaHrLLPXgjvKGVIDRHqPkzTOayjJ4ZA7NPNhcu6f/OxhKkCYF3TAQObhMJmUSMrWSUeufaRIujDz1HHqazxOgFk09fj4i2dcGnfPcm32t8a9MzlsHSmgexYCUwxGisuuWTsnMgxbqsj6DaY51l+SEPi5tf10iFmUWqziF0eKDDQ/jHkwLJ8wgBJef9FSOmwJReHcBY+NviwFTatGj7Cwtnks6CVomsFD+rAMJ9uzM8SCv5agYunx07hnEXbR9r/TXqgXGfN [email protected]"
26+
cluster_version = "ODH1"
27+
compartment_id = "${var.compartment_id}"
28+
compute_only_worker_node {
29+
block_volume_size_in_gbs = "150"
30+
number_of_nodes = "2"
31+
shape = "VM.Standard.E4.Flex"
32+
shape_config {
33+
memory_in_gbs = "32"
34+
ocpus = "3"
35+
}
36+
subnet_id = "${var.subnet_id}"
37+
}
38+
display_name = "displayName"
39+
edge_node {
40+
block_volume_size_in_gbs = "150"
41+
number_of_nodes = "2"
42+
shape = "VM.Standard.E4.Flex"
43+
shape_config {
44+
memory_in_gbs = "32"
45+
ocpus = "3"
46+
}
47+
subnet_id = "${var.subnet_id}"
48+
}
49+
is_high_availability = "true"
50+
is_secure = "true"
51+
master_node {
52+
block_volume_size_in_gbs = "150"
53+
number_of_nodes = "2"
54+
shape = "VM.Standard.E4.Flex"
55+
shape_config {
56+
memory_in_gbs = "32"
57+
ocpus = "3"
58+
}
59+
subnet_id = "${var.subnet_id}"
60+
}
61+
util_node {
62+
block_volume_size_in_gbs = "150"
63+
number_of_nodes = "2"
64+
shape = "VM.Standard.E4.Flex"
65+
shape_config {
66+
memory_in_gbs = "32"
67+
ocpus = "3"
68+
}
69+
subnet_id = "${var.subnet_id}"
70+
}
71+
worker_node {
72+
block_volume_size_in_gbs = "150"
73+
number_of_nodes = "3"
74+
shape = "VM.Standard2.4"
75+
subnet_id = "${var.subnet_id}"
76+
}
77+
}
78+
79+
resource "oci_core_subnet" "test_subnet" {
80+
cidr_block = "10.0.0.0/24"
81+
compartment_id = "${var.compartment_id}"
82+
lifecycle {
83+
ignore_changes = ["defined_tags"]
84+
}
85+
vcn_id = "${oci_core_vcn.test_vcn.id}"
86+
}
87+
88+
resource "oci_core_vcn" "test_vcn" {
89+
cidr_block = "10.0.0.0/16"
90+
compartment_id = "${var.compartment_id}"
91+
lifecycle {
92+
ignore_changes = ["defined_tags"]
93+
}
94+
}

‎examples/big_data_service/main.tf

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
204204
is_secure = var.bds_instance_is_secure
205205
kms_key_id = var.kms_key_id
206206
cluster_profile = var.cluster_profile
207-
bootstrap_script_url = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/5M6CdCgyfNKcMGvdSIdK20tC9TAf0mVFkMsSlMdmmCaKusIX3DVixBS-_oDhJoxi/n/oraclebigdatadb/b/bootstrap-script-sdk-test/o/bootstrapScriptTemplate1bootstrapScript1.sh"
207+
bootstrap_script_url = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/1hWiiE-2GVzGiKhaBX1zyXVa_jTIu_cU5kDdKTyYS74Wk5xmEA2WKht9NTA2y935/n/oraclebigdatadb/b/bootstrap-script-sdk-test/o/bootstrapScriptTemplate1bootstrapScript1.sh"
208208

209209
master_node {
210210
#Required
@@ -269,6 +269,24 @@ resource "oci_bds_bds_instance" "test_bds_instance" {
269269

270270
is_cloud_sql_configured = false
271271

272+
273+
#Change value to true for use of Kafka cluster
274+
is_kafka_configured = false
275+
276+
#Uncomment kafka_broker_node block for use of Kafka cluster
277+
#kafka_broker_node {
278+
#Required
279+
# shape = var.bds_instance_compute_only_worker_node_shape
280+
281+
# subnet_id = var.subnet_id
282+
# block_volume_size_in_gbs = var.bds_instance_worker_nodes_block_volume_size_in_gbs
283+
# number_of_nodes = 1
284+
# shape_config {
285+
# memory_in_gbs = var.bds_instance_compute_only_worker_memory_per_node
286+
# ocpus = var.bds_instance_compute_only_worker_ocpu_per_node
287+
# }
288+
#}
289+
272290
#Optional
273291
#Uncomment this when running in home region (PHX)
274292
# defined_tags = {

‎examples/database/atp-d/exadata.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ resource "oci_database_cloud_autonomous_vm_cluster" "test_cloud_autonomous_vm_cl
7777
# total_container_databases = 12
7878
compute_model = "ECPU"
7979

80-
//To ignore changes to autonomous_data_storage_size_in_tbs
80+
//To ignore changes to autonomous_data_storage_size_in_tbs and db_servers
8181
lifecycle {
8282
ignore_changes = [
8383
autonomous_data_storage_size_in_tbs,

‎examples/database/atp-d/main.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ resource "oci_database_autonomous_container_database" "test_autonomous_container
1414
cloud_autonomous_vm_cluster_id = oci_database_cloud_autonomous_vm_cluster.test_cloud_autonomous_vm_cluster.id
1515
display_name = "example-container-database"
1616
patch_model = "RELEASE_UPDATES"
17-
db_version = "19.18.0.1.0"
17+
db_version = "19.20.0.1.0"
1818
db_name = "ACDNAME"
1919

2020
#Optional
@@ -74,7 +74,7 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
7474
#Required
7575
admin_password = random_string.autonomous_database_admin_password.result
7676
compartment_id = var.compartment_ocid
77-
compute_count = "1"
77+
compute_count = 8
7878
data_storage_size_in_tbs = "1"
7979
db_name = "atpdb1"
8080

@@ -85,6 +85,7 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
8585
freeform_tags = var.autonomous_database_freeform_tags
8686
is_dedicated = "true"
8787
rotate_key_trigger = "true"
88+
in_memory_percentage = 50
8889
compute_model = "ECPU"
8990
}
9091

‎examples/database/exadata_cc/adbd/acd.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resource "random_string" "db_unique_name" {
66

77
resource "oci_database_autonomous_container_database" "autonomous_container_database" {
88
autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id
9-
db_version = "19.18.0.1.0"
9+
db_version = "19.20.0.1.0"
1010
backup_config {
1111
backup_destination_details {
1212
type = "LOCAL"

‎examples/database/exadata_cc/adbd/adb.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
1010
#Required
1111
admin_password = random_string.autonomous_database_admin_password.result
1212
compartment_id = var.compartment_ocid
13-
ocpu_count = "2"
13+
compute_count = 8
1414
data_storage_size_in_tbs = "1"
1515
db_name = "atpdb1"
1616

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ require (
5353
github.com/mitchellh/mapstructure v1.1.2 // indirect
5454
github.com/mitchellh/reflectwalk v1.0.2 // indirect
5555
github.com/oklog/run v1.0.0 // indirect
56-
github.com/oracle/oci-go-sdk/v65 v65.47.1
56+
github.com/oracle/oci-go-sdk/v65 v65.47.2
5757
github.com/pmezard/go-difflib v1.0.0 // indirect
5858
github.com/sony/gobreaker v0.5.0 // indirect
5959
github.com/ulikunitz/xz v0.5.8 // indirect

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
289289
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
290290
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
291291
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
292-
github.com/oracle/oci-go-sdk/v65 v65.47.1 h1:g+yMS4Lkcu+M+mEUIwMRnbaY0tMyNKhEOTgZ6hX6w/w=
293-
github.com/oracle/oci-go-sdk/v65 v65.47.1/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
292+
github.com/oracle/oci-go-sdk/v65 v65.47.2 h1:tSb37xxw9T3CggDhQMsbLkwqx7v2U3z402Lg/xVLY1Y=
293+
github.com/oracle/oci-go-sdk/v65 v65.47.2/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
294294
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
295295
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
296296
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

‎internal/globalvar/version.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"log"
88
)
99

10-
const Version = "5.9.0"
11-
const ReleaseDate = "2023-08-17"
10+
const Version = "5.10.0"
11+
const ReleaseDate = "2023-08-23"
1212

1313
func PrintVersion() {
1414
log.Printf("[INFO] terraform-provider-oci %s\n", Version)

‎internal/integrationtest/bds_bds_instance_get_os_patch_test.go

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
package integrationtest
5+
6+
import (
7+
"fmt"
8+
"testing"
9+
10+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
11+
12+
"github.com/oracle/terraform-provider-oci/httpreplay"
13+
"github.com/oracle/terraform-provider-oci/internal/acctest"
14+
15+
"github.com/oracle/terraform-provider-oci/internal/utils"
16+
)
17+
18+
var (
19+
BdsBdsInstanceGetOsPatchDataSourceRepresentation = map[string]interface{}{
20+
"bds_instance_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_bds_bds_instance.test_bds_instance.id}`},
21+
"os_patch_version": acctest.Representation{RepType: acctest.Required, Create: `${var.os_patch_version}`},
22+
}
23+
24+
BdsBdsInstanceGetOsPatchResourceConfig = acctest.GenerateResourceFromRepresentationMap("oci_bds_bds_instance", "test_bds_instance", acctest.Required, acctest.Create, bdsInstanceOdhRepresentation) +
25+
acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) +
26+
acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation)
27+
)
28+
29+
// issue-routing-tag: bds/default
30+
func TestBdsBdsInstanceGetOsPatchResource_basic(t *testing.T) {
31+
httpreplay.SetScenario("TestBdsBdsInstanceGetOsPatchResource_basic")
32+
defer httpreplay.SaveScenario()
33+
34+
config := acctest.ProviderTestConfig()
35+
36+
compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
37+
compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
38+
39+
osPatchVersion := utils.GetEnvSettingWithBlankDefault("os_patch_version")
40+
osPatchVersionVariableStr := fmt.Sprintf("variable \"os_patch_version\" { default = \"%s\" }\n", osPatchVersion)
41+
42+
subnetId := utils.GetEnvSettingWithBlankDefault("subnet_ocid")
43+
subnetIdVariableStr := fmt.Sprintf("variable \"subnet_id\" { default = \"%s\" }\n", subnetId)
44+
45+
datasourceName := "data.oci_bds_bds_instance_get_os_patch.test_bds_instance_get_os_patch"
46+
47+
acctest.SaveConfigContent("", "", "", t)
48+
49+
acctest.ResourceTest(t, nil, []resource.TestStep{
50+
// verify datasource
51+
{
52+
Config: config +
53+
acctest.GenerateDataSourceFromRepresentationMap("oci_bds_bds_instance_get_os_patch", "test_bds_instance_get_os_patch", acctest.Required, acctest.Create, BdsBdsInstanceGetOsPatchDataSourceRepresentation) +
54+
compartmentIdVariableStr + subnetIdVariableStr + osPatchVersionVariableStr + BdsBdsInstanceGetOsPatchResourceConfig,
55+
Check: acctest.ComposeAggregateTestCheckFuncWrapper(
56+
resource.TestCheckResourceAttrSet(datasourceName, "bds_instance_id"),
57+
resource.TestCheckResourceAttr(datasourceName, "os_patch_version", "ol7.9-x86_64-1.24.0.100-0.0"),
58+
resource.TestCheckResourceAttrSet(datasourceName, "min_bds_version"),
59+
resource.TestCheckResourceAttrSet(datasourceName, "patch_type"),
60+
resource.TestCheckResourceAttrSet(datasourceName, "release_date"),
61+
),
62+
},
63+
})
64+
}

0 commit comments

Comments
 (0)