Skip to content

Commit 22790a9

Browse files
srishtipmishrasrishtipmishra
authored
Merge pull request #1353 from terraform-providers/release_gh
Releasing version 4.23.0
2 parents bc51b13 + 7ecdb2c commit 22790a9

File tree

8,038 files changed

+92756
-71990
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,038 files changed

+92756
-71990
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 4.23.0 (Unreleased)
2+
3+
### Added
4+
- Support for customer option for live migration added to `core_instance` and `core_shape` resources
5+
- Support for `customer_contacts` in autonomous database - shared
6+
- Support for graph_studio_url in `oci_database_autonomous_database`
7+
18
## 4.22.0 (April 14, 2021)
29

310
### Added
@@ -15,6 +22,8 @@
1522
### Fixed
1623
- Fixed functions resource to sync `image_digest` with `image` appropriately
1724
- Removed incorrect document for `oci_data_safe_on_prem_connectors_configuration`. Issue [1344](https://github.com/terraform-providers/terraform-provider-oci/issues/1344)
25+
- Property `ipv6cidr_block` and `ipv6public_cidr_block` are removed from `oci_core_vcn`
26+
- Property `ipv6public_cidr_block` is removed from `oci_core_subnet`
1827

1928
## 4.21.0 (April 07, 2021)
2029

‎examples/database/create_async/exadata.tf‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
4+
resource "oci_core_vcn" "test_vcn" {
5+
compartment_id = var.compartment_ocid
6+
cidr_block = "10.1.0.0/16"
7+
display_name = "TestVcn"
8+
dns_label = "examplevcn"
9+
}
10+
11+
data "oci_identity_availability_domain" "ad" {
12+
compartment_id = var.compartment_ocid
13+
ad_number = 1
14+
}
15+
16+
resource "oci_core_security_list" "exadata_shapes_security_list" {
17+
compartment_id = var.compartment_ocid
18+
vcn_id = oci_core_vcn.test_vcn.id
19+
display_name = "ExadataSecurityList"
20+
21+
ingress_security_rules {
22+
source = "10.1.22.0/24"
23+
protocol = "6"
24+
}
25+
26+
ingress_security_rules {
27+
source = "10.1.22.0/24"
28+
protocol = "1"
29+
}
30+
31+
egress_security_rules {
32+
destination = "10.1.22.0/24"
33+
protocol = "6"
34+
}
35+
36+
egress_security_rules {
37+
destination = "10.1.22.0/24"
38+
protocol = "1"
39+
}
40+
}
41+
42+
resource "oci_core_subnet" "exadata_subnet" {
43+
availability_domain = data.oci_identity_availability_domain.ad.name
44+
cidr_block = "10.1.22.0/24"
45+
display_name = "TestExadataSubnet"
46+
compartment_id = var.compartment_ocid
47+
vcn_id = oci_core_vcn.test_vcn.id
48+
route_table_id = oci_core_vcn.test_vcn.default_route_table_id
49+
dhcp_options_id = oci_core_vcn.test_vcn.default_dhcp_options_id
50+
security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id, oci_core_security_list.exadata_shapes_security_list.id]
51+
dns_label = "subnetexadata"
52+
}
53+
54+
resource "oci_database_autonomous_exadata_infrastructure" "test_autonomous_exadata_infrastructure" {
55+
availability_domain = data.oci_identity_availability_domain.ad.name
56+
compartment_id = var.compartment_ocid
57+
display_name = "TestExadata11"
58+
domain = var.autonomous_exadata_infrastructure_domain
59+
freeform_tags = var.autonomous_database_freeform_tags
60+
license_model = "LICENSE_INCLUDED"
61+
62+
create_async = true
63+
maintenance_window_details {
64+
preference = "CUSTOM_PREFERENCE"
65+
66+
days_of_week {
67+
name = "MONDAY"
68+
}
69+
70+
hours_of_day = ["4"]
71+
72+
months {
73+
name = "JANUARY"
74+
}
75+
76+
months {
77+
name = "APRIL"
78+
}
79+
80+
months {
81+
name = "JULY"
82+
}
83+
84+
months {
85+
name = "OCTOBER"
86+
}
87+
88+
weeks_of_month = ["2"]
89+
}
90+
91+
nsg_ids = [oci_core_network_security_group.test_network_security_group.id]
92+
shape = "Exadata.Quarter2.92"
93+
subnet_id = oci_core_subnet.exadata_subnet.id
94+
}
95+
96+
resource "oci_core_network_security_group" "test_network_security_group" {
97+
#Required
98+
compartment_id = var.compartment_ocid
99+
vcn_id = oci_core_vcn.test_vcn.id
100+
}
101+
102+
data "oci_database_autonomous_exadata_infrastructures" "test_autonomous_exadata_infrastructures" {
103+
availability_domain = data.oci_identity_availability_domain.ad.name
104+
compartment_id = var.compartment_ocid
105+
display_name = "TestExadata"
106+
}
107+
108+
data "oci_database_autonomous_exadata_infrastructure" "test_autonomous_exadata_infrastructure" {
109+
autonomous_exadata_infrastructure_id = oci_database_autonomous_exadata_infrastructure.test_autonomous_exadata_infrastructure.id
110+
}
111+
112+
output "test_autonomous_exadata_infrastructures" {
113+
value = [data.oci_database_autonomous_exadata_infrastructures.test_autonomous_exadata_infrastructures.autonomous_exadata_infrastructures]
114+
}
115+

