Skip to content

Commit 2ac47b1

Browse files
tf-oci-pubtf-oci-pub
authored
Releasing version 4.73.0
Releasing version 4.73.0
2 parents 4184e80 + dd2cf46 commit 2ac47b1

File tree

625 files changed

+31036
-1876
lines changed

Some content is hidden

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

625 files changed

+31036
-1876
lines changed

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## 4.73.0 (April 27, 2022)
2+
3+
### Added
4+
- Support for budget organization feature
5+
- WAF request body inspection
6+
- VM DB Operating System & GI Upgrade
7+
- Support for Datbase External TCPS
8+
- Support for metering computation
9+
- Support for dedicated Vantage points
10+
- Support for VTAP feature in vcn service
11+
- Support for E4 Dense - 32 and 128 Core
12+
- Support for Stack Monitoring feature for External Database
13+
- Support for Monitoring source feature for Service Connector Hub
14+
### Bug Fix
15+
- fix failing TestStackMonitoringDiscoveryJobResource_basic
16+
- fix cloud vm cluster polling for work request.
17+
- Add compute_nodes field to Update cloud vm cluster.
18+
119
## 4.72.0 (April 20, 2022)
220

321
### Added

‎examples/apm/apm_synthetics/dedicated_vantage_points/dedicated_vantage_point.tf‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
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+
variable "user_ocid" {}
6+
variable "fingerprint" {}
7+
variable "private_key_path" {}
8+
variable "region" {}
9+
variable "compartment_ocid" {}
10+
variable "apm_domain_id" {}
11+
variable "dvp_stack_id" {}
12+
variable "dvp_stream_id" {}
13+
variable "dvp_version" {}
14+
variable "dvp_region" {}
15+
16+
provider "oci" {
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+
region = var.region
22+
}
23+
24+
variable "dedicated_vantage_point_display_name" {
25+
default = "displayName"
26+
}
27+
28+
variable "dedicated_vantage_point_name" {
29+
default = "name"
30+
}
31+
32+
variable "dvp_stack_type" {
33+
default = "ORACLE_RM_STACK"
34+
}
35+
36+
resource "oci_apm_synthetics_dedicated_vantage_point" "test_dedicated_vantage_point" {
37+
#Required
38+
apm_domain_id = var.apm_domain_id
39+
display_name = var.dedicated_vantage_point_display_name
40+
dvp_stack_details {
41+
#Required
42+
dvp_stack_id = var.dvp_stack_id
43+
dvp_stream_id = var.dvp_stream_id
44+
dvp_version = var.dvp_version
45+
dvp_stack_type = var.dvp_stack_type
46+
}
47+
region = var.dvp_region
48+
49+
}
50+
51+
data "oci_apm_synthetics_dedicated_vantage_points" "test_dedicated_vantage_points" {
52+
#Required
53+
apm_domain_id = var.apm_domain_id
54+
55+
#Optional
56+
display_name = var.dedicated_vantage_point_display_name
57+
name = var.dedicated_vantage_point_name
58+
}

‎examples/budget/main.tf‎

