Skip to content

Commit 65717e4

Browse files
authored
Release 3.18.0
Release 3.18.0
2 parents f910562 + 0581404 commit 65717e4

File tree

859 files changed

+11553
-2015
lines changed

Some content is hidden

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

859 files changed

+11553
-2015
lines changed

CHANGELOG.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
## 3.17.1 (Unreleased)
1+
## 3.18.0 (Unreleased)
2+
3+
### Added
4+
- Add Budget and Alert Rules resources
5+
- Support starting and stopping instances
6+
- Support to create Containerengine Node Pool with Image Id
7+
- Support for customer specified timezone in Database Systems
8+
- Support for creating Autonomous Data Warehouses through Autonomous Database resource `oci_database_autonomous_database` using the field `db_workload`
9+
- Support for Defined Tag defaults through the `oci_identity_tag_default` resource
10+
- Support for updating the compartment on a Tag Namespace
11+
- Support for exadata io resource management config for DB system
12+
- Support `email` attribute for `oci_identity_user` resource
13+
14+
### Fixed
15+
- Marked oci_identity_ui_password resource as not importable
16+
17+
### Deprecated
18+
- Deprecated Autonomous Data Warehouse resources `oci_database_autonomous_data_warehouse`, the API is now unified with Autonomous Database
19+
220
## 3.17.0 (March 05, 2019)
321

422
### Added

