Merge pull request #629 from terraform-providers/release

Release v3.5.0

Author: afedorch

CHANGELOG.md

@@ -1,4 +1,15 @@
 ## 3.5.0 (Unreleased)
+
+### Added
+- Support for [Cross Region Copy](https://docs.cloud.oracle.com/iaas/Content/Object/Tasks/copyingobjects.htm) of objects
+- Support for object lifecycle policies on a bucket on object storage. See [Using Object Lifecycle Management](https://docs.cloud.oracle.com/iaas/Content/Object/Tasks/usinglifecyclepolicies.htm)
+- Support for singular data source for a bucket
+- Additional nested field in `oci_database_backups` data source and `oci_database_backup` resource, under the `backups` property called `database_size_in_gbs`
+- Support for generating and downloading wallets for Autonomous Database and Autonomous Data Warehouse. See [Connecting to Autonomous Data Warehouse](https://docs.cloud.oracle.com/iaas/Content/Database/Tasks/adwconnecting.htm) for more details.
+
+### Changed
+- Nested field in `oci_database_backups` data source and `oci_database_backup` resource, under the `backups` property called `db_data_size_in_mbs` marked as deprecated
+
 ## 3.4.0 (October 11, 2018)
 
 ### Added

docs/examples/database/adw/autonomous_data_warehouse.tf

@@ -33,3 +33,7 @@ output "autonomous_data_warehouse_admin_password" {
 output "autonomous_data_warehouses" {
   value = "${data.oci_database_autonomous_data_warehouses.autonomous_data_warehouses.autonomous_data_warehouses}"
 }
+
+output "parallel_connection_string" {
+  value = ["${lookup(oci_database_autonomous_data_warehouse.autonomous_data_warehouse.connection_strings.0.all_connection_strings, "PARALLEL", "Unavailable")}"]
+}

docs/examples/database/adw/autonomous_data_warehouse_wallet.tf

@@ -0,0 +1,19 @@
+resource "random_string" "wallet_password" {
+  length  = 16
+  special = true
+}
+
+data "oci_database_autonomous_data_warehouse_wallet" "autonomous_data_warehouse_wallet" {
+  #Required
+  autonomous_data_warehouse_id = "${oci_database_autonomous_data_warehouse.autonomous_data_warehouse.id}"
+  password = "${random_string.wallet_password.result}"
+}
+
+resource "local_file" "autonomous_data_warehouse_wallet_file" {
+  content  = "${data.oci_database_autonomous_data_warehouse_wallet.autonomous_data_warehouse_wallet.content}"
+  filename = "${path.module}/autonomous_data_warehouse_wallet.zip"
+}
+
+output "wallet_password" {
+  value = ["${random_string.wallet_password.result}"]
+}

docs/examples/database/atp/autonomous_database.tf

@@ -32,3 +32,7 @@ output "autonomous_database_admin_password" {
 output "autonomous_databases" {
   value = "${data.oci_database_autonomous_databases.autonomous_databases.autonomous_databases}"
 }
+
+output "parallel_connection_string" {
+  value = ["${lookup(oci_database_autonomous_database.autonomous_database.connection_strings.0.all_connection_strings, "PARALLEL", "Unavailable")}"]
+}

docs/examples/database/atp/autonomous_database_wallet.tf

@@ -0,0 +1,19 @@
+resource "random_string" "wallet_password" {
+  length  = 16
+  special = true
+}
+
+data "oci_database_autonomous_database_wallet" "autonomous_database_wallet" {
+  #Required
+  autonomous_database_id = "${oci_database_autonomous_database.autonomous_database.id}"
+  password    = "${random_string.wallet_password.result}"
+}
+
+resource "local_file" "autonomous_database_wallet_file" {
+  content  = "${data.oci_database_autonomous_database_wallet.autonomous_database_wallet.content}"
+  filename = "${path.module}/autonomous_database_wallet.zip"
+}
+
+output "wallet_password" {
+  value = ["${random_string.wallet_password.result}"]
+}

docs/examples/db_systems/network.tf

@@ -2,14 +2,14 @@ resource "oci_core_virtual_network" "vcn" {
   cidr_block     = "10.1.0.0/16"
   compartment_id = "${var.compartment_ocid}"
   display_name   = "TFExampleVCNDBSystem"
-  dns_label      = "tfexamplevcndbsystem"
+  dns_label      = "tfexvcndbsys"
 }
 
 resource "oci_core_subnet" "subnet" {
   availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.availability_domain - 1],"name")}"
   cidr_block          = "10.1.20.0/24"
   display_name        = "TFExampleSubnetDBSystem"
-  dns_label           = "tfexamplesubnetdbsystem"
+  dns_label           = "tfexsubdbsys"
   security_list_ids   = ["${oci_core_virtual_network.vcn.default_security_list_id}"]
   compartment_id      = "${var.compartment_ocid}"
   vcn_id              = "${oci_core_virtual_network.vcn.id}"

docs/examples/db_systems/resources.tf

@@ -34,7 +34,8 @@ resource "oci_database_db_system" "test_db_system" {
   license_model           = "${var.license_model}"
   node_count              = "${lookup(data.oci_database_db_system_shapes.test_db_system_shapes.db_system_shapes[0], "minimum_node_count")}"
 
-  defined_tags = "${map("example-tag-namespace-all.example-tag", "originalValue")}"
+  #To use defined_tags, set the values below to an existing tag namespace, refer to the identity example on how to create tag namespaces
+  #defined_tags = "${map("example-tag-namespace-all.example-tag", "originalValue")}"
 
   freeform_tags = {
     "Department" = "Finance"

docs/examples/object_storage/bucket.tf

@@ -9,6 +9,28 @@ resource "oci_objectstorage_bucket" "bucket1" {
   access_type    = "NoPublicAccess"
 }
 
+resource "oci_objectstorage_object_lifecycle_policy" "lifecyclePolicy1" {
+  namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
+  bucket    = "tf-example-bucket"
+
+  #Optional
+  rules {
+    #Required
+    action = "ARCHIVE"
+    is_enabled = "true"
+    name = "test-rule-1"
+    time_amount = "10"
+    time_unit = "DAYS"
+
+    #Optional
+    object_name_filter {
+
+      #Optional
+      inclusion_prefixes = ["my-test"]
+    }
+  }
+}
+
 data "oci_objectstorage_bucket_summaries" "buckets1" {
   compartment_id = "${var.compartment_ocid}"
   namespace      = "${data.oci_objectstorage_namespace.ns.namespace}"
@@ -22,3 +44,14 @@ data "oci_objectstorage_bucket_summaries" "buckets1" {
 output buckets {
   value = "${data.oci_objectstorage_bucket_summaries.buckets1.bucket_summaries}"
 }
+
+data "oci_objectstorage_object_lifecycle_policy" "lifecyclePolicies1" {
+  namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
+  bucket    = "tf-example-bucket"
+
+  depends_on = ["oci_objectstorage_object_lifecycle_policy.lifecyclePolicy1"]
+}
+
+output lifecyclePolicies1 {
+  value = "${data.oci_objectstorage_object_lifecycle_policy.lifecyclePolicies1.rules}"
+}

docs/examples/object_storage/object.tf

@@ -22,6 +22,21 @@ resource "oci_objectstorage_object" "source-object" {
   source           = "index.html"
 }
 
+resource "oci_objectstorage_object" "source-uri-object" {
+  namespace        = "${data.oci_objectstorage_namespace.ns.namespace}"
+  bucket           = "${oci_objectstorage_bucket.bucket1.name}"
+  object           = "copy_index.html"
+  content_language = "en-US"
+  content_type     = "text/html"
+
+  source_uri_details {
+    region = "${var.source_region}"
+    namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
+    bucket = "${oci_objectstorage_bucket.bucket1.name}"
+    object = "index.html"
+  }
+}
+
 data "oci_objectstorage_object_head" "object-head1" {
   namespace = "${data.oci_objectstorage_namespace.ns.namespace}"
   bucket    = "${oci_objectstorage_bucket.bucket1.name}"

docs/examples/object_storage/provider.tf

@@ -14,6 +14,11 @@ variable "region" {
   default = "us-ashburn-1"
 }
 
+//the object can be created from the object data in the other region
+variable "source_region" {
+  default = "us-ashburn-1"
+}
+
 provider "oci" {
   region           = "${var.region}"
   tenancy_ocid     = "${var.tenancy_ocid}"