‎examples/database/create_async/variables.tf‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
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+
variable "autonomous_database_defined_tags_value" {
23+
default = "value"
24+
}
25+
26+
variable "autonomous_database_freeform_tags" {
27+
default = {
28+
"Department" = "Finance"
29+
}
30+
}
31+
32+
variable "autonomous_database_license_model" {
33+
default = "LICENSE_INCLUDED"
34+
}
35+
36+
variable "autonomous_exadata_infrastructure_domain" {
37+
default = "subnetexadata.examplevcn.oraclevcn.com"
38+
}
39+
40+
variable "autonomous_container_database_backup_config_recovery_window_in_days" {
41+
default = 10
42+
}
43+

‎go.mod‎

Lines changed: 1 addition & 5 deletions
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.6.0
88
github.com/hashicorp/terraform-plugin-sdk v1.15.0
9-
github.com/oracle/oci-go-sdk/v39 v39.0.0
9+
github.com/oracle/oci-go-sdk/v40 v40.0.0
1010
github.com/stretchr/objx v0.1.1 // indirect
1111
github.com/stretchr/testify v1.6.1
1212
golang.org/x/mod v0.3.0
@@ -15,7 +15,3 @@ require (
1515

1616
// Uncomment this line to get OCI Go SDK from local source instead of github
1717
//replace github.com/oracle/oci-go-sdk => ../../oracle/oci-go-sdk
18-
19-
replace github.com/oracle/oci-go-sdk => ../../oracle/oci-go-sdk
20-
21-
replace github.com/oracle/oci-go-sdk/v38 => ../../oracle/oci-go-sdk

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
200200
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
201201
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
202202
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
203-
github.com/oracle/oci-go-sdk/v39 v39.0.0 h1:+8ZXGSblvUmuP7+Si2BRyKKYsx1/PUARXTt4Capw14M=
204-
github.com/oracle/oci-go-sdk/v39 v39.0.0/go.mod h1:44zZiXOSSyoDOhC8UjYS0GgGdZLycadqydIB6uK3R/Y=
203+
github.com/oracle/oci-go-sdk/v40 v40.0.0 h1:1f0LHeyTj2FYVbNXB/lga65UjUuaagQYW++fsjRIc0o=
204+
github.com/oracle/oci-go-sdk/v40 v40.0.0/go.mod h1:61MwFx5gJGmavyXFWvB2aXzhrgwU42mY1gm1EZYJJ78=
205205
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
206206
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
207207
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

‎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/v39/analytics"
10+
oci_analytics "github.com/oracle/oci-go-sdk/v40/analytics"
1111
)
1212

1313
func init() {

‎oci/analytics_analytics_instance_private_access_channel_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/v39/analytics"
10+
oci_analytics "github.com/oracle/oci-go-sdk/v40/analytics"
1111
)
1212

1313
func init() {

‎oci/analytics_analytics_instance_private_access_channel_resource.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
1616
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1717

18-
oci_analytics "github.com/oracle/oci-go-sdk/v39/analytics"
19-
oci_common "github.com/oracle/oci-go-sdk/v39/common"
18+
oci_analytics "github.com/oracle/oci-go-sdk/v40/analytics"
19+
oci_common "github.com/oracle/oci-go-sdk/v40/common"
2020
)
2121

2222
func init() {

‎oci/analytics_analytics_instance_private_access_channel_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111

1212
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
1313
"github.com/hashicorp/terraform-plugin-sdk/terraform"
14-
oci_analytics "github.com/oracle/oci-go-sdk/v39/analytics"
15-
"github.com/oracle/oci-go-sdk/v39/common"
14+
oci_analytics "github.com/oracle/oci-go-sdk/v40/analytics"
15+
"github.com/oracle/oci-go-sdk/v40/common"
1616

1717
"github.com/terraform-providers/terraform-provider-oci/httpreplay"
1818
)

‎oci/analytics_analytics_instance_resource.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
1515
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
1616

17-
oci_analytics "github.com/oracle/oci-go-sdk/v39/analytics"
18-
oci_common "github.com/oracle/oci-go-sdk/v39/common"
17+
oci_analytics "github.com/oracle/oci-go-sdk/v40/analytics"
18+
oci_common "github.com/oracle/oci-go-sdk/v40/common"
1919
)
2020

2121
func init() {

0 commit comments

Comments
 (0)