Skip to content

Commit 8dec65e

Browse files
authored
Releasing version 4.22.0
Releasing version 4.22.0
2 parents 6df50b3 + e343f3b commit 8dec65e

File tree

8,101 files changed

+80387
-67044
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,101 files changed

+80387
-67044
lines changed

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## 4.22.0 (Unreleased)
2+
3+
### Added
4+
- Support for VCN API: include OCID of Local Peering Gateway in return model
5+
- Support for Streaming analytics in OCI Connector Hub
6+
- Support for IPv6
7+
- Support for IPv6 with fastconnect
8+
- Support for Compute preemptible Instances
9+
- Support for MDS High Availability
10+
- Support for Micro VM shapes added to `core_instance` and `core_instance_configuration` resources
11+
- Support for WAF legacy DNS naming scheme migration
12+
- Support for fractional usage in limits
13+
- Support for Oracle Cloud VMware Solution Flexible Billing
14+
15+
### Fixed
16+
- Fixed functions resource to sync `image_digest` with `image` appropriately
17+
- Removed incorrect document for `oci_data_safe_on_prem_connectors_configuration`. Issue [1344](https://github.com/terraform-providers/terraform-provider-oci/issues/1344)
18+
119
## 4.21.0 (April 07, 2021)
220

321
### Added

examples/compute/instance/instance.tf

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ resource "oci_core_instance" "test_instance" {
104104
shape = var.instance_shape
105105

106106
shape_config {
107-
ocpus = "${var.instance_ocpus}"
108-
memory_in_gbs = "${var.instance_shape_config_memory_in_gbs}"
107+
ocpus = var.instance_ocpus
108+
memory_in_gbs = var.instance_shape_config_memory_in_gbs
109109
}
110110

111111
create_vnic_details {
@@ -118,7 +118,7 @@ resource "oci_core_instance" "test_instance" {
118118
source_details {
119119
source_type = "image"
120120
source_id = var.flex_instance_image_ocid[var.region]
121-
# Apply this to set the size of the boot volume that's created for this instance.
121+
# Apply this to set the size of the boot volume that is created for this instance.
122122
# Otherwise, the default boot volume size of the image is used.
123123
# This should only be specified when source_type is set to "image".
124124
#boot_volume_size_in_gbs = "60"
@@ -140,6 +140,14 @@ resource "oci_core_instance" "test_instance" {
140140
freeform_tags = {
141141
"freeformkey${count.index}" = "freeformvalue${count.index}"
142142
}
143+
144+
preemptible_instance_config {
145+
preemption_action {
146+
type = "TERMINATE"
147+
preserve_boot_volume = false
148+
}
149+
}
150+
143151
timeouts {
144152
create = "60m"
145153
}
@@ -187,7 +195,7 @@ resource "oci_core_volume_attachment" "test_block_volume_attach_paravirtualized"
187195
}
188196

189197
resource "oci_core_volume_backup_policy_assignment" "policy" {
190-
count = 2
198+
count = var.num_instances
191199
asset_id = oci_core_instance.test_instance[count.index].boot_volume_id
192200
policy_id = data.oci_core_volume_backup_policies.test_predefined_volume_backup_policies.volume_backup_policies[0].id
193201
}

examples/compute/instance/platform_config.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ resource "oci_core_instance" "test_instance_with_platform_config" {
2525
display_name = "TestInstance${count.index}"
2626
shape = var.platform_config_instance_shape
2727

28-
2928
platform_config {
3029
type = "${var.instance_platform_config_type}"
3130
numa_nodes_per_socket = "${var.instance_platform_config_numa_nodes_per_socket}"

examples/limits/quota.tf

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
// Licensed under the Mozilla Public License v2.0
33

44
variable "tenancy_ocid" {
5+
56
}
67

78
variable "user_ocid" {
89
}
910

1011
variable "fingerprint" {
12+
1113
}
1214

1315
variable "private_key_path" {
@@ -31,9 +33,11 @@ provider "oci" {
3133
resource "oci_limits_quota" "test_quota" {
3234
#Required
3335
compartment_id = var.tenancy_ocid
34-
description = "Quotas for notifications"
36+
description = "Quotas for VCN"
3537
name = "TestQuotas"
36-
statements = ["Set notifications quota topic-count to 99 in tenancy"]
38+
statements = ["Set vcn quotas to 0 in tenancy"]
39+
40+
depends_on = [oci_identity_tag.tag1]
3741

3842
#Optional
3943
defined_tags = {

examples/limits/tags.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ resource "oci_identity_tag_namespace" "tag-namespace1" {
55
#Required
66
compartment_id = var.tenancy_ocid
77
description = "Just a test"
8-
name = "testexamples-tag-namespace"
8+
name = "testexamples-tag-namespace-1"
99
}
1010

1111
resource "oci_identity_tag" "tag1" {
12+
depends_on = [oci_identity_tag_namespace.tag-namespace1]
1213
#Required
1314
description = "tf example tag"
1415
name = "tf-example-tag"

examples/networking/ipsec_connections/ipsec_connection.tf

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,6 @@ resource "oci_core_ipsec_connection_tunnel_management" "test_ipsec_connection_tu
101101
ike_version = "V1"
102102
}
103103

104-
resource "oci_core_ipsec_connection_tunnel_management" "test_ipsec_connection_tunnel_management_2" {
105-
ipsec_id = oci_core_ipsec.test_ip_sec_connection.id
106-
tunnel_id = data.oci_core_ipsec_connection_tunnels.test_ip_sec_connection_tunnels.ip_sec_connection_tunnels[0].id
107-
108-
#Optional
109-
encryption_domain_config {
110-
cpe_traffic_selector = "10.0.0.0/24"
111-
oracle_traffic_selector = "192.168.1.0/24"
112-
}
113-
114-
display_name = "MyIPSecConnection"
115-
routing = "POLICY"
116-
shared_secret = "sharedSecret"
117-
ike_version = "V1"
118-
}
119-
120104
resource "oci_identity_tag_namespace" "tag_namespace1" {
121105
#Required
122106
compartment_id = var.tenancy_ocid

examples/networking/route_table_attachment/route_table_attachment.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ resource "oci_core_route_table" "example_route_table" {
100100

101101
resource "oci_core_vnic_attachment" "example_vnic_attachment" {
102102
create_vnic_details {
103+
assign_public_ip = true
103104
subnet_id = oci_core_subnet.example_subnet.id
104105
skip_source_dest_check = true
105106
}

examples/ocvp/main.tf

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ data "oci_ocvp_supported_vmware_software_versions" "test_supported_vmware_softwa
3939
compartment_id = "${var.compartment_ocid}"
4040
}
4141

42+
data "oci_ocvp_supported_skus" "test_supported_skus" {
43+
compartment_id = "${var.compartment_ocid}"
44+
}
45+
4246
resource "oci_core_vcn" "test_vcn_ocvp" {
4347
cidr_block = "10.0.0.0/16"
4448
compartment_id = var.compartment_ocid
@@ -364,8 +368,9 @@ resource "oci_ocvp_sddc" "test_sddc" {
364368
vsan_vlan_id = oci_core_vlan.test_vsan_net_vlan.id
365369
vsphere_vlan_id = oci_core_vlan.test_vsphere_net_vlan.id
366370
// Optional
367-
provisioning_vlan_id = oci_core_vlan.test_provisioning_vlan.id
368-
replication_vlan_id = oci_core_vlan.test_replication_vlan.id
371+
provisioning_vlan_id = oci_core_vlan.test_provisioning_vlan.id
372+
replication_vlan_id = oci_core_vlan.test_replication_vlan.id
373+
initial_sku = data.oci_ocvp_supported_skus.test_supported_skus.items[0].name
369374
#defined_tags = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "${var.sddc_defined_tags_value}"}
370375
#display_name = var.sddc_display_name
371376
#freeform_tags = var.sddc_freeform_tags
@@ -377,6 +382,8 @@ resource "oci_ocvp_esxi_host" "test_esxi_host" {
377382
#Required
378383
sddc_id = oci_ocvp_sddc.test_sddc.id
379384
#Optional
385+
current_sku = data.oci_ocvp_supported_skus.test_supported_skus.items[0].name
386+
next_sku = data.oci_ocvp_supported_skus.test_supported_skus.items[0].name
380387
#defined_tags = {"${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}" = "${var.esxihost_defined_tags_value}"}
381388
#display_name = var.esxihost_display_name
382389
#freeform_tags = var.esxihost_freeform_tags
@@ -415,4 +422,3 @@ data "oci_ocvp_esxi_hosts" "test_esxi_hosts" {
415422
data "oci_ocvp_esxi_host" "test_esxi_host" {
416423
esxi_host_id = oci_ocvp_esxi_host.test_esxi_host.id
417424
}
418-

examples/service_connector_hub/main.tf

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ variable "compartment_ocid" {}
1616
// If using the notification target
1717
//variable "notification_topic_id" {}
1818

19+
// streaming cursor kind
20+
/*
21+
variable "streaming_cursor_kind" {
22+
default = "LATEST"
23+
}
24+
*/
25+
1926
provider "oci" {
2027
tenancy_ocid = var.tenancy_ocid
2128
user_ocid = var.user_ocid
@@ -128,6 +135,22 @@ resource "oci_sch_service_connector" "test_service_connector" {
128135
}
129136
}
130137

138+
// If using streaming source
139+
/*
140+
source {
141+
kind = "Streaming"
142+
143+
// Optional
144+
cursor {
145+
146+
// Optional
147+
kind = var.streaming_cursor_kind
148+
}
149+
150+
stream_id = oci_streaming_stream.test_stream.id
151+
}
152+
*/
153+
131154
target {
132155
kind = "streaming"
133156
stream_id = oci_streaming_stream.test_stream.id
@@ -138,9 +161,9 @@ resource "oci_sch_service_connector" "test_service_connector" {
138161
kind = "objectStorage"
139162
bucket = var.object_storage_bucket_name
140163
141-
//optional
164+
// Optional
142165
batch_rollover_size_in_mbs" = "10"
143-
//optional
166+
// Optional
144167
batch_rollover_time_in_ms" = "80000"
145168
}*/
146169

@@ -152,8 +175,8 @@ resource "oci_sch_service_connector" "test_service_connector" {
152175

153176
// If using the notification target
154177
/*target {
155-
kind = "notifications"
156-
topic_id = var.notification_topic_id
178+
kind = "notifications"
179+
topic_id = var.notification_topic_id
157180
enable_formatted_messaging = "true"
158181
}*/
159182

@@ -162,6 +185,14 @@ resource "oci_sch_service_connector" "test_service_connector" {
162185
kind = "logRule"
163186
}
164187

188+
// If using function task
189+
/*
190+
tasks {
191+
function_id = oci_functions_function.test_function.id
192+
kind = "functions"
193+
}
194+
*/
195+
165196
state = "ACTIVE"
166197
}
167198

examples/web_application_acceleration_and_security/waas_full.tf

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ variable "certificate_display_name" {
2424
}
2525

2626
variable "waas_policy_display_name" {
27-
default = "tf_example_waas_policy"
27+
default = "tf_example_waas_policy_test"
2828
}
2929

3030
provider "oci" {
@@ -86,10 +86,10 @@ resource "oci_waas_address_list" "test_address_list" {
8686
resource "oci_waas_waas_policy" "test_waas_policy" {
8787
#Required
8888
compartment_id = var.compartment_ocid
89-
domain = "somethingnew54.oracle.com"
89+
domain = "somethingnew66.oracle.com"
9090

9191
#Optional
92-
additional_domains = ["somethingnew55.oracle.com", "somethingnew56.oracle.com"]
92+
additional_domains = ["somethingnew67.oracle.com", "somethingnew68.oracle.com"]
9393
display_name = var.waas_policy_display_name
9494

9595
origin_groups {
@@ -177,7 +177,7 @@ resource "oci_waas_waas_policy" "test_waas_policy" {
177177
is_response_buffering_enabled = true
178178
is_sni_enabled = true
179179
websocket_path_prefixes = ["/url1"]
180-
tls_protocols = ["TLS_V1_1"]
180+
tls_protocols = ["TLS_V1_3"]
181181

182182
health_checks {
183183
is_enabled = true
@@ -467,7 +467,7 @@ data "oci_waas_address_lists" "test_address_lists" {
467467
compartment_id = var.compartment_ocid
468468

469469
#Optional
470-
ids = [oci_waas_address_list.test_address_list.id}]
470+
ids = [oci_waas_address_list.test_address_list.id]
471471
names = ["tf-example-address-list"]
472472
states = ["ACTIVE"]
473473
time_created_greater_than_or_equal_to = "2018-01-01T00:00:00.000Z"
@@ -489,7 +489,7 @@ data "oci_waas_custom_protection_rules" "test_custom_protection_rules" {
489489
resource "oci_waas_http_redirect" "test_http_redirect" {
490490
#Required
491491
compartment_id = var.compartment_ocid
492-
domain = "example3.com"
492+
domain = "example5.com"
493493

494494
target {
495495
#Required
@@ -523,4 +523,3 @@ data "oci_waas_http_redirects" "test_http_redirects" {
523523
time_created_greater_than_or_equal_to = "2018-01-01T00:00:00.000Z"
524524
time_created_less_than = "2038-01-01T00:00:00.000Z"
525525
}
526-

0 commit comments

Comments
 (0)