Release v3.48.0

Release v3.48.0

Author: dshelbyo

CHANGELOG.md

@@ -1,4 +1,27 @@
-## 3.46.1 (Unreleased)
+## 3.48.0 (Unreleased)
+
+### Added
+- Support for Oracle Digital Assistant
+
+### Deprecated
+- Instances: The `hostname_label` and `subnet_id` attributes are now deprecated. Please use the `hostname_label` and `subnet_id` attributes under `create_vnic_details`.
+
+### Fixed
+- Update for whitelisted ips in `oci_autonomous_database`
+
+## 3.47.0 (October 09, 2019)
+
+### Added
+- Support for Audit v2 enhancements. Note: `oci_audit_events` data source schema is updated
+- Support for specifying network_type in `launch_options` for the `core_instance` resource
+- Support for `home_region` and `time_created` attributes in health_checks resources and datasources
+- Support for custom scheduled backup policies in Block Storage 
+- Support for importing `oci_load_balancer_certificate` resource
+
+### Notes
+Starting with this version, newly created load balancer certificates will have an `id` in the form of `loadBalancers/{loadBalancerId}/certificates/{certificateName}`.
+Load balancer certificates created with previous versions and upgrading to this version will continue to store `id` in the form of `{certificateName}`.
+
 ## 3.46.0 (October 02, 2019)
 
 ### Added

examples/compute/extended_metadata/extended_metadata.tf

@@ -91,9 +91,12 @@ resource "oci_core_instance" "test_instance" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "TestInstance"
-  hostname_label      = "testinstance"
   shape               = "VM.Standard2.1"