Lines changed: 66 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ variable "compartment_ocid" {
2323
variable "region" {
2424
}
2525

26+
variable "subscription_id" {
27+
}
28+
2629
provider "oci" {
30+
provider = "4.67.0"
2731
region = var.region
2832
tenancy_ocid = var.tenancy_ocid
2933
user_ocid = var.user_ocid
@@ -48,8 +52,46 @@ resource "oci_budget_budget" "test_budget" {
4852
budget_processing_period_start_offset = "11"
4953
}
5054

55+
resource "oci_budget_budget" "test_budget_invoice" {
56+
#Required
57+
amount = "1"
58+
compartment_id = var.tenancy_ocid
59+
reset_period = "MONTHLY"
60+
target_type = "COMPARTMENT"
61+
62+
targets = [
63+
var.subscription_id
64+
]
65+
66+
#Optional
67+
description = "budget invoice description"
68+
display_name = "budget_invoice"
69+
processing_period_type = "INVOICE"
70+
}
71+
72+
# get budget should happen after alert rule is successful
73+
# as alert rule creation updates the `alert_rule_count` field
5174
data "oci_budget_budget" "budget1" {
5275
budget_id = oci_budget_budget.test_budget.id
76+
depends_on = [
77+
data.oci_budget_alert_rule.test_alert_rule
78+
]
79+
}
80+
81+
data "oci_budget_budget" "budget_invoice" {
82+
budget_id = oci_budget_budget.test_budget_invoice.id
83+
depends_on = [
84+
data.oci_budget_alert_rule.test_alert_rule
85+
]
86+
}
87+
88+
89+
data "oci_budget_budgets" "test_budgets" {
90+
#Required
91+
compartment_id = var.tenancy_ocid
92+
#Optional
93+
// display_name = oci_budget_budget.test_budget.display_name
94+
// state = "ACTIVE"
5395
}
5496

5597
output "budget" {
@@ -72,16 +114,22 @@ output "budget" {
72114
// time_spend_computed = data.oci_budget_budget.budget1.time_spend_computed
73115
}
74116

75-
data "oci_budget_budgets" "test_budgets" {
76-
#Required
77-
compartment_id = var.tenancy_ocid
78-
#Optional
79-
// display_name = oci_budget_budget.test_budget.display_name
80-
// state = "ACTIVE"
81-
}
82-
83-
output "budgets" {
84-
value = data.oci_budget_budgets.test_budgets.budgets
117+
output "budget_invoice" {
118+
value = {
119+
amount = data.oci_budget_budget.budget_invoice.amount
120+
compartment_id = data.oci_budget_budget.budget_invoice.compartment_id
121+
reset_period = data.oci_budget_budget.budget_invoice.reset_period
122+
targets = data.oci_budget_budget.budget_invoice.targets[0]
123+
description = data.oci_budget_budget.budget_invoice.description
124+
display_name = data.oci_budget_budget.budget_invoice.display_name
125+
alert_rule_count = data.oci_budget_budget.budget_invoice.alert_rule_count
126+
state = data.oci_budget_budget.budget_invoice.state
127+
time_created = data.oci_budget_budget.budget_invoice.time_created
128+
time_updated = data.oci_budget_budget.budget_invoice.time_updated
129+
version = data.oci_budget_budget.budget_invoice.version
130+
131+
processing_period_type = data.oci_budget_budget.budget_invoice.processing_period_type
132+
}
85133
}
86134

87135
resource "oci_budget_alert_rule" "test_alert_rule" {
@@ -98,14 +146,6 @@ resource "oci_budget_alert_rule" "test_alert_rule" {
98146
recipients = "[email protected]"
99147
}
100148

101-
data "oci_budget_alert_rules" "test_alert_rules" {
102-
#Required
103-
budget_id = oci_budget_budget.test_budget.id
104-
105-
#Optional
106-
// display_name = oci_budget_alert_rule.test_alert_rule.display_name
107-
state = "ACTIVE"
108-
}
109149

110150
output "alert_rule" {
111151
value = {
@@ -131,7 +171,13 @@ data "oci_budget_alert_rule" "test_alert_rule" {
131171
alert_rule_id = oci_budget_alert_rule.test_alert_rule.id
132172
}
133173

134-
output "alert_rules" {
135-
value = data.oci_budget_alert_rules.test_alert_rules.alert_rules
174+
data "oci_budget_alert_rules" "test_alert_rules" {
175+
#Required
176+
budget_id = oci_budget_budget.test_budget.id
177+
178+
#Optional
179+
// display_name = oci_budget_alert_rule.test_alert_rule.display_name
180+
state = "ACTIVE"
136181
}
137182

183+

‎examples/database/db_systems/db_exacs/resources.tf‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@ resource "oci_database_db_home" "test_db_home_vm_cluster" {
5555
display_name = "createdDbHome"
5656
}
5757

58+
resource "oci_database_db_home" "test_db_home_vm_cluster_no_db" {
59+
vm_cluster_id = oci_database_cloud_vm_cluster.test_cloud_vm_cluster.id
60+
61+
# VM_CLUSTER_BACKUP can also be specified as a source for cloud VM clusters.
62+
source = "VM_CLUSTER_NEW"
63+
db_version = "19.0.0.0"
64+
display_name = "createdDbHomeNoDb"
65+
}
66+
5867
resource "oci_database_backup" "test_backup" {
5968
depends_on = [oci_database_db_home.test_db_home_vm_cluster]
6069
database_id = oci_database_db_home.test_db_home_vm_cluster.database.0.id

‎examples/database/db_systems/db_systems_upgrade/datasources.tf‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
data "oci_identity_availability_domain" "ad" {
4+
compartment_id = var.tenancy_ocid
5+
ad_number = 3
6+
}
7+
8+
# Get DB node list
9+
data "oci_database_db_nodes" "db_nodes" {
10+
compartment_id = var.compartment_ocid
11+
db_system_id = oci_database_db_system.test_db_system.id
12+
}
13+
14+
# Get DB node details
15+
data "oci_database_db_node" "db_node_details" {
16+
db_node_id = data.oci_database_db_nodes.db_nodes.db_nodes[0]["id"]
17+
}
18+
19+
# Gets the OCID of the first (default) vNIC
20+
#data "oci_core_vnic" "db_node_vnic" {
21+
# vnic_id = data.oci_database_db_node.db_node_details.vnic_id
22+
#}
23+
24+
data "oci_database_db_homes" "db_homes" {
25+
compartment_id = var.compartment_ocid
26+
db_system_id = oci_database_db_system.test_db_system.id
27+
}
28+
29+
data "oci_database_databases" "databases" {
30+
compartment_id = var.compartment_ocid
31+
db_home_id = data.oci_database_db_homes.db_homes.db_homes[0].db_home_id
32+
}
33+
34+
data "oci_database_db_versions" "test_db_versions_by_db_system_id" {
35+
compartment_id = var.compartment_ocid
36+
db_system_id = oci_database_db_system.test_db_system.id
37+
}
38+
39+
data "oci_database_db_system_shapes" "test_db_system_shapes" {
40+
availability_domain = data.oci_identity_availability_domain.ad.name
41+
compartment_id = var.compartment_ocid
42+
43+
filter {
44+
name = "shape"
45+
values = [var.db_system_shape]
46+
}
47+
}
48+
49+
data "oci_database_db_systems" "db_systems" {
50+
compartment_id = var.compartment_ocid
51+
52+
filter {
53+
name = "id"
54+
values = [oci_database_db_system.test_db_system.id]
55+
}
56+
}
57+
58+
data "oci_database_db_systems_upgrade_history_entries" "t" {
59+
db_system_id = data.oci_database_db_systems.db_systems.db_systems.0.id
60+
}

‎examples/database/db_systems/db_systems_upgrade/network.tf‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
2+
// Licensed under the Mozilla Public License v2.0
3+
resource "oci_core_vcn" "vcn" {
4+
cidr_block = "10.1.0.0/16"
5+
compartment_id = var.compartment_ocid
6+
display_name = "TFExampleVCNDBSystem"
7+
dns_label = "tfexvcndbsys"
8+
}
9+
10+
resource "oci_core_subnet" "subnet" {
11+
availability_domain = data.oci_identity_availability_domain.ad.name
12+
cidr_block = "10.1.20.0/24"
13+
display_name = "TFExampleSubnetDBSystem"
14+
dns_label = "tfexsubdbsys"
15+
security_list_ids = [oci_core_security_list.ExampleSecurityList.id]
16+
compartment_id = var.compartment_ocid
17+
vcn_id = oci_core_vcn.vcn.id
18+
route_table_id = oci_core_route_table.route_table.id
19+
dhcp_options_id = oci_core_vcn.vcn.default_dhcp_options_id
20+
}
21+
22+
resource "oci_core_subnet" "subnet_backup" {
23+
availability_domain = data.oci_identity_availability_domain.ad.name
24+
cidr_block = "10.1.1.0/24"
25+
display_name = "TFExampleSubnetDBSystemBackup"
26+
dns_label = "tfexsubdbsysbp"
27+
security_list_ids = [oci_core_security_list.ExampleSecurityList.id]
28+
compartment_id = var.compartment_ocid
29+
vcn_id = oci_core_vcn.vcn.id
30+
route_table_id = oci_core_route_table.route_table_backup.id
31+
dhcp_options_id = oci_core_vcn.vcn.default_dhcp_options_id
32+
}
33+
34+
resource "oci_core_internet_gateway" "internet_gateway" {
35+
compartment_id = var.compartment_ocid
36+
display_name = "TFExampleIGDBSystem"
37+
vcn_id = oci_core_vcn.vcn.id
38+
}
39+
40+
resource "oci_core_route_table" "route_table" {
41+
compartment_id = var.compartment_ocid
42+
vcn_id = oci_core_vcn.vcn.id
43+
display_name = "TFExampleRouteTableDBSystem"
44+
45+
route_rules {
46+
destination = "0.0.0.0/0"
47+
destination_type = "CIDR_BLOCK"
48+
network_entity_id = oci_core_internet_gateway.internet_gateway.id
49+
}
50+
}
51+
52+
resource "oci_core_route_table" "route_table_backup" {
53+
compartment_id = var.compartment_ocid
54+
vcn_id = oci_core_vcn.vcn.id
55+
display_name = "TFExampleRouteTableDBSystemBackup"
56+
57+
route_rules {
58+
destination = "0.0.0.0/0"
59+
destination_type = "CIDR_BLOCK"
60+
network_entity_id = oci_core_internet_gateway.internet_gateway.id
61+
}
62+
}
63+
64+
resource "oci_core_security_list" "ExampleSecurityList" {
65+
compartment_id = var.compartment_ocid
66+
vcn_id = oci_core_vcn.vcn.id
67+
display_name = "TFExampleSecurityList"
68+
69+
// allow outbound tcp traffic on all ports
70+
egress_security_rules {
71+
destination = "0.0.0.0/0"
72+
protocol = "6"
73+
}
74+
75+
// allow outbound udp traffic on a port range
76+
egress_security_rules {
77+
destination = "0.0.0.0/0"
78+
protocol = "17" // udp
79+
stateless = true
80+
}
81+
82+
egress_security_rules {
83+
destination = "0.0.0.0/0"
84+
protocol = "1"
85+
stateless = true
86+
}
87+
88+
// allow inbound ssh traffic from a specific port
89+
ingress_security_rules {
90+
protocol = "6" // tcp
91+
source = "0.0.0.0/0"
92+
stateless = false
93+
}
94+
95+
// allow inbound icmp traffic of a specific type
96+
ingress_security_rules {
97+
protocol = 1
98+
source = "0.0.0.0/0"
99+
stateless = true
100+
}
101+
}
102+
103+
resource "oci_core_network_security_group" "test_network_security_group" {
104+
compartment_id = var.compartment_ocid
105+
vcn_id = oci_core_vcn.vcn.id
106+
display_name = "displayName"
107+
}
108+
109+
resource "oci_core_network_security_group" "test_network_security_group_backup" {
110+
compartment_id = var.compartment_ocid
111+
vcn_id = oci_core_vcn.vcn.id
112+
display_name = "displayName"
113+
}

0 commit comments

Comments
 (0)