Skip to content

Commit da202e3

Browse files
dshelbyodshelbyo
authored
Release 3.16.0
Release 3.16.0
2 parents f68fdd5 + 7caa8c9 commit da202e3

File tree

102 files changed

+4112
-325
lines changed

Some content is hidden

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

102 files changed

+4112
-325
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
## 3.15.1 (Unreleased)
1+
## 3.16.0 (Unreleased)
22

33
### Added
44
- Adding description property to rules in Steering Policies in DNS
5+
- Enable regional Subnets by making Availability Domain optional when creating a Subnet
6+
- Support for Streaming service
7+
- Support for the tagging of applicable KMS resources
8+
9+
### Fixed
10+
- DNS Record now requires domain and rtype as mandatory arguments. Managing DNS record resources now requires DNS_RECORD* level policy entitlements instead of DNS_ZONE*. [Permissions List](https://docs.cloud.oracle.com/iaas/Content/Identity/Reference/dnspolicyreference.htm)
511

612
## 3.15.0 (February 12, 2019)
713

‎docs/examples/networking/subnet/subnet.tf‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,36 @@ variable "availability_domain" {
1919
default = 3
2020
}
2121

22-
resource "oci_core_virtual_network" "ExampleVCN" {
23-
cidr_block = "10.1.0.0/16"
22+
resource "oci_core_virtual_network" "vcn1" {
23+
cidr_block = "10.0.0.0/16"
2424
compartment_id = "${var.compartment_ocid}"
2525
display_name = "TFExampleVCN"
2626
dns_label = "tfexamplevcn"
2727
}
2828

29-
/*
30-
Because you can specify multiple security lists/subnet the security_list_ids value must be specified as a list in []'s.
31-
See https://www.terraform.io/docs/configuration/syntax.html
32-
33-
Generally you wouldn't specify a subnet without first specifying a VCN. Once the VCN has been created you would get the vcn_id, route_table_id, and security_list_id(s) from that resource and use Terraform attributes below to populate those values.
34-
See https://www.terraform.io/docs/configuration/interpolation.html*/
35-
resource "oci_core_subnet" "ExampleSubnet" {
29+
// A regional subnet will not specify an Availability Domain
30+
resource "oci_core_subnet" "subnet1" {
31+
cidr_block = "10.0.1.0/24"
32+
display_name = "TFRegionalSubnet"
33+
dns_label = "regionalsubnet"
34+
compartment_id = "${var.compartment_ocid}"
35+
vcn_id = "${oci_core_virtual_network.vcn1.id}"
36+
security_list_ids = ["${oci_core_virtual_network.vcn1.default_security_list_id}"]
37+
route_table_id = "${oci_core_virtual_network.vcn1.default_route_table_id}"
38+
dhcp_options_id = "${oci_core_virtual_network.vcn1.default_dhcp_options_id}"
39+
}
40+
41+
// An AD based subnet will supply an Availability Domain
42+
resource "oci_core_subnet" "subnet2" {
3643
availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
37-
cidr_block = "10.1.1.0/24"
38-
display_name = "TFExampleSubnet"
39-
dns_label = "tfexamplesubnet"
44+
cidr_block = "10.0.2.0/24"
45+
display_name = "TFADSubnet"
46+
dns_label = "adsubnet"
4047
compartment_id = "${var.compartment_ocid}"
41-
vcn_id = "${oci_core_virtual_network.ExampleVCN.id}"
42-
security_list_ids = ["${oci_core_virtual_network.ExampleVCN.default_security_list_id}"]
43-
route_table_id = "${oci_core_virtual_network.ExampleVCN.default_route_table_id}"
44-
dhcp_options_id = "${oci_core_virtual_network.ExampleVCN.default_dhcp_options_id}"
48+
vcn_id = "${oci_core_virtual_network.vcn1.id}"
49+
security_list_ids = ["${oci_core_virtual_network.vcn1.default_security_list_id}"]
50+
route_table_id = "${oci_core_virtual_network.vcn1.default_route_table_id}"
51+
dhcp_options_id = "${oci_core_virtual_network.vcn1.default_dhcp_options_id}"
4552
}
4653

4754
data "oci_identity_availability_domains" "ADs" {

‎docs/examples/streaming/main.tf‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
variable "tenancy_ocid" {}
2+
variable "user_ocid" {}
3+
variable "fingerprint" {}
4+
variable "private_key_path" {}
5+
variable "region" {}
6+
7+
provider "oci" {
8+
tenancy_ocid = "${var.tenancy_ocid}"
9+
user_ocid = "${var.user_ocid}"
10+
fingerprint = "${var.fingerprint}"
11+
private_key_path = "${var.private_key_path}"
12+
region = "${var.region}"
13+
}
14+
15+
resource "oci_streaming_stream" "stream" {
16+
compartment_id = "${var.tenancy_ocid}"
17+
name = "stream1"
18+
partitions = "1"
19+
retention_in_hours = "24"
20+
}
21+
22+
data "oci_streaming_stream" "stream1" {
23+
stream_id = "${oci_streaming_stream.stream.id}"
24+
}
25+
26+
# Output the result
27+
output "stream" {
28+
value = <<EOF
29+
30+
id = "${data.oci_streaming_stream.stream1.id}"
31+
compartment_id = "${data.oci_streaming_stream.stream1.compartment_id}"
32+
messages_endpoint = "${data.oci_streaming_stream.stream1.messages_endpoint}"
33+
name = "${data.oci_streaming_stream.stream1.name}"
34+
partitions = "${data.oci_streaming_stream.stream1.partitions}"
35+
retention_in_hours = "${data.oci_streaming_stream.stream1.retention_in_hours}"
36+
state = "${data.oci_streaming_stream.stream1.state}"
37+
time_created = "${data.oci_streaming_stream.stream1.time_created}"
38+
EOF
39+
40+
# This value is not always present--when state is FAILED it may contain an explanation.
41+
#lifecycle_state_details = "${data.oci_streaming_stream.stream1.lifecycle_state_details}"
42+
}
43+
44+
data "oci_streaming_streams" "streams" {
45+
compartment_id = "${oci_streaming_stream.stream.compartment_id}"
46+
47+
# optional
48+
state = "ACTIVE"
49+
50+
// id = "${oci_streaming_stream.stream.id}"
51+
// name = "${oci_streaming_stream.stream.name}"
52+
}
53+
54+
output "streams" {
55+
value = "${data.oci_streaming_streams.streams.streams}"
56+
}

‎oci/core_instance_resource.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,11 @@ func CoreInstanceResource() *schema.Resource {
155155
Elem: schema.TypeString,
156156
},
157157
"fault_domain": {
158-
Type: schema.TypeString,
159-
Optional: true,
160-
Computed: true,
161-
ForceNew: true,
158+
Type: schema.TypeString,
159+
Optional: true,
160+
Computed: true,
161+
ForceNew: true,
162+
DiffSuppressFunc: EqualIgnoreCaseSuppressDiff,
162163
},
163164
"freeform_tags": {
164165
Type: schema.TypeMap,

‎oci/core_subnet_resource.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ func CoreSubnetResource() *schema.Resource {
2222
Delete: deleteCoreSubnet,
2323
Schema: map[string]*schema.Schema{
2424
// Required
25-
"availability_domain": {
26-
Type: schema.TypeString,
27-
Required: true,
28-
ForceNew: true,
29-
},
3025
"cidr_block": {
3126
Type: schema.TypeString,
3227
Required: true,
@@ -44,6 +39,12 @@ func CoreSubnetResource() *schema.Resource {
4439
},
4540

4641
// Optional
42+
"availability_domain": {
43+
Type: schema.TypeString,
44+
Optional: true,
45+
Computed: true,
46+
ForceNew: true,
47+
},
4748
"defined_tags": {
4849
Type: schema.TypeMap,
4950
Optional: true,

‎oci/core_subnet_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ var (
3838
}
3939

4040
subnetRepresentation = map[string]interface{}{
41-
"availability_domain": Representation{repType: Required, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
4241
"cidr_block": Representation{repType: Required, create: `10.0.0.0/16`},
4342
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
4443
"vcn_id": Representation{repType: Required, create: `${oci_core_vcn.test_vcn.id}`},
44+
"availability_domain": Representation{repType: Optional, create: `${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}`},
4545
"defined_tags": Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
4646
"dhcp_options_id": Representation{repType: Optional, create: `${oci_core_vcn.test_vcn.default_dhcp_options_id}`, update: `${oci_core_dhcp_options.test_dhcp_options.id}`},
4747
"display_name": Representation{repType: Optional, create: `MySubnet`, update: `displayName2`},
@@ -82,7 +82,6 @@ func TestCoreSubnetResource_basic(t *testing.T) {
8282
Config: config + compartmentIdVariableStr + SubnetResourceDependencies +
8383
generateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", Required, Create, subnetRepresentation),
8484
Check: resource.ComposeAggregateTestCheckFunc(
85-
resource.TestCheckResourceAttrSet(resourceName, "availability_domain"),
8685
resource.TestCheckResourceAttr(resourceName, "cidr_block", "10.0.0.0/16"),
8786
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
8887
resource.TestCheckResourceAttrSet(resourceName, "dhcp_options_id"),

‎oci/database_db_system_shapes_data_source.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ func DatabaseDbSystemShapesDataSource() *schema.Resource {
5757
Computed: true,
5858
},
5959
"shape": {
60-
Type: schema.TypeString,
61-
Computed: true,
60+
Type: schema.TypeString,
61+
Computed: true,
62+
Deprecated: FieldDeprecatedForAnother("shape", "name"),
6263
},
6364
},
6465
},

0 commit comments

Comments
 (0)