Skip to content

Commit dd1ebaf

Browse files
alexng-canuckalexng-canuck
authored
Candidate for release_v3.55.0
Release merge v3.55.0
2 parents cf740ec + 8e5bb2a commit dd1ebaf

File tree

152 files changed

+3429
-329
lines changed

Some content is hidden

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

152 files changed

+3429
-329
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
## 3.54.1 (Unreleased)
1+
## 3.55.0 (Unreleased)
2+
3+
### Added
4+
- Support Etag in `oci_objectstorage_objects` resource
5+
- Support for Network Security Groups in `oci_file_storage_mount_target` resource
6+
- Support for multi-attach for block storage
7+
- Support for cache control and control-disposition headers in `oci_objectstorage_object`
8+
- Support for OCID in Bucket Resource
9+
210
## 3.54.0 (November 27, 2019)
311

412
### Added

‎examples/compute/instance/pv_encryption_enabled_volume_attachment.tf‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
# Instance with encryption in transit enabled
44

55
resource "oci_core_instance" "test_instance_with_pv_encryption_in_transit" {
6+
count = 2
67
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
78
compartment_id = "${var.compartment_ocid}"
8-
display_name = "TestInstance"
9+
display_name = "TestInstance${count.index}"
910
shape = "${var.instance_shape}"
1011

1112
create_vnic_details {
1213
subnet_id = "${oci_core_subnet.test_subnet.id}"
1314
display_name = "Primaryvnic"
1415
assign_public_ip = true
15-
hostname_label = "testinstance"
16+
hostname_label = "testinstance${count.index}"
1617
}
1718

1819
source_details {
@@ -38,12 +39,14 @@ resource "oci_core_volume" "test_volume" {
3839
}
3940

4041
resource "oci_core_volume_attachment" "test_volume_attachment" {
42+
count = 2
4143
attachment_type = "paravirtualized"
42-
instance_id = "${oci_core_instance.test_instance_with_pv_encryption_in_transit.id}"
44+
instance_id = "${oci_core_instance.test_instance_with_pv_encryption_in_transit.*.id[count.index]}"
4345
volume_id = "${oci_core_volume.test_volume.id}"
4446
display_name = "TestVolumeAttachment"
4547
is_read_only = true
4648
is_pv_encryption_in_transit_enabled = true
49+
is_shareable = "true"
4750
}
4851

4952
# Gets a list of all Oracle Linux 7.5 images that support a given Instance shape

‎examples/object_storage/object.tf‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,32 @@
88
*/
99

1010
resource "oci_objectstorage_object" "object1" {
11-
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
12-
bucket = "${oci_objectstorage_bucket.bucket1.name}"
13-
object = "index.html"
14-
content_language = "en-US"
15-
content_type = "text/html"
16-
content = "${file("index.html")}"
11+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
12+
bucket = "${oci_objectstorage_bucket.bucket1.name}"
13+
object = "index.html"
14+
content_language = "en-US"
15+
content_type = "text/html"
16+
content = "${file("index.html")}"
17+
content_disposition = "attachment; filename=\"filename.html\""
1718
}
1819

1920
resource "oci_objectstorage_object" "source_object" {
20-
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
21-
bucket = "${oci_objectstorage_bucket.bucket1.name}"
22-
object = "same_index.html"
23-
content_language = "en-US"
24-
content_type = "text/html"
25-
source = "index.html"
21+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
22+
bucket = "${oci_objectstorage_bucket.bucket1.name}"
23+
object = "same_index.html"
24+
content_language = "en-US"
25+
content_type = "text/html"
26+
source = "index.html"
27+
content_disposition = "attachment; filename=\"filename.html\""
2628
}
2729

2830
resource "oci_objectstorage_object" "source_uri_object" {
29-
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
30-
bucket = "${oci_objectstorage_bucket.bucket1.name}"
31-
object = "copy_index.html"
32-
content_language = "en-US"
33-
content_type = "text/html"
31+
namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
32+
bucket = "${oci_objectstorage_bucket.bucket1.name}"
33+
object = "copy_index.html"
34+
content_language = "en-US"
35+
content_type = "text/html"
36+
content_disposition = "attachment; filename=\"filename.html\""
3437

3538
source_uri_details {
3639
region = "${local.source_region}"

‎examples/storage/fss/mount_target.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ resource "oci_file_storage_mount_target" "my_mount_target_1" {
1313
freeform_tags = {
1414
"Department" = "Finance"
1515
}
16+
17+
nsg_ids = ["${oci_core_network_security_group.test_network_security_group.id}"]
1618
}
1719

1820
resource "oci_file_storage_mount_target" "my_mount_target_2" {
@@ -28,6 +30,8 @@ resource "oci_file_storage_mount_target" "my_mount_target_2" {
2830
freeform_tags = {
2931
"Department" = "Accounting"
3032
}
33+
34+
nsg_ids = ["${oci_core_network_security_group.test_network_security_group.id}"]
3135
}
3236

3337
# Use export_set.tf config to update the size for a mount target

‎examples/storage/fss/network.tf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ resource "oci_core_route_table" "my_route_table" {
2626
}
2727

2828
resource "oci_core_subnet" "my_subnet" {
29+
depends_on = ["oci_core_network_security_group.test_network_security_group"]
2930
availability_domain = "${data.oci_identity_availability_domain.ad.name}"
3031
cidr_block = "${var.my_subnet_cidr}"
3132
display_name = "mysubnet"
@@ -35,3 +36,9 @@ resource "oci_core_subnet" "my_subnet" {
3536
security_list_ids = ["${oci_core_security_list.my_security_list.id}"]
3637
route_table_id = "${oci_core_route_table.my_route_table.id}"
3738
}
39+
40+
resource "oci_core_network_security_group" "test_network_security_group" {
41+
#Required
42+
compartment_id = "${var.compartment_ocid}"
43+
vcn_id = "${oci_core_vcn.my_vcn.id}"
44+
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce
77
github.com/hashicorp/terraform v0.12.4-0.20190628193153-a74738cd35fc
88
github.com/mitchellh/cli v1.0.0
9-
github.com/oracle/oci-go-sdk v13.0.0+incompatible
9+
github.com/oracle/oci-go-sdk v13.1.0+incompatible
1010
github.com/stretchr/objx v0.1.1 // indirect
1111
github.com/stretchr/testify v1.3.0
1212
gopkg.in/yaml.v2 v2.2.2

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ github.com/oracle/oci-go-sdk v12.5.0+incompatible h1:pr08ECoaDKHWO9tnzJB1YqClEs7
336336
github.com/oracle/oci-go-sdk v12.5.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
337337
github.com/oracle/oci-go-sdk v13.0.0+incompatible h1:ueAty9OrRXfWi+4gyPLKcOpzhf1OSK70mwt36sD/hf8=
338338
github.com/oracle/oci-go-sdk v13.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
339+
github.com/oracle/oci-go-sdk v13.1.0+incompatible h1:inwbT0b/mMbnTfzYoW2xcU1cCMIlU6Fz973at5phRXM=
340+
github.com/oracle/oci-go-sdk v13.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
339341
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58 h1:m3CEgv3ah1Rhy82L+c0QG/U3VyY1UsvsIdkh0/rU97Y=
340342
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
341343
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=

‎oci/containerengine_node_pool_resource.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ func ContainerengineNodePoolResource() *schema.Resource {
8181
Type: schema.TypeList,
8282
Optional: true,
8383
Computed: true,
84-
ConflictsWith: []string{"quantity_per_subnet", "subnet_ids"},
8584
MaxItems: 1,
8685
MinItems: 1,
86+
ConflictsWith: []string{"quantity_per_subnet", "subnet_ids"},
8787
Elem: &schema.Resource{
8888
Schema: map[string]*schema.Schema{
8989
// Required
@@ -123,15 +123,15 @@ func ContainerengineNodePoolResource() *schema.Resource {
123123
"node_image_id": {
124124
Type: schema.TypeString,
125125
Optional: true,
126-
ForceNew: true,
127126
Computed: true,
127+
ForceNew: true,
128128
ConflictsWith: []string{"node_image_name"},
129129
},
130130
"node_image_name": {
131131
Type: schema.TypeString,
132132
Optional: true,
133-
ForceNew: true,
134133
Computed: true,
134+
ForceNew: true,
135135
ConflictsWith: []string{"node_image_id"},
136136
},
137137
"node_metadata": {

‎oci/core_virtual_circuit_resource.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ func CoreVirtualCircuitResource() *schema.Resource {
106106
Type: schema.TypeInt,
107107
Optional: true,
108108
Computed: true,
109-
Deprecated: FieldDeprecatedForAnother("customer_bgp_asn", "customer_asn"),
110109
ConflictsWith: []string{"customer_asn"},
110+
Deprecated: FieldDeprecatedForAnother("customer_bgp_asn", "customer_asn"),
111111
},
112112
"defined_tags": {
113113
Type: schema.TypeMap,

‎oci/core_volume_attachment_resource.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ func CoreVolumeAttachmentResource() *schema.Resource {
7171
Computed: true,
7272
ForceNew: true,
7373
},
74+
"is_shareable": {
75+
Type: schema.TypeBool,
76+
Optional: true,
77+
Computed: true,
78+
ForceNew: true,
79+
},
7480
"use_chap": {
7581
Type: schema.TypeBool,
7682
Optional: true,
@@ -379,6 +385,10 @@ func (s *CoreVolumeAttachmentResourceCrud) populateTopLevelPolymorphicAttachVolu
379385
tmp := isReadOnly.(bool)
380386
details.IsReadOnly = &tmp
381387
}
388+
if isShareable, ok := s.D.GetOkExists("is_shareable"); ok {
389+
tmp := isShareable.(bool)
390+
details.IsShareable = &tmp
391+
}
382392
if volumeId, ok := s.D.GetOkExists("volume_id"); ok {
383393
tmp := volumeId.(string)
384394
details.VolumeId = &tmp
@@ -406,6 +416,10 @@ func (s *CoreVolumeAttachmentResourceCrud) populateTopLevelPolymorphicAttachVolu
406416
tmp := isReadOnly.(bool)
407417
details.IsReadOnly = &tmp
408418
}
419+
if isShareable, ok := s.D.GetOkExists("is_shareable"); ok {
420+
tmp := isShareable.(bool)
421+
details.IsShareable = &tmp
422+
}
409423
if volumeId, ok := s.D.GetOkExists("volume_id"); ok {
410424
tmp := volumeId.(string)
411425
details.VolumeId = &tmp

0 commit comments

Comments
 (0)