docs/examples/budget/main.tf

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
/*
4+
* This example shows how to use the budget resource.
5+
*/
6+
7+
variable "tenancy_ocid" {}
8+
9+
variable "user_ocid" {}
10+
variable "fingerprint" {}
11+
variable "private_key_path" {}
12+
variable "compartment_ocid" {}
13+
variable "region" {}
14+
15+
provider "oci" {
16+
region = "${var.region}"
17+
tenancy_ocid = "${var.tenancy_ocid}"
18+
user_ocid = "${var.user_ocid}"
19+
fingerprint = "${var.fingerprint}"
20+
private_key_path = "${var.private_key_path}"
21+
}
22+
23+
resource "oci_budget_budget" "test_budget" {
24+
#Required
25+
amount = "1"
26+
compartment_id = "${var.compartment_ocid}"
27+
reset_period = "MONTHLY"
28+
target_compartment_id = "${var.compartment_ocid}"
29+
30+
#Optional
31+
description = "budget1 description"
32+
display_name = "budget1"
33+
}
34+
35+
data "oci_budget_budget" "budget1" {
36+
budget_id = "${oci_budget_budget.test_budget.id}"
37+
}
38+
39+
output "budget" {
40+
value = <<EOF
41+
42+
amount = "${data.oci_budget_budget.budget1.amount}"
43+
compartment_id = "${data.oci_budget_budget.budget1.compartment_id}"
44+
reset_period = "${data.oci_budget_budget.budget1.reset_period}"
45+
target_compartment_id = "${data.oci_budget_budget.budget1.target_compartment_id}"
46+
description = "${data.oci_budget_budget.budget1.description}"
47+
display_name = "${data.oci_budget_budget.budget1.display_name}"
48+
alert_rule_count = "${data.oci_budget_budget.budget1.alert_rule_count}"
49+
state = "${data.oci_budget_budget.budget1.state}"
50+
time_created = "${data.oci_budget_budget.budget1.time_created}"
51+
time_updated = "${data.oci_budget_budget.budget1.time_updated}"
52+
version = "${data.oci_budget_budget.budget1.version}"
53+
EOF
54+
55+
# These values are not always present
56+
// actual_spend = "${data.oci_budget_budget.budget1.actual_spend}"
57+
// forecasted_spend = "${data.oci_budget_budget.budget1.forecasted_spend}"
58+
// time_spend_computed = "${data.oci_budget_budget.budget1.time_spend_computed}"
59+
}
60+
61+
data "oci_budget_budgets" "test_budgets" {
62+
#Required
63+
compartment_id = "${var.compartment_ocid}"
64+
65+
#Optional
66+
// display_name = "${oci_budget_budget.test_budget.display_name}"
67+
// state = "ACTIVE"
68+
}
69+
70+
output "budgets" {
71+
value = "${data.oci_budget_budgets.test_budgets.budgets}"
72+
}
73+
74+
resource "oci_budget_alert_rule" "test_alert_rule" {
75+
#Required
76+
budget_id = "${oci_budget_budget.test_budget.id}"
77+
recipients = "[email protected]"
78+
threshold = "100"
79+
threshold_type = "ABSOLUTE"
80+
type = "ACTUAL"
81+
82+
#Optional
83+
description = "alertRuleDescription"
84+
display_name = "alertRule"
85+
message = "possible overspend"
86+
}
87+
88+
data "oci_budget_alert_rules" "test_alert_rules" {
89+
#Required
90+
budget_id = "${oci_budget_budget.test_budget.id}"
91+
92+
#Optional
93+
// display_name = "${oci_budget_alert_rule.test_alert_rule.display_name}"
94+
state = "ACTIVE"
95+
}
96+
97+
output "alert_rule" {
98+
value = <<EOF
99+
100+
budget_id = "${data.oci_budget_alert_rule.test_alert_rule.budget_id}"
101+
recipients = "${data.oci_budget_alert_rule.test_alert_rule.recipients}"
102+
description = "${data.oci_budget_alert_rule.test_alert_rule.description}"
103+
display_name = "${data.oci_budget_alert_rule.test_alert_rule.display_name}"
104+
message = "${data.oci_budget_alert_rule.test_alert_rule.message}"
105+
recipients = "${data.oci_budget_alert_rule.test_alert_rule.recipients}"
106+
state = "${data.oci_budget_alert_rule.test_alert_rule.state}"
107+
threshold = "${data.oci_budget_alert_rule.test_alert_rule.threshold}"
108+
threshold_type = "${data.oci_budget_alert_rule.test_alert_rule.threshold_type}"
109+
time_created = "${data.oci_budget_alert_rule.test_alert_rule.time_created}"
110+
time_updated = "${data.oci_budget_alert_rule.test_alert_rule.time_updated}"
111+
type = "${data.oci_budget_alert_rule.test_alert_rule.type}"
112+
version = "${data.oci_budget_alert_rule.test_alert_rule.version}"
113+
EOF
114+
}
115+
116+
data "oci_budget_alert_rule" "test_alert_rule" {
117+
#Required
118+
budget_id = "${oci_budget_budget.test_budget.id}"
119+
alert_rule_id = "${oci_budget_alert_rule.test_alert_rule.id}"
120+
}
121+
122+
output "alert_rules" {
123+
value = "${data.oci_budget_alert_rules.test_alert_rules.alert_rules}"
124+
}
File renamed without changes.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
resource "random_string" "autonomous_data_warehouse_admin_password" {
4+
length = 16
5+
min_numeric = 1
6+
min_lower = 1
7+
min_upper = 1
8+
min_special = 1
9+
}
10+
11+
resource "oci_database_autonomous_database" "autonomous_data_warehouse" {
12+
#Required
13+
admin_password = "${random_string.autonomous_data_warehouse_admin_password.result}"
14+
compartment_id = "${var.compartment_ocid}"
15+
cpu_core_count = "${var.autonomous_database_cpu_core_count}"
16+
data_storage_size_in_tbs = "${var.autonomous_database_data_storage_size_in_tbs}"
17+
db_name = "${var.autonomous_data_warehouse_db_name}"
18+
19+
#Optional
20+
db_workload = "${var.autonomous_data_warehouse_db_workload}"
21+
display_name = "${var.autonomous_data_warehouse_display_name}"
22+
freeform_tags = "${var.autonomous_database_freeform_tags}"
23+
license_model = "${var.autonomous_database_license_model}"
24+
}
25+
26+
data "oci_database_autonomous_databases" "autonomous_data_warehouses" {
27+
#Required
28+
compartment_id = "${var.compartment_ocid}"
29+
30+
#Optional
31+
display_name = "${oci_database_autonomous_database.autonomous_data_warehouse.display_name}"
32+
db_workload = "${var.autonomous_data_warehouse_db_workload}"
33+
}
34+
35+
output "autonomous_data_warehouse_admin_password" {
36+
value = "${random_string.autonomous_data_warehouse_admin_password.result}"
37+
}
38+
39+
output "autonomous_data_warehouse_high_connection_string" {
40+
value = "${lookup(oci_database_autonomous_database.autonomous_data_warehouse.connection_strings.0.all_connection_strings, "high", "unavailable")}"
41+
}
42+
43+
output "autonomous_data_warehouses" {
44+
value = "${data.oci_database_autonomous_databases.autonomous_data_warehouses.autonomous_databases}"
45+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
resource "random_string" "autonomous_data_warehouse_wallet_password" {
4+
length = 16
5+
special = true
6+
}
7+
8+
data "oci_database_autonomous_database_wallet" "autonomous_data_warehouse_wallet" {
9+
#Required
10+
autonomous_database_id = "${oci_database_autonomous_database.autonomous_data_warehouse.id}"
11+
password = "${random_string.autonomous_data_warehouse_wallet_password.result}"
12+
}
13+
14+
resource "local_file" "autonomous_data_warehouse_wallet_file" {
15+
content = "${data.oci_database_autonomous_database_wallet.autonomous_data_warehouse_wallet.content}"
16+
filename = "${path.module}/autonomous_data_warehouse_wallet.zip"
17+
}
18+
19+
output "autonomous_data_warehouse_wallet_password" {
20+
value = "${random_string.autonomous_data_warehouse_wallet_password.result}"
21+
}

docs/examples/database/atp/autonomous_database.tf renamed to docs/examples/database/adb/autonomous_database.tf

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22

33
resource "random_string" "autonomous_database_admin_password" {
4-
length = 16
5-
special = true
4+
length = 16
5+
min_numeric = 1
6+
min_lower = 1
7+
min_upper = 1
8+
min_special = 1
69
}
710

811
resource "oci_database_autonomous_database" "autonomous_database" {
@@ -14,6 +17,7 @@ resource "oci_database_autonomous_database" "autonomous_database" {
1417
db_name = "${var.autonomous_database_db_name}"
1518

1619
#Optional
20+
db_workload = "${var.autonomous_database_db_workload}"
1721
display_name = "${var.autonomous_database_display_name}"
1822
freeform_tags = "${var.autonomous_database_freeform_tags}"
1923
license_model = "${var.autonomous_database_license_model}"
@@ -25,16 +29,17 @@ data "oci_database_autonomous_databases" "autonomous_databases" {
2529

2630
#Optional
2731
display_name = "${oci_database_autonomous_database.autonomous_database.display_name}"
32+
db_workload = "${var.autonomous_database_db_workload}"
2833
}
2934

3035
output "autonomous_database_admin_password" {
3136
value = "${random_string.autonomous_database_admin_password.result}"
3237
}
3338

34-
output "autonomous_databases" {
35-
value = "${data.oci_database_autonomous_databases.autonomous_databases.autonomous_databases}"
39+
output "autonomous_database_high_connection_string" {
40+
value = "${lookup(oci_database_autonomous_database.autonomous_database.connection_strings.0.all_connection_strings, "high", "unavailable")}"
3641
}
3742

38-
output "parallel_connection_string" {
39-
value = ["${lookup(oci_database_autonomous_database.autonomous_database.connection_strings.0.all_connection_strings, "PARALLEL", "Unavailable")}"]
43+
output "autonomous_databases" {
44+
value = "${data.oci_database_autonomous_databases.autonomous_databases.autonomous_databases}"
4045
}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
22

3-
resource "random_string" "wallet_password" {
3+
resource "random_string" "autonomous_database_wallet_password" {
44
length = 16
55
special = true
66
}
77

88
data "oci_database_autonomous_database_wallet" "autonomous_database_wallet" {
99
#Required
1010
autonomous_database_id = "${oci_database_autonomous_database.autonomous_database.id}"
11-
password = "${random_string.wallet_password.result}"
11+
password = "${random_string.autonomous_database_wallet_password.result}"
1212
}
1313

1414
resource "local_file" "autonomous_database_wallet_file" {
1515
content = "${data.oci_database_autonomous_database_wallet.autonomous_database_wallet.content}"
1616
filename = "${path.module}/autonomous_database_wallet.zip"
1717
}
1818

19-
output "wallet_password" {
20-
value = ["${random_string.wallet_password.result}"]
19+
output "autonomous_database_wallet_password" {
20+
value = "${random_string.autonomous_database_wallet_password.result}"
2121
}

0 commit comments

Comments
 (0)