-  subnet_id           = "${oci_core_subnet.test_subnet.id}"
+
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.test_subnet.id}"
+    hostname_label = "testinstance"
+  }
 
   source_details {
     source_type = "image"

examples/compute/vnic/vnic.tf

@@ -72,7 +72,6 @@ resource "oci_core_instance" "test_instance" {
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "TestInstance"
   shape               = "VM.Standard2.1"
-  subnet_id           = "${oci_core_subnet.test_subnet.id}"
 
   source_details {
     source_type = "image"

examples/compute/windows/windows.tf

@@ -183,15 +183,18 @@ resource "oci_core_instance" "test_instance" {
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "${var.instance_name}"
   shape               = "VM.Standard2.1"
-  subnet_id           = "${oci_core_subnet.test_subnet.id}"
-  hostname_label      = "winmachine"
 
   # Refer cloud-init in https://docs.cloud.oracle.com/iaas/api/#/en/iaas/20160918/datatypes/LaunchInstanceDetails
   metadata = {
     # Base64 encoded YAML based user_data to be passed to cloud-init
     user_data = "${data.template_cloudinit_config.cloudinit_config.rendered}"
   }
 
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.test_subnet.id}"
+    hostname_label = "winmachine"
+  }
+
   source_details {
     boot_volume_size_in_gbs = "${var.size_in_gbs}"
     source_id               = "${var.instance_image_ocid[var.region]}"

examples/kms/instance.tf

@@ -4,14 +4,17 @@ resource "oci_core_instance" "my_instance" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_id}"
   display_name        = "my instance with FSS access"
-  hostname_label      = "myinstance"
   shape               = "${var.instance_shape}"
-  subnet_id           = "${oci_core_subnet.my_subnet.id}"
 
   metadata = {
     ssh_authorized_keys = "${var.ssh_public_key}"
   }
 
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.my_subnet.id}"
+    hostname_label = "myinstance"
+  }
+
   source_details {
     source_type = "image"
     source_id   = "${var.instance_image_ocid[var.region]}"

examples/load_balancer/lb_full/lb_full.tf

@@ -153,13 +153,16 @@ resource "oci_core_instance" "instance1" {
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "be-instance1"
   shape               = "${var.instance_shape}"
-  subnet_id           = "${oci_core_subnet.subnet1.id}"
-  hostname_label      = "be-instance1"
 
   metadata = {
     user_data = "${base64encode(var.user-data)}"
   }
 
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.subnet1.id}"
+    hostname_label = "be-instance1"
+  }
+
   source_details {
     source_type = "image"
     source_id   = "${var.instance_image_ocid[var.region]}"
@@ -171,13 +174,16 @@ resource "oci_core_instance" "instance2" {
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "be-instance2"
   shape               = "${var.instance_shape}"
-  subnet_id           = "${oci_core_subnet.subnet2.id}"
-  hostname_label      = "be-instance2"
 
   metadata = {
     user_data = "${base64encode(var.user-data)}"
   }
 
+  create_vnic_details {
+    subnet_id      = "${oci_core_subnet.subnet2.id}"
+    hostname_label = "be-instance2"
+  }
+
   source_details {
     source_type = "image"
     source_id   = "${var.instance_image_ocid[var.region]}"
@@ -349,7 +355,7 @@ resource "oci_load_balancer_rule_set" "test_rule_set" {
 
     conditions {
       attribute_name  = "SOURCE_VCN_ID"
-      attribute_value = "${oci_core_virtual_network.vcn1.id}"
+      attribute_value = "${oci_core_vcn.vcn1.id}"
     }
 
     conditions {

examples/networking/private_ip/private_ip.tf

@@ -65,11 +65,11 @@ resource "oci_core_instance" "test_instance1" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "testInstance"
-  hostname_label      = "instance"
   shape               = "${var.instance_shape}"
 
   create_vnic_details {
-    subnet_id = "${oci_core_subnet.example_subnet.id}"
+    subnet_id      = "${oci_core_subnet.example_subnet.id}"
+    hostname_label = "instance"
   }
 
   source_details {

examples/networking/public_ip/public_ip.tf

@@ -66,7 +66,6 @@ resource "oci_core_instance" "test_instance" {
   availability_domain = "${data.oci_identity_availability_domain.ad.name}"
   compartment_id      = "${var.compartment_ocid}"
   display_name        = "testInstance"
-  hostname_label      = "instance"
   shape               = "${var.instance_shape}"
 
   source_details {
@@ -78,6 +77,7 @@ resource "oci_core_instance" "test_instance" {
     assign_public_ip = false
     display_name     = "primaryVnic"
     subnet_id        = "${oci_core_subnet.test_subnet.id}"
+    hostname_label   = "instance"
   }
 }
 

examples/oracle_digital_assistant/main.tf

@@ -0,0 +1,39 @@
+// Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+
+variable "compartment_ocid" {}
+
+provider "oci" {
+  tenancy_ocid     = "${var.tenancy_ocid}"
+  user_ocid        = "${var.user_ocid}"
+  fingerprint      = "${var.fingerprint}"
+  private_key_path = "${var.private_key_path}"
+  region           = "${var.region}"
+}
+
+resource "oci_oda_oda_instance" "TFOdaInstance" {
+  compartment_id = "${var.compartment_ocid}"
+  shape_name     = "DEVELOPMENT"
+  description    = "test instance"
+  display_name   = "TestInstance"
+}
+
+data "oci_oda_oda_instances" "TFOdaInstances" {
+  #Required
+  compartment_id = "${var.compartment_ocid}"
+
+  #Optional
+  display_name = "${oci_oda_oda_instance.TFOdaInstance.display_name}"
+
+  #state        = "${var.oda_instance_state}"
+}
+
+data "oci_oda_oda_instance" "TFOdaInstance" {
+  #Required
+  oda_instance_id = "${oci_oda_oda_instance.TFOdaInstance.id}"
+}

examples/storage/block/volume/volume_backup_policy.tf

@@ -15,46 +15,38 @@ provider "oci" {
   region           = "${var.region}"
 }
 
-variable "DBSize" {
-  default = "50" // size in GBs, min: 50, max 16384
-}
-
 data "oci_identity_availability_domain" "ad" {
   compartment_id = "${var.tenancy_ocid}"
   ad_number      = 1
 }
 
-resource "oci_core_volume" "t" {
-  availability_domain = "${data.oci_identity_availability_domain.ad.name}"
-  compartment_id      = "${var.compartment_ocid}"
-  display_name        = "-tf-volume"
-  size_in_gbs         = "${var.DBSize}"
-}
+// Example 1: Using predefined policy
 
-data "oci_core_volume_backup_policies" "test_volume_backup_policies" {}
-
-output "policies" {
-  value = "${data.oci_core_volume_backup_policies.test_volume_backup_policies.volume_backup_policies}"
-}
-
-data "oci_core_volume_backup_policies" "test_volume_backup_policies_silver" {
+data "oci_core_volume_backup_policies" "test_predefined_volume_backup_policies" {
   filter {
     name   = "display_name"
     values = ["silver"]
   }
 }
 
 output "silver_policy_id" {
-  value = "${data.oci_core_volume_backup_policies.test_volume_backup_policies_silver.volume_backup_policies.0.id}"
+  value = "${data.oci_core_volume_backup_policies.test_predefined_volume_backup_policies.volume_backup_policies.0.id}"
+}
+
+resource "oci_core_volume" "test_volume_1" {
+  availability_domain = "${data.oci_identity_availability_domain.ad.name}"
+  compartment_id      = "${var.compartment_ocid}"
+  display_name        = "-tf-volume-1"
+  size_in_gbs         = "50"
 }
 
 resource "oci_core_volume_backup_policy_assignment" "test_backup_policy_assignment" {
-  asset_id  = "${oci_core_volume.t.id}"
-  policy_id = "${data.oci_core_volume_backup_policies.test_volume_backup_policies_silver.volume_backup_policies.0.id}"
+  asset_id  = "${oci_core_volume.test_volume_1.id}"
+  policy_id = "${data.oci_core_volume_backup_policies.test_predefined_volume_backup_policies.volume_backup_policies.0.id}"
 }
 
 data "oci_core_volume_backup_policy_assignments" "test_backup_policy_assignments" {
-  asset_id = "${oci_core_volume.t.id}"
+  asset_id = "${oci_core_volume.test_volume_1.id}"
 
   filter {
     name   = "id"
@@ -65,3 +57,59 @@ data "oci_core_volume_backup_policy_assignments" "test_backup_policy_assignments
 output "test_backup_policy_assignments" {
   value = "${data.oci_core_volume_backup_policy_assignments.test_backup_policy_assignments.volume_backup_policy_assignments}"
 }
+
+// Example 2: Using custom scheduled policy
+
+resource "oci_core_volume_backup_policy" "test_volume_backup_policy_custom" {
+  #Required
+  compartment_id = "${var.compartment_ocid}"
+
+  #Optional
+  defined_tags = "${map("example-tag-namespace-all.example-tag", "originalValue")}"
+  display_name = "BackupPolicy1"
+
+  freeform_tags = {
+    "Department" = "Finance"
+  }
+
+  schedules {
+    #Required
+    backup_type       = "INCREMENTAL"
+    period            = "ONE_YEAR"
+    retention_seconds = "604800"
+
+    #Optional
+    day_of_month   = "10"
+    day_of_week    = "TUESDAY"
+    hour_of_day    = "10"
+    month          = "FEBRUARY"
+    offset_seconds = "0"
+    offset_type    = "STRUCTURED"
+    time_zone      = "UTC"
+  }
+}
+
+resource "oci_core_volume" "test_volume_2" {
+  availability_domain = "${data.oci_identity_availability_domain.ad.name}"
+  compartment_id      = "${var.compartment_ocid}"
+  display_name        = "-tf-volume-2"
+  size_in_gbs         = "50"
+}
+
+resource "oci_core_volume_backup_policy_assignment" "test_backup_policy_assignment_custom" {
+  asset_id  = "${oci_core_volume.test_volume_2.id}"
+  policy_id = "${oci_core_volume_backup_policy.test_volume_backup_policy_custom.id}"
+}
+
+data "oci_core_volume_backup_policy_assignments" "test_backup_policy_assignments_custom" {
+  asset_id = "${oci_core_volume.test_volume_2.id}"
+
+  filter {
+    name   = "id"
+    values = ["${oci_core_volume_backup_policy_assignment.test_backup_policy_assignment_custom.id}"]
+  }
+}
+
+output "test_backup_policy_assignments_custom" {
+  value = "${data.oci_core_volume_backup_policy_assignments.test_backup_policy_assignments_custom.volume_backup_policy_assignments}"
+}