Skip to content

Commit 7a60c0d

Browse files
authored
Merge pull request #1393 from terraform-providers/release_gh
Releasing version 4.31.0
2 parents 18fbdda + 0e77cd6 commit 7a60c0d

File tree

8,734 files changed

+80228
-73362
lines changed

Some content is hidden

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

8,734 files changed

+80228
-73362
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 4.31.0 (Unreleased)
2+
3+
### Added
4+
- Support for Data Safe target database registration
5+
- Support for Elastic storage for ExaCC
6+
- Support for Migrate VCN status added to container engine
7+
- Support for Spark 3.0 added in data flow
8+
19
## 4.30.0 (June 09, 2021)
210

311
### Added

GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ skip_goimports_check_flag := $(if $(skip_goimports_check), -s, )
1515
## This rule will set GO mod environment variables so that builds/tests are using the vendor folder
1616
## May need to remove this in future so that it doesn't interfere with environment settings of .travis.yml file
1717
gomodenv:
18-
export GO111MODULE=on
18+
export GO111MODULE=off
1919
export GOFLAGS=-mod=vendor
2020

2121
default: build

examples/container_engine/main.tf

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ resource "oci_containerengine_node_pool" "test_node_pool" {
197197

198198
node_source_details {
199199
#Required
200-
image_id = local.oracle_linux_images.0
200+
image_id = local.image_id
201201
source_type = "IMAGE"
202202

203203
#Optional
@@ -219,8 +219,8 @@ resource "oci_containerengine_node_pool" "test_flex_shape_node_pool" {
219219

220220
node_source_details {
221221
#Required
222-
image_id = data.oci_containerengine_node_pool_option.test_node_pool_option.sources[0].image_id
223-
source_type = data.oci_containerengine_node_pool_option.test_node_pool_option.sources[0].source_type
222+
image_id = local.oracle_linux_images.0
223+
source_type = "IMAGE"
224224
}
225225

226226
node_shape_config {
@@ -265,10 +265,22 @@ data "oci_containerengine_node_pool_option" "test_node_pool_option" {
265265
node_pool_option_id = "all"
266266
}
267267

268+
data "oci_core_images" "shape_specific_images" {
269+
#Required
270+
compartment_id = var.tenancy_ocid
271+
shape = "VM.Standard2.1"
272+
}
273+
268274
locals {
275+
all_images = "${data.oci_core_images.shape_specific_images.images}"
269276
all_sources = "${data.oci_containerengine_node_pool_option.test_node_pool_option.sources}"
270277

278+
compartment_images = [for image in local.all_images : image.id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",image.display_name)) > 0 ]
279+
271280
oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",source.source_name)) > 0]
281+
282+
image_id = tolist(setintersection( toset(local.compartment_images), toset(local.oracle_linux_images)))[0]
283+
272284
}
273285

274286
output "cluster_kubernetes_versions" {

examples/container_engine/regional_subnet/datasources.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,22 @@ data "oci_containerengine_node_pool_option" "test_node_pool_option" {
1919
node_pool_option_id = "all"
2020
}
2121

22+
data "oci_core_images" "shape_specific_images" {
23+
#Required
24+
compartment_id = var.tenancy_ocid
25+
shape = "VM.Standard2.1"
26+
}
27+
2228
locals {
29+
all_images = "${data.oci_core_images.shape_specific_images.images}"
2330
all_sources = "${data.oci_containerengine_node_pool_option.test_node_pool_option.sources}"
2431

32+
compartment_images = [for image in local.all_images : image.id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",image.display_name)) > 0 ]
33+
2534
oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",source.source_name)) > 0]
35+
36+
image_id = tolist(setintersection( toset(local.compartment_images), toset(local.oracle_linux_images)))[0]
37+
2638
}
2739

2840
output "cluster_kubernetes_versions" {

examples/container_engine/regional_subnet/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ variable "node_pool_name" {
3838
}
3939

4040
variable "node_pool_node_image_name" {
41-
default = "Oracle-Linux-7.4"
41+
default = "Oracle-Linux-7.6"
4242
}
4343

4444
variable "node_pool_node_shape" {

examples/database/exadata_cc/exadata-infrastructure.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
4545
shape = "ExadataCC.Quarter3.100"
4646
time_zone = "US/Pacific"
4747
activation_file = "activation.zip"
48+
storage_count = 3
49+
compute_count = 2
4850

4951
#Optional
5052
contacts {
Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
// Copyright (c) 2017, 2021, 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_core_vcn" "test_vcn" {
31+
cidr_block = "10.0.0.0/16"
32+
compartment_id = var.compartment_ocid
33+
display_name = "exampleVCN"
34+
dns_label = "tfexamplevcn"
35+
}
36+
37+
resource "oci_core_subnet" "test_subnet" {
38+
cidr_block = "10.0.1.0/24"
39+
display_name = "regionalSubnet"
40+
dns_label = "regionalsubnet"
41+
compartment_id = var.compartment_ocid
42+
vcn_id = oci_core_vcn.test_vcn.id
43+
}
44+
45+
resource "oci_data_safe_data_safe_configuration" "test_data_safe_configuration" {
46+
is_enabled = "true"
47+
}
48+
49+
resource "oci_data_safe_data_safe_private_endpoint" "test_data_safe_private_endpoint" {
50+
compartment_id = var.compartment_ocid
51+
display_name = "PE2"
52+
subnet_id = oci_core_subnet.test_subnet.id
53+
vcn_id = oci_core_vcn.test_vcn.id
54+
}
55+
56+
variable "target_database_description" {
57+
default = "description"
58+
}
59+
60+
variable "target_database_display_name" {
61+
default = "targetDatabase1"
62+
}
63+
64+
resource "random_string" "autonomous_database_admin_password" {
65+
length = 16
66+
min_numeric = 1
67+
min_lower = 1
68+
min_upper = 1
69+
min_special = 1
70+
}
71+
variable "autonomous_database_db_workload" {
72+
default = "OLTP"
73+
}
74+
75+
variable "autonomous_database_freeform_tags" {
76+
default = {
77+
"Department" = "Finance"
78+
}
79+
}
80+
81+
variable "autonomous_database_license_model" {
82+
default = "LICENSE_INCLUDED"
83+
}
84+
85+
resource "oci_database_autonomous_database" "autonomous_database" {
86+
#Required
87+
admin_password = random_string.autonomous_database_admin_password.result
88+
compartment_id = var.compartment_ocid
89+
cpu_core_count = "1"
90+
data_storage_size_in_tbs = "1"
91+
db_name = "adbdb1"
92+
93+
#Optional
94+
db_workload = var.autonomous_database_db_workload
95+
display_name = "example_autonomous_database"
96+
freeform_tags = var.autonomous_database_freeform_tags
97+
is_auto_scaling_enabled = "true"
98+
license_model = var.autonomous_database_license_model
99+
is_preview_version_with_service_terms_accepted = "false"
100+
}
101+
102+
resource "oci_data_safe_target_database" "test_target_database" {
103+
#Required
104+
compartment_id = var.compartment_ocid
105+
display_name = var.target_database_display_name
106+
107+
database_details {
108+
database_type = "AUTONOMOUS_DATABASE"
109+
infrastructure_type = "ORACLE_CLOUD"
110+
autonomous_database_id = oci_database_autonomous_database.autonomous_database.id
111+
}
112+
113+
#Optional
114+
connection_option {
115+
connection_type = "PRIVATE_ENDPOINT"
116+
datasafe_private_endpoint_id = oci_data_safe_data_safe_private_endpoint.test_data_safe_private_endpoint.id
117+
}
118+
description = var.target_database_description
119+
}
120+
121+
data "oci_data_safe_target_databases" "test_target_databases" {
122+
compartment_id = var.compartment_ocid
123+
display_name = var.target_database_display_name
124+
target_database_id = oci_data_safe_target_database.test_target_database.id
125+
}

go.mod

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

go.sum

Lines changed: 2 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/v41 v41.2.0 h1:8uAovOYyZlJn457jeSf6dc1e43XAUznvZExsVXEwnnY=
306-
github.com/oracle/oci-go-sdk/v41 v41.2.0/go.mod h1:qQ7bDSctU2k0g4TmFSq1OgwpUHuaAeZrsePuipbTlHM=
305+
github.com/oracle/oci-go-sdk/v42 v42.0.0 h1:CoZZd07MlhB0sAxohnK+6mJ1dLt5qlipQCKJOSmk8Jo=
306+
github.com/oracle/oci-go-sdk/v42 v42.0.0/go.mod h1:PSCps9JJgMAHCXywUoK5uctMWZ8ns8zfJjkPnCDCMM0=
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=

oci/analytics_analytics_instance_data_source.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88

99
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
10-
oci_analytics "github.com/oracle/oci-go-sdk/v41/analytics"
10+
oci_analytics "github.com/oracle/oci-go-sdk/v42/analytics"
1111
)
1212

1313
func init() {

0 commit comments

Comments
 (0)