Skip to content

Commit a8875ee

Browse files
authored
Merge pull request #837 from terraform-providers/release_gh
Release 3.36.0
2 parents 80e3314 + ca58d02 commit a8875ee

File tree

220 files changed

+6841
-449
lines changed

Some content is hidden

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

220 files changed

+6841
-449
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
## 3.35.1 (Unreleased)
1+
## 3.36.0 (Unreleased)
2+
3+
### Added
4+
- Support for moving `oci_core_cpe`, `oci_core_cross_connect_group`, `oci_core_cross_connect`, `oci_core_ipsec`, `oci_core_remote_peering_connection` and `oci_core_virtual_circuit` resources across compartments
5+
- Support for moving `oci_streaming_stream` resources across compartments
6+
- Support for `defined_tags` and `freeform_tags` attributes in `oci_core_cross_connect_group`, `oci_core_cross_connect`, `oci_core_remote_peering_connection` and `oci_core_virtual_circuit` resources
7+
- Support for moving `oci_waas_waas_policy` and `oci_waas_certificate` resources across compartments
8+
- Support for specifying rules for Events service via `oci_events_rule` resource
9+
210
## 3.35.0 (July 24, 2019)
311

412
### Added

examples/compute/instance/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ variable "NumInstances" {
1919
# NOTE: Changing this value after applying it could result in re-attaching existing volumes to different instances.
2020
# This is a result of using 'count' variables to specify the volume and instance IDs for the volume attachment resource.
2121
variable "NumIscsiVolumesPerInstance" {
22-
default = "2"
22+
default = "1"
2323
}
2424

2525
variable "NumParavirtualizedVolumesPerInstance" {

examples/database/adb/autonomous_data_warehouse.tf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ resource "oci_database_autonomous_database" "autonomous_data_warehouse" {
1717
db_name = "adbdw1"
1818

1919
#Optional
20-
db_workload = "${var.autonomous_data_warehouse_db_workload}"
21-
display_name = "example_autonomous_data_warehouse"
22-
freeform_tags = "${var.autonomous_database_freeform_tags}"
23-
license_model = "${var.autonomous_database_license_model}"
20+
db_workload = "${var.autonomous_data_warehouse_db_workload}"
21+
display_name = "example_autonomous_data_warehouse"
22+
freeform_tags = "${var.autonomous_database_freeform_tags}"
23+
is_auto_scaling_enabled = "false"
24+
license_model = "${var.autonomous_database_license_model}"
2425
}
2526

2627
data "oci_database_autonomous_databases" "autonomous_data_warehouses" {

examples/database/db_systems/db_exadata/resources.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ resource "oci_database_exadata_iorm_config" "test_exadata_iorm_config" {
5454
db_system_id = "${oci_database_db_system.test_db_system.id}"
5555
objective = "AUTO"
5656

57-
db_plans = {
57+
db_plans {
5858
db_name = "default"
5959
share = 1
6060
}

examples/events/rule.tf

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
variable "tenancy_ocid" {}
4+
variable "user_ocid" {}
5+
variable "fingerprint" {}
6+
variable "private_key_path" {}
7+
variable "region" {}
8+
variable "compartment_id" {}
9+
10+
provider "oci" {
11+
tenancy_ocid = "${var.tenancy_ocid}"
12+
user_ocid = "${var.user_ocid}"
13+
fingerprint = "${var.fingerprint}"
14+
private_key_path = "${var.private_key_path}"
15+
region = "${var.region}"
16+
}
17+
18+
resource "oci_events_rule" "test_rule" {
19+
#Required
20+
actions {
21+
#Required
22+
actions {
23+
#Required
24+
action_type = "ONS"
25+
is_enabled = true
26+
27+
#Optional
28+
description = "description"
29+
topic_id = "${oci_ons_notification_topic.test_notification_topic.id}"
30+
}
31+
32+
actions {
33+
#Required
34+
action_type = "OSS"
35+
is_enabled = true
36+
37+
#Optional
38+
description = "description"
39+
stream_id = "${oci_streaming_stream.test_stream.id}"
40+
}
41+
}
42+
43+
compartment_id = "${var.compartment_id}"
44+
condition = "{\"eventType\": \"com.oraclecloud.dbaas.autonomous.database.backup.end\"}"
45+
display_name = "This rule sends a notification upon completion of DbaaS backup"
46+
is_enabled = true
47+
}
48+
49+
data "oci_events_rules" "test_rules" {
50+
#Required
51+
compartment_id = "${var.compartment_id}"
52+
53+
#Optional
54+
display_name = "This rule sends a notification upon completion of DbaaS backup"
55+
state = "ACTIVE"
56+
}
57+
58+
resource "oci_streaming_stream" "test_stream" {
59+
compartment_id = "${var.tenancy_ocid}"
60+
name = "testStream"
61+
partitions = "1"
62+
retention_in_hours = "24"
63+
}
64+
65+
resource "oci_ons_notification_topic" "test_notification_topic" {
66+
#Required
67+
compartment_id = "${var.compartment_id}"
68+
name = "testNotificationTopic"
69+
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-oci
33
require (
44
github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
55
github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
6-
github.com/oracle/oci-go-sdk v6.0.0+incompatible
6+
github.com/oracle/oci-go-sdk v6.1.0+incompatible
77
github.com/stretchr/objx v0.1.1 // indirect
88
github.com/stretchr/testify v1.3.0
99
gopkg.in/yaml.v2 v2.2.2

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,8 @@ github.com/oracle/oci-go-sdk v5.15.0+incompatible h1:rTlmaWEe255HczQJ2uOPM9xw3pr
276276
github.com/oracle/oci-go-sdk v5.15.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
277277
github.com/oracle/oci-go-sdk v6.0.0+incompatible h1:oxUPiF7KPhC0hRoAhAK3hTIZ1K0cz3NfawAQK3Sslb8=
278278
github.com/oracle/oci-go-sdk v6.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
279+
github.com/oracle/oci-go-sdk v6.1.0+incompatible h1:sksvnP7m17+YuV9X11D39LNr7ZIraoRLba9NciVO0tw=
280+
github.com/oracle/oci-go-sdk v6.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
279281
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
280282
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
281283
github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
File renamed without changes.

0 commit comments

Comments
 